From a193644e8593982c76d2fa5203a158029016ec47 Mon Sep 17 00:00:00 2001
From: qevolg <2227465945@qq.com>
Date: Tue, 22 Oct 2024 11:20:56 +0800
Subject: [PATCH] chore(*): modify taoskeeper build process

---
 cmake/cmake.define   |  1 +
 tools/CMakeLists.txt | 31 ++++++++-----------------------
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/cmake/cmake.define b/cmake/cmake.define
index 2aba4785be..a5f636c0fc 100644
--- a/cmake/cmake.define
+++ b/cmake/cmake.define
@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.0)
 set(CMAKE_VERBOSE_MAKEFILE FALSE)
 set(TD_BUILD_TAOSA_INTERNAL FALSE)
+set(TD_BUILD_TAOSA_INTERNAL FALSE)
 
 #set output directory
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/build/lib)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index a4867612e4..b540200b4d 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -251,29 +251,13 @@ IF(TD_BUILD_KEEPER)
             COMMAND cmake -E echo "Copy taoskeeper.toml"
             COMMAND cmake -E copy ./config/taoskeeper.toml ${CMAKE_BINARY_DIR}/test/cfg/
         )
-    ELSEIF(TD_DARWIN)
-        MESSAGE("Building taoskeeper on macOS")
-        INCLUDE(ExternalProject)
-        ExternalProject_Add(taoskeeper
-            PREFIX "taoskeeper"
-            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/keeper
-            BUILD_ALWAYS off
-            BUILD_IN_SOURCE 1
-            CONFIGURE_COMMAND cmake -E echo "taoskeeper no need cmake to config"
-            PATCH_COMMAND
-            COMMAND git clean -f -d
-            BUILD_COMMAND
-            COMMAND go build -a -ldflags "-X 'github.com/taosdata/taoskeeper/version.Version=${taos_version}' -X 'github.com/taosdata/taoskeeper/version.CommitID=${taoskeeper_commit_sha1}' -X 'github.com/taosdata/taoskeeper/version.BuildInfo=${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}'"
-            INSTALL_COMMAND
-            COMMAND cmake -E echo "Copy taoskeeper"
-            COMMAND cmake -E copy taoskeeper ${CMAKE_BINARY_DIR}/build/bin
-            COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test/cfg/
-            COMMAND cmake -E echo "Copy taoskeeper.toml"
-            COMMAND cmake -E copy ./config/taoskeeper.toml ${CMAKE_BINARY_DIR}/test/cfg/
-            COMMAND cmake -E copy ./taoskeeper.service ${CMAKE_BINARY_DIR}/test/cfg/
-        )
     ELSE()
-        MESSAGE("Building taoskeeper on Linux")
+        IF(TD_DARWIN)
+            MESSAGE("Building taoskeeper on macOS")
+        ELSE()
+            MESSAGE("Building taoskeeper on Linux")
+        ENDIF()
+
         INCLUDE(ExternalProject)
         ExternalProject_Add(taoskeeper
             PREFIX "taoskeeper"
@@ -291,9 +275,10 @@ IF(TD_BUILD_KEEPER)
             COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test/cfg/
             COMMAND cmake -E echo "Copy taoskeeper.toml"
             COMMAND cmake -E copy ./config/taoskeeper.toml ${CMAKE_BINARY_DIR}/test/cfg/
+            COMMAND cmake -E echo "Copy taoskeeper.service"
             COMMAND cmake -E copy ./taoskeeper.service ${CMAKE_BINARY_DIR}/test/cfg/
         )
     ENDIF()
 ELSEIF(TD_BUILD_KEEPER_INTERNAL)
-    MESSAGE("${Yellow} taoskeeper does not support internal option ${ColourReset}")
+    MESSAGE("${Yellow} use taoskeeper internal ${ColourReset}")
 ENDIF()