From 457c557694a6a42d9035dc5f37d8adf52ce0b862 Mon Sep 17 00:00:00 2001
From: slguan <slguan@taosdata.com>
Date: Wed, 5 Feb 2020 09:34:02 +0800
Subject: [PATCH] #1177

---
 src/dnode/CMakeLists.txt                      | 43 +++++++++++++++++-
 src/dnode/detail/CMakeLists.txt               | 44 -------------------
 src/dnode/{detail => }/inc/dnodeSystem.h      |  0
 src/dnode/lite/CMakeLists.txt                 | 17 -------
 src/dnode/{detail => }/src/dnodeMgmt.c        |  0
 .../dnodeMgmt.spec.c => src/dnodePlugin.c}    |  0
 src/dnode/{detail => }/src/dnodeService.c     |  0
 .../vnodeShell.c => dnode/src/dnodeShell.c}   |  0
 src/dnode/{detail => }/src/dnodeSystem.c      |  0
 src/dnode/{lite => }/src/dnodeSystem.spec.c   |  0
 .../vnodeSystem.c => dnode/src/vnodeMgmt.c}   |  0
 11 files changed, 41 insertions(+), 63 deletions(-)
 delete mode 100644 src/dnode/detail/CMakeLists.txt
 rename src/dnode/{detail => }/inc/dnodeSystem.h (100%)
 delete mode 100644 src/dnode/lite/CMakeLists.txt
 rename src/dnode/{detail => }/src/dnodeMgmt.c (100%)
 rename src/dnode/{lite/src/dnodeMgmt.spec.c => src/dnodePlugin.c} (100%)
 rename src/dnode/{detail => }/src/dnodeService.c (100%)
 rename src/{vnode/detail/src/vnodeShell.c => dnode/src/dnodeShell.c} (100%)
 rename src/dnode/{detail => }/src/dnodeSystem.c (100%)
 rename src/dnode/{lite => }/src/dnodeSystem.spec.c (100%)
 rename src/{vnode/detail/src/vnodeSystem.c => dnode/src/vnodeMgmt.c} (100%)

