From dd44e5f99480c31e84042fa0070b86856d5f272f Mon Sep 17 00:00:00 2001 From: slguan Date: Fri, 7 Feb 2020 15:24:54 +0800 Subject: [PATCH] #1177 --- src/mnode/lite/CMakeLists.txt | 17 ----------------- src/mnode/{lite => }/src/mgmtAcct.spec.c | 0 src/mnode/{lite => }/src/mgmtBalance.spec.c | 0 src/mnode/{lite => }/src/mgmtDnode.spec.c | 0 src/mnode/{lite => }/src/mgmtDnodeInt.spec.c | 0 src/mnode/{lite => }/src/mgmtMnode.spec.c | 0 src/mnode/{lite => }/src/mgmtShell.spec.c | 0 src/mnode/{lite => }/src/mgmtSystem.spec.c | 0 src/vnode/{lite => detail}/src/vnodeFile.spec.c | 0 src/vnode/{lite => detail}/src/vnodePeer.spec.c | 0 .../{lite => detail}/src/vnodeStore.spec.c | 0 src/vnode/lite/CMakeLists.txt | 15 --------------- 12 files changed, 32 deletions(-) delete mode 100644 src/mnode/lite/CMakeLists.txt rename src/mnode/{lite => }/src/mgmtAcct.spec.c (100%) rename src/mnode/{lite => }/src/mgmtBalance.spec.c (100%) rename src/mnode/{lite => }/src/mgmtDnode.spec.c (100%) rename src/mnode/{lite => }/src/mgmtDnodeInt.spec.c (100%) rename src/mnode/{lite => }/src/mgmtMnode.spec.c (100%) rename src/mnode/{lite => }/src/mgmtShell.spec.c (100%) rename src/mnode/{lite => }/src/mgmtSystem.spec.c (100%) rename src/vnode/{lite => detail}/src/vnodeFile.spec.c (100%) rename src/vnode/{lite => detail}/src/vnodePeer.spec.c (100%) rename src/vnode/{lite => detail}/src/vnodeStore.spec.c (100%) delete mode 100644 src/vnode/lite/CMakeLists.txt diff --git a/src/mnode/lite/CMakeLists.txt b/src/mnode/lite/CMakeLists.txt deleted file mode 100644 index 28915050cf..0000000000 --- a/src/mnode/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/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(mlite ${SRC}) - TARGET_LINK_LIBRARIES(mlite trpc tutil sdb pthread) -ENDIF () - - diff --git a/src/mnode/lite/src/mgmtAcct.spec.c b/src/mnode/src/mgmtAcct.spec.c similarity index 100% rename from src/mnode/lite/src/mgmtAcct.spec.c rename to src/mnode/src/mgmtAcct.spec.c diff --git a/src/mnode/lite/src/mgmtBalance.spec.c b/src/mnode/src/mgmtBalance.spec.c similarity index 100% rename from src/mnode/lite/src/mgmtBalance.spec.c rename to src/mnode/src/mgmtBalance.spec.c diff --git a/src/mnode/lite/src/mgmtDnode.spec.c b/src/mnode/src/mgmtDnode.spec.c similarity index 100% rename from src/mnode/lite/src/mgmtDnode.spec.c rename to src/mnode/src/mgmtDnode.spec.c diff --git a/src/mnode/lite/src/mgmtDnodeInt.spec.c b/src/mnode/src/mgmtDnodeInt.spec.c similarity index 100% rename from src/mnode/lite/src/mgmtDnodeInt.spec.c rename to src/mnode/src/mgmtDnodeInt.spec.c diff --git a/src/mnode/lite/src/mgmtMnode.spec.c b/src/mnode/src/mgmtMnode.spec.c similarity index 100% rename from src/mnode/lite/src/mgmtMnode.spec.c rename to src/mnode/src/mgmtMnode.spec.c diff --git a/src/mnode/lite/src/mgmtShell.spec.c b/src/mnode/src/mgmtShell.spec.c similarity index 100% rename from src/mnode/lite/src/mgmtShell.spec.c rename to src/mnode/src/mgmtShell.spec.c diff --git a/src/mnode/lite/src/mgmtSystem.spec.c b/src/mnode/src/mgmtSystem.spec.c similarity index 100% rename from src/mnode/lite/src/mgmtSystem.spec.c rename to src/mnode/src/mgmtSystem.spec.c diff --git a/src/vnode/lite/src/vnodeFile.spec.c b/src/vnode/detail/src/vnodeFile.spec.c similarity index 100% rename from src/vnode/lite/src/vnodeFile.spec.c rename to src/vnode/detail/src/vnodeFile.spec.c diff --git a/src/vnode/lite/src/vnodePeer.spec.c b/src/vnode/detail/src/vnodePeer.spec.c similarity index 100% rename from src/vnode/lite/src/vnodePeer.spec.c rename to src/vnode/detail/src/vnodePeer.spec.c diff --git a/src/vnode/lite/src/vnodeStore.spec.c b/src/vnode/detail/src/vnodeStore.spec.c similarity index 100% rename from src/vnode/lite/src/vnodeStore.spec.c rename to src/vnode/detail/src/vnodeStore.spec.c diff --git a/src/vnode/lite/CMakeLists.txt b/src/vnode/lite/CMakeLists.txt deleted file mode 100644 index b5022da793..0000000000 --- a/src/vnode/lite/CMakeLists.txt +++ /dev/null @@ -1,15 +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/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(vlite ${SRC}) - TARGET_LINK_LIBRARIES(vlite trpc tutil sdb pthread) -ENDIF () -- GitLab