TD-4088

src/os/CMakeLists.txt

@@ -1,9 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-IF (TD_LINUX)
+IF (TD_DARWIN)
-  ADD_SUBDIRECTORY(src/linux)
-ELSEIF (TD_DARWIN)
   ADD_SUBDIRECTORY(src/darwin)  
 ELSEIF (TD_WINDOWS)
   ADD_SUBDIRECTORY(src/windows)

src/os/inc/osEok.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _eok_h_fd274616_996c_400e_9023_ae70be881fa3_
+#ifndef TDENGINE_OS_EOK_H
-#define _eok_h_fd274616_996c_400e_9023_ae70be881fa3_
+#define TDENGINE_OS_EOK_H
 
 #include <stdint.h>
 

src/os/src/alpine/CMakeLists.txt

@@ -1,7 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-PROJECT(TDengine)
-
-AUX_SOURCE_DIRECTORY(. SRC)
-ADD_LIBRARY(os ${SRC})
-TARGET_LINK_LIBRARIES(os m rt)
-

src/os/src/alpine/alpineEnv.c

@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-#include "tglobal.h"
-
-void osInit() {
-  if (configDir[0] == 0) {
-    strcpy(configDir, "/etc/taos");
-  }
-
-  strcpy(tsVnodeDir, "");
-  strcpy(tsDnodeDir, "");
-  strcpy(tsMnodeDir, "");
-  strcpy(tsDataDir, "/var/lib/taos");
-  strcpy(tsLogDir, "/var/log/taos");
-  strcpy(tsScriptDir, "/etc/taos");
-  strcpy(tsOsName, "Linux");
-}

src/os/src/darwin/CMakeLists.txt

@@ -2,4 +2,4 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
 AUX_SOURCE_DIRECTORY(. SRC)
-ADD_LIBRARY(os ${SRC})
+ADD_LIBRARY(osd ${SRC})

src/os/src/detail/CMakeLists.txt

@@ -7,10 +7,15 @@ AUX_SOURCE_DIRECTORY(. SRC)
 SET_SOURCE_FILES_PROPERTIES(osSysinfo.c PROPERTIES COMPILE_FLAGS -w)
 SET_SOURCE_FILES_PROPERTIES(osCoredump.c PROPERTIES COMPILE_FLAGS -w)
 
-ADD_LIBRARY(osdetail ${SRC})
+ADD_LIBRARY(os ${SRC})
-TARGET_LINK_LIBRARIES(osdetail os)
 
-IF (TD_ARM_32 OR TD_LINUX_32)
+IF (TD_LINUX)
-  TARGET_LINK_LIBRARIES(osdetail atomic)
+  TARGET_LINK_LIBRARIES(os m rt z)
+  IF (TD_ARM_32 OR TD_LINUX_32)
+    TARGET_LINK_LIBRARIES(os atomic)
+  ENDIF ()
+ELSEIF (TD_DARWIN)
+  TARGET_LINK_LIBRARIES(os osd)
+ELSEIF (TD_WINDOWS)
+  TARGET_LINK_LIBRARIES(os osw)
 ENDIF ()
-

src/os/src/detail/osAtomic.c

@@ -53,4 +53,3 @@ int64_t atomic_exchange_64_impl(int64_t* ptr, int64_t val ) {
   return old;
 }
 #endif
-

src/os/src/linux/CMakeLists.txt

@@ -1,7 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-PROJECT(TDengine)
-
-AUX_SOURCE_DIRECTORY(. SRC)
-
-ADD_LIBRARY(os ${SRC})
-TARGET_LINK_LIBRARIES(os m rt z)

src/os/src/windows/CMakeLists.txt

@@ -2,6 +2,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
 AUX_SOURCE_DIRECTORY(. SRC)
-ADD_LIBRARY(os ${SRC})
+ADD_LIBRARY(osw ${SRC})
 
-TARGET_LINK_LIBRARIES(os winmm IPHLPAPI ws2_32 MsvcLibXw)
+TARGET_LINK_LIBRARIES(osw winmm IPHLPAPI ws2_32 MsvcLibXw)

src/os/tests/CMakeLists.txt

@@ -11,5 +11,5 @@ IF (HEADER_GTEST_INCLUDE_DIR AND LIB_GTEST_STATIC_DIR)
     AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST)
 
     ADD_EXECUTABLE(osTest ${SOURCE_LIST})
-    TARGET_LINK_LIBRARIES(osTest taos osdetail tutil common gtest pthread)
+    TARGET_LINK_LIBRARIES(osTest taos os tutil common gtest pthread)
 ENDIF()

src/sync/CMakeLists.txt

@@ -11,6 +11,6 @@ TARGET_LINK_LIBRARIES(sync tutil pthread common)
 LIST(APPEND BIN_SRC src/syncArbitrator.c)
 LIST(APPEND BIN_SRC src/syncTcp.c)
 ADD_EXECUTABLE(tarbitrator ${BIN_SRC})
-TARGET_LINK_LIBRARIES(tarbitrator sync common osdetail tutil)
+TARGET_LINK_LIBRARIES(tarbitrator sync common os tutil)
 
 #ADD_SUBDIRECTORY(test)

src/util/CMakeLists.txt

@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/sync/inc)
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/rmonotonic/inc)
 AUX_SOURCE_DIRECTORY(src SRC)
 ADD_LIBRARY(tutil ${SRC})
-TARGET_LINK_LIBRARIES(tutil pthread osdetail lz4 z rmonotonic)
+TARGET_LINK_LIBRARIES(tutil pthread os lz4 z rmonotonic)
 
 IF (TD_LINUX)
   TARGET_LINK_LIBRARIES(tutil m rt)

src/util/tests/CMakeLists.txt

@@ -12,7 +12,7 @@ IF (HEADER_GTEST_INCLUDE_DIR AND LIB_GTEST_STATIC_DIR)
     
     LIST(REMOVE_ITEM SOURCE_LIST ${CMAKE_CURRENT_SOURCE_DIR}/trefTest.c)
     ADD_EXECUTABLE(utilTest ${SOURCE_LIST})
-    TARGET_LINK_LIBRARIES(utilTest tutil common osdetail gtest pthread gcov)
+    TARGET_LINK_LIBRARIES(utilTest tutil common os gtest pthread gcov)
 
     LIST(APPEND BIN_SRC ${CMAKE_CURRENT_SOURCE_DIR}/trefTest.c)
     ADD_EXECUTABLE(trefTest ${BIN_SRC})

src/wal/test/CMakeLists.txt

@@ -6,7 +6,7 @@ IF (TD_LINUX)
 
   LIST(APPEND WALTEST_SRC ./waltest.c)
   ADD_EXECUTABLE(waltest ${WALTEST_SRC})
-  TARGET_LINK_LIBRARIES(waltest twal osdetail tutil)
+  TARGET_LINK_LIBRARIES(waltest twal os tutil)
 
 ENDIF ()
 
@@ -15,7 +15,7 @@ IF (TD_DARWIN)
 
   LIST(APPEND WALTEST_SRC ./waltest.c)
   ADD_EXECUTABLE(waltest ${WALTEST_SRC})
-  TARGET_LINK_LIBRARIES(waltest twal osdetail tutil)
+  TARGET_LINK_LIBRARIES(waltest twal os tutil)
 
 ENDIF ()