xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: rename BUILD_INFO macro define

This commit is contained in:
Alex Duan 2025-02-11 10:49:37 +08:00
parent 8bbc64aa25
commit d0d97ce892
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/taos-tools/src/CMakeLists.txt
View File

@ -39,12 +39,11 @@ ENDIF ()
# #
# collect --version information # collect --version information
# #
MESSAGE("collect --version show info:") MESSAGE("collect --version show info:")
# version # version
IF (DEFINED TD_VER_NUMBER) IF (DEFINED TD_VER_NUMBER)
ADD_DEFINITIONS(-DTD_VER_NUMBER="${TD_VER_NUMBER}") ADD_DEFINITIONS(-DTD_VER_NUMBER="${TD_VER_NUMBER}")
MESSAGE("version:${TD_VER_NUMBER}") MESSAGE("-- version:${TD_VER_NUMBER}")
ELSE () ELSE ()
# abort build # abort build
MESSAGE(FATAL_ERROR "build taos-tools not found TD_VER_NUMBER define.") MESSAGE(FATAL_ERROR "build taos-tools not found TD_VER_NUMBER define.")
@ -66,11 +65,8 @@ IF(GIT_FOUND)
) )
# show # show
MESSAGE("") MESSAGE("-- taosdump commit id: ${TAOSDUMP_COMMIT_ID}")
MESSAGE("taosdump commit id: ${TAOSDUMP_COMMIT_ID}") MESSAGE("-- taosBenchmark commit id: ${TAOSBENCHMARK_COMMIT_ID}")
MESSAGE("taosBenchmark commit id: ${TAOSBENCHMARK_COMMIT_ID}")
MESSAGE("")
# define # define
ADD_DEFINITIONS(-DTAOSDUMP_COMMIT_ID="${TAOSDUMP_COMMIT_ID}") ADD_DEFINITIONS(-DTAOSDUMP_COMMIT_ID="${TAOSDUMP_COMMIT_ID}")
ADD_DEFINITIONS(-DTAOSBENCHMARK_COMMIT_ID="${TAOSBENCHMARK_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.") MESSAGE(FATAL_ERROR "build taos-tools FIND_PACKAGE(Git) failed.")
ENDIF (GIT_FOUND) ENDIF (GIT_FOUND)
# build date # build info
ADD_DEFINITIONS(-DBUILD_DATA="${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}") SET(BUILD_INFO, "${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}")
MESSAGE("build:${TD_VER_OSTYPE}-${TD_VER_CPUTYPE} ${TD_VER_DATE}") ADD_DEFINITIONS(-DBUILD_INFO="${BUILD_INFO}")
MESSAGE("-- build:${BUILD_INFO}")
MESSAGE("")
# #

2
tools/taos-tools/src/benchCommandOpt.c
View File

@ -31,7 +31,7 @@ void printVersion() {
// version, macro define in src/CMakeLists.txt // version, macro define in src/CMakeLists.txt
printf("taosBenchmark version: %s\n", TD_VER_NUMBER); printf("taosBenchmark version: %s\n", TD_VER_NUMBER);
printf("git: %s\n", TAOSBENCHMARK_COMMIT_ID); 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) { void parseFieldDatatype(char *dataType, BArray *fields, bool isTag) {

2
tools/taos-tools/src/taosdump.c
View File

@ -264,7 +264,7 @@ static void printVersion(FILE *file) {
// version, macro define in src/CMakeLists.txt // version, macro define in src/CMakeLists.txt
fprintf(file, "taosBenchmark version: %s\n", TD_VER_NUMBER); fprintf(file, "taosBenchmark version: %s\n", TD_VER_NUMBER);
fprintf(file, "git: %s\n", TAOSDUMP_COMMIT_ID); 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) { static char *typeToStr(int type) {