diff --git a/src/dnode/CMakeLists.txt b/src/dnode/CMakeLists.txt
index ca14d807b6..2fdd531941 100644
--- a/src/dnode/CMakeLists.txt
+++ b/src/dnode/CMakeLists.txt
@@ -1,5 +1,44 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-ADD_SUBDIRECTORY(detail)
-ADD_SUBDIRECTORY(lite)
\ No newline at end of file
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/dnode/detail/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/mnode/detail/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/vnode/detail/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/modules/http/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/modules/monitor/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/inc)
+  INCLUDE_DIRECTORIES(${TD_ENTERPRISE_DIR}/src/util/cluster/inc)
+  INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
+  INCLUDE_DIRECTORIES(inc)
+  AUX_SOURCE_DIRECTORY(src SRC)
+
+  ADD_EXECUTABLE(taosd ${SRC})
+  TARGET_LINK_LIBRARIES(taosd mnode vnode taos_static monitor http)
+
+  IF (TD_CLUSTER)
+    TARGET_LINK_LIBRARIES(taosd dcluster)
+  ELSEIF (TD_LITE)
+    TARGET_LINK_LIBRARIES(taosd dlite)
+  ENDIF ()
+
+  SET(PREPARE_ENV_CMD "prepare_env_cmd")
+  SET(PREPARE_ENV_TARGET "prepare_env_target")
+  ADD_CUSTOM_COMMAND(OUTPUT ${PREPARE_ENV_CMD}
+      POST_BUILD
+      COMMAND echo "make test directory"
+      DEPENDS taosd
+      COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/cfg/
+      COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/log/
+      COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/data/
+      COMMAND ${CMAKE_COMMAND} -E echo dataDir ${TD_TESTS_OUTPUT_DIR}/data > ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
+      COMMAND ${CMAKE_COMMAND} -E echo logDir ${TD_TESTS_OUTPUT_DIR}/log  >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
+      COMMAND ${CMAKE_COMMAND} -E echo charset UTF-8  >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
+      COMMENT "prepare taosd environment")
+  ADD_CUSTOM_TARGET(${PREPARE_ENV_TARGET} ALL WORKING_DIRECTORY ${TD_EXECUTABLE_OUTPUT_PATH} DEPENDS ${PREPARE_ENV_CMD})
+
+ENDIF ()
+
+
diff --git a/src/dnode/detail/CMakeLists.txt b/src/dnode/detail/CMakeLists.txt
deleted file mode 100644
index 2fdd531941..0000000000
--- a/src/dnode/detail/CMakeLists.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-PROJECT(TDengine)
-
-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/dnode/detail/inc)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/mnode/detail/inc)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/vnode/detail/inc)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/modules/http/inc)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/modules/monitor/inc)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/inc)
-  INCLUDE_DIRECTORIES(${TD_ENTERPRISE_DIR}/src/util/cluster/inc)
-  INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
-  INCLUDE_DIRECTORIES(inc)
-  AUX_SOURCE_DIRECTORY(src SRC)
-
-  ADD_EXECUTABLE(taosd ${SRC})
-  TARGET_LINK_LIBRARIES(taosd mnode vnode taos_static monitor http)
-
-  IF (TD_CLUSTER)
-    TARGET_LINK_LIBRARIES(taosd dcluster)
-  ELSEIF (TD_LITE)
-    TARGET_LINK_LIBRARIES(taosd dlite)
-  ENDIF ()
-
-  SET(PREPARE_ENV_CMD "prepare_env_cmd")
-  SET(PREPARE_ENV_TARGET "prepare_env_target")
-  ADD_CUSTOM_COMMAND(OUTPUT ${PREPARE_ENV_CMD}
-      POST_BUILD
-      COMMAND echo "make test directory"
-      DEPENDS taosd
-      COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/cfg/
-      COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/log/
-      COMMAND ${CMAKE_COMMAND} -E make_directory ${TD_TESTS_OUTPUT_DIR}/data/
-      COMMAND ${CMAKE_COMMAND} -E echo dataDir ${TD_TESTS_OUTPUT_DIR}/data > ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
-      COMMAND ${CMAKE_COMMAND} -E echo logDir ${TD_TESTS_OUTPUT_DIR}/log  >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
-      COMMAND ${CMAKE_COMMAND} -E echo charset UTF-8  >> ${TD_TESTS_OUTPUT_DIR}/cfg/taos.cfg
-      COMMENT "prepare taosd environment")
-  ADD_CUSTOM_TARGET(${PREPARE_ENV_TARGET} ALL WORKING_DIRECTORY ${TD_EXECUTABLE_OUTPUT_PATH} DEPENDS ${PREPARE_ENV_CMD})
-
-ENDIF ()
-
-
diff --git a/src/dnode/detail/inc/dnodeSystem.h b/src/dnode/inc/dnodeSystem.h
similarity index 100%
rename from src/dnode/detail/inc/dnodeSystem.h
rename to src/dnode/inc/dnodeSystem.h
diff --git a/src/dnode/lite/CMakeLists.txt b/src/dnode/lite/CMakeLists.txt
deleted file mode 100644
index d47711b4da..0000000000
--- a/src/dnode/lite/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-PROJECT(TDengine)
-
-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/dnode/detail/inc)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/mnode/detail/inc)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/vnode/detail/inc)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
-  INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
-  INCLUDE_DIRECTORIES(inc)
-  AUX_SOURCE_DIRECTORY(src SRC)
-  ADD_LIBRARY(dlite ${SRC})
-  TARGET_LINK_LIBRARIES(dlite trpc tutil sdb pthread)
-ENDIF ()
-
-
diff --git a/src/dnode/detail/src/dnodeMgmt.c b/src/dnode/src/dnodeMgmt.c
similarity index 100%
rename from src/dnode/detail/src/dnodeMgmt.c
rename to src/dnode/src/dnodeMgmt.c
diff --git a/src/dnode/lite/src/dnodeMgmt.spec.c b/src/dnode/src/dnodePlugin.c
similarity index 100%
rename from src/dnode/lite/src/dnodeMgmt.spec.c
rename to src/dnode/src/dnodePlugin.c
diff --git a/src/dnode/detail/src/dnodeService.c b/src/dnode/src/dnodeService.c
similarity index 100%
rename from src/dnode/detail/src/dnodeService.c
rename to src/dnode/src/dnodeService.c
diff --git a/src/vnode/detail/src/vnodeShell.c b/src/dnode/src/dnodeShell.c
similarity index 100%
rename from src/vnode/detail/src/vnodeShell.c
rename to src/dnode/src/dnodeShell.c
diff --git a/src/dnode/detail/src/dnodeSystem.c b/src/dnode/src/dnodeSystem.c
similarity index 100%
rename from src/dnode/detail/src/dnodeSystem.c
rename to src/dnode/src/dnodeSystem.c
diff --git a/src/dnode/lite/src/dnodeSystem.spec.c b/src/dnode/src/dnodeSystem.spec.c
similarity index 100%
rename from src/dnode/lite/src/dnodeSystem.spec.c
rename to src/dnode/src/dnodeSystem.spec.c
diff --git a/src/vnode/detail/src/vnodeSystem.c b/src/dnode/src/vnodeMgmt.c
similarity index 100%
rename from src/vnode/detail/src/vnodeSystem.c
rename to src/dnode/src/vnodeMgmt.c
-- 
GitLab