Merge pull request #23371 from taosdata/enh/TD-26863-3.0

enh: taosd build info
taosdata · Oct 25, 2023 · f9d6345 · f9d6345
2 parents ba43950 + aa7fd64
commit f9d6345
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/cmake/cmake.platform b/cmake/cmake.platform
@@ -93,36 +93,42 @@ ELSEIF (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 ENDIF()
 
 IF ("${CPUTYPE}" STREQUAL "")
-  IF (CMAKE_SYSTEM_PROCESSOR MATCHES "(amd64)|(AMD64)")
+  IF (CMAKE_SYSTEM_PROCESSOR MATCHES "(amd64)|(AMD64)|(x86_64)|(X86_64)")
     MESSAGE(STATUS "Current platform is amd64")
     SET(PLATFORM_ARCH_STR "amd64")
+    SET(CPUTYPE "x64")
     SET(TD_INTEL_64 TRUE)
     ADD_DEFINITIONS("-D_TD_X86_")
   ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)")
     MESSAGE(STATUS "Current platform is x86")
     SET(PLATFORM_ARCH_STR "i386")
+    SET(CPUTYPE "x86")
     SET(TD_INTEL_32 TRUE)
     ADD_DEFINITIONS("-D_TD_X86_")
   ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "armv7l")
     MESSAGE(STATUS "Current platform is aarch32")
     SET(PLATFORM_ARCH_STR "arm")
+    SET(CPUTYPE "arm32")
     SET(TD_ARM_32 TRUE)
     ADD_DEFINITIONS("-D_TD_ARM_")
     ADD_DEFINITIONS("-D_TD_ARM_32")
   ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "(aarch64)|(arm64)")
     MESSAGE(STATUS "Current platform is aarch64")
     SET(PLATFORM_ARCH_STR "arm64")
+    SET(CPUTYPE "arm64")
     SET(TD_ARM_64 TRUE)
     ADD_DEFINITIONS("-D_TD_ARM_")
     ADD_DEFINITIONS("-D_TD_ARM_64")
   ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "loongarch64")
     MESSAGE(STATUS "The current platform is loongarch64")
     SET(PLATFORM_ARCH_STR "loongarch64")
+    SET(CPUTYPE "loongarch64")
     SET(TD_LOONGARCH_64 TRUE)
     ADD_DEFINITIONS("-D_TD_LOONGARCH_")
     ADD_DEFINITIONS("-D_TD_LOONGARCH_64")
   ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "mips64")
     SET(PLATFORM_ARCH_STR "mips")
+    SET(CPUTYPE "mips64")
     MESSAGE(STATUS "input cpuType: mips64")
     SET(TD_MIPS_64 TRUE)
     ADD_DEFINITIONS("-D_TD_MIPS_")

diff --git a/cmake/cmake.version b/cmake/cmake.version
@@ -50,7 +50,19 @@ ENDIF ()
 IF (DEFINED VERDATE)
   SET(TD_VER_DATE ${VERDATE})
 ELSE ()
-  STRING(TIMESTAMP TD_VER_DATE "%Y-%m-%d %H:%M:%S") 
+  STRING(COMPARE GREATER_EQUAL "${CMAKE_VERSION}" "3.26" TD_CMAKE_SUPPORT_TZ)
+
+  IF (TD_CMAKE_SUPPORT_TZ)
+    STRING(TIMESTAMP TD_VER_DATE "%Y-%m-%d %H:%M:%S %z")
+  ELSE ()
+    IF (TD_WINDOWS)
+      STRING(TIMESTAMP TD_VER_DATE "%Y-%m-%d %H:%M:%S")
+    ELSE ()
+      EXECUTE_PROCESS(COMMAND date +"%F %T %z" OUTPUT_VARIABLE TD_VER_DATE)
+      STRING(REPLACE "\"" "" TD_VER_DATE ${TD_VER_DATE})
+      STRING(STRIP ${TD_VER_DATE} TD_VER_DATE)
+    ENDIF ()
+  ENDIF ()
 ENDIF ()
 
 IF (DEFINED VERTYPE)
@@ -67,9 +79,9 @@ ELSE ()
   ELSEIF (TD_LINUX_32)
     SET(TD_VER_CPUTYPE "x86")  
   ELSEIF (TD_ARM_32)
-    SET(TD_VER_CPUTYPE "x86")  
+    SET(TD_VER_CPUTYPE "arm32")
   ELSEIF (TD_MIPS_32)
-    SET(TD_VER_CPUTYPE "x86")  
+    SET(TD_VER_CPUTYPE "mips32")  
   ELSE ()
     SET(TD_VER_CPUTYPE "x64")
   ENDIF ()

diff --git a/source/util/src/version.c.in b/source/util/src/version.c.in
@@ -2,6 +2,6 @@ char version[64] = "${TD_VER_NUMBER}";
 char compatible_version[12] = "${TD_VER_COMPATIBLE}";
 char gitinfo[48] = "${TD_VER_GIT}";
 char gitinfoOfInternal[48] = "${TD_VER_GIT_INTERNAL}";
-char buildinfo[64] = "Built at ${TD_VER_DATE}";
+char buildinfo[64] = "Built ${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} at ${TD_VER_DATE}";
 
 void libtaos_${TD_LIB_VER_NUMBER}_${TD_VER_OSTYPE}_${TD_VER_CPUTYPE}_${TD_VER_VERTYPE}() {};