From d0d97ce892023767cd75ab7b29d025250d5370dd Mon Sep 17 00:00:00 2001 From: Alex Duan <417921451@qq.com> Date: Tue, 11 Feb 2025 10:49:37 +0800 Subject: [PATCH] fix: rename BUILD_INFO macro define --- tools/taos-tools/src/CMakeLists.txt | 19 ++++++++----------- tools/taos-tools/src/benchCommandOpt.c | 2 +- tools/taos-tools/src/taosdump.c | 2 +- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/tools/taos-tools/src/CMakeLists.txt b/tools/taos-tools/src/CMakeLists.txt index 072baee219..c25d319cbf 100644 --- a/tools/taos-tools/src/CMakeLists.txt +++ b/tools/taos-tools/src/CMakeLists.txt @@ -39,12 +39,11 @@ ENDIF () # # collect --version information # - MESSAGE("collect --version show info:") # version IF (DEFINED TD_VER_NUMBER) ADD_DEFINITIONS(-DTD_VER_NUMBER="${TD_VER_NUMBER}") - MESSAGE("version:${TD_VER_NUMBER}") + MESSAGE("-- version:${TD_VER_NUMBER}") ELSE () # abort build MESSAGE(FATAL_ERROR "build taos-tools not found TD_VER_NUMBER define.") @@ -66,11 +65,8 @@ IF(GIT_FOUND) ) # show - MESSAGE("") - MESSAGE("taosdump commit id: ${TAOSDUMP_COMMIT_ID}") - MESSAGE("taosBenchmark commit id: ${TAOSBENCHMARK_COMMIT_ID}") - MESSAGE("") - + MESSAGE("-- taosdump commit id: ${TAOSDUMP_COMMIT_ID}") + MESSAGE("-- taosBenchmark commit id: ${TAOSBENCHMARK_COMMIT_ID}") # define ADD_DEFINITIONS(-DTAOSDUMP_COMMIT_ID="${TAOSDUMP_COMMIT_ID}") ADD_DEFINITIONS(-DTAOSBENCHMARK_COMMIT_ID="${TAOSBENCHMARK_COMMIT_ID}") @@ -78,10 +74,11 @@ ELSE() MESSAGE(FATAL_ERROR "build taos-tools FIND_PACKAGE(Git) failed.") ENDIF (GIT_FOUND) -# build date -ADD_DEFINITIONS(-DBUILD_DATA="${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}") -MESSAGE("build:${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}") - +# build info +SET(BUILD_INFO, "${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}") +ADD_DEFINITIONS(-DBUILD_INFO="${BUILD_INFO}") +MESSAGE("-- build:${BUILD_INFO}") +MESSAGE("") # diff --git a/tools/taos-tools/src/benchCommandOpt.c b/tools/taos-tools/src/benchCommandOpt.c index d38ee25525..1968a731f5 100644 --- a/tools/taos-tools/src/benchCommandOpt.c +++ b/tools/taos-tools/src/benchCommandOpt.c @@ -31,7 +31,7 @@ void printVersion() { // version, macro define in src/CMakeLists.txt printf("taosBenchmark version: %s\n", TD_VER_NUMBER); printf("git: %s\n", TAOSBENCHMARK_COMMIT_ID); - printf("build: %s\n", BUILD_DATA); + printf("build: %s\n", BUILD_INFO); } void parseFieldDatatype(char *dataType, BArray *fields, bool isTag) { diff --git a/tools/taos-tools/src/taosdump.c b/tools/taos-tools/src/taosdump.c index 6a2cffe407..c4c5f34b91 100644 --- a/tools/taos-tools/src/taosdump.c +++ b/tools/taos-tools/src/taosdump.c @@ -264,7 +264,7 @@ static void printVersion(FILE *file) { // version, macro define in src/CMakeLists.txt fprintf(file, "taosBenchmark version: %s\n", TD_VER_NUMBER); fprintf(file, "git: %s\n", TAOSDUMP_COMMIT_ID); - fprintf(file, "build: %s\n", BUILD_DATA); + fprintf(file, "build: %s\n", BUILD_INFO); } static char *typeToStr(int type) {