fix: change commit id for taos-tools
This commit is contained in:
parent
66ef32f5e5
commit
64eada9324
|
@ -38,63 +38,17 @@ ENDIF ()
|
||||||
|
|
||||||
FIND_PACKAGE(Git)
|
FIND_PACKAGE(Git)
|
||||||
IF(GIT_FOUND)
|
IF(GIT_FOUND)
|
||||||
IF (EXISTS "${CMAKE_CURRENT_LIST_DIR}/../VERSION")
|
#commit id
|
||||||
MESSAGE("Found VERSION file")
|
|
||||||
EXECUTE_PROCESS(
|
|
||||||
COMMAND grep "^taosdump" "${CMAKE_CURRENT_LIST_DIR}/../VERSION"
|
|
||||||
RESULT_VARIABLE RESULT
|
|
||||||
OUTPUT_VARIABLE TAOSDUMP_FULLTAG
|
|
||||||
)
|
|
||||||
EXECUTE_PROCESS(
|
|
||||||
COMMAND sh -c "git --git-dir=${CMAKE_CURRENT_LIST_DIR}/../.git --work-tree=${CMAKE_CURRENT_LIST_DIR}/.. log --pretty=oneline -n 1 HEAD"
|
|
||||||
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
|
|
||||||
RESULT_VARIABLE RESULT
|
|
||||||
OUTPUT_VARIABLE TAOSDUMP_COMMIT_SHA1
|
|
||||||
)
|
|
||||||
EXECUTE_PROCESS(
|
|
||||||
COMMAND grep "^taosbenchmark" "${CMAKE_CURRENT_LIST_DIR}/../VERSION"
|
|
||||||
RESULT_VARIABLE RESULT
|
|
||||||
OUTPUT_VARIABLE TAOSBENCHMARK_FULLTAG
|
|
||||||
)
|
|
||||||
EXECUTE_PROCESS(
|
|
||||||
COMMAND sh -c "git --git-dir=${CMAKE_CURRENT_LIST_DIR}/../.git --work-tree=${CMAKE_CURRENT_LIST_DIR}/.. log --pretty=oneline -n 1 HEAD"
|
|
||||||
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
|
|
||||||
RESULT_VARIABLE RESULT
|
|
||||||
OUTPUT_VARIABLE TAOSBENCHMARK_COMMIT_SHA1
|
|
||||||
)
|
|
||||||
ELSE ()
|
|
||||||
MESSAGE("Use git tag")
|
|
||||||
EXECUTE_PROCESS(
|
|
||||||
COMMAND sh -c "git for-each-ref --sort=taggerdate --format '%(tag)' refs/tags|grep taosdump|tail -1"
|
|
||||||
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
|
|
||||||
RESULT_VARIABLE TAG_RESULT
|
|
||||||
OUTPUT_VARIABLE TAOSDUMP_FULLTAG
|
|
||||||
)
|
|
||||||
EXECUTE_PROCESS(
|
|
||||||
COMMAND sh -c "git --git-dir=${CMAKE_CURRENT_LIST_DIR}/../.git --work-tree=${CMAKE_CURRENT_LIST_DIR}/.. log --pretty=oneline -n 1 ${TAOSDUMP_FULLTAG}"
|
|
||||||
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
|
|
||||||
RESULT_VARIABLE RESULT
|
|
||||||
OUTPUT_VARIABLE TAOSDUMP_COMMIT_SHA1
|
|
||||||
)
|
|
||||||
EXECUTE_PROCESS(
|
|
||||||
COMMAND sh -c "git for-each-ref --sort=taggerdate --format '%(tag)' refs/tags|grep taosbenchmark|tail -1"
|
|
||||||
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
|
|
||||||
RESULT_VARIABLE TAG_RESULT
|
|
||||||
OUTPUT_VARIABLE TAOSBENCHMARK_FULLTAG
|
|
||||||
)
|
|
||||||
EXECUTE_PROCESS(
|
|
||||||
COMMAND sh -c "git --git-dir=${CMAKE_CURRENT_LIST_DIR}/../.git --work-tree=${CMAKE_CURRENT_LIST_DIR}/.. log --pretty=oneline -n 1 ${TAOSBENCHMARK_FULLTAG}"
|
|
||||||
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
|
|
||||||
RESULT_VARIABLE RESULT
|
|
||||||
OUTPUT_VARIABLE TAOSBENCHMARK_COMMIT_SHA1
|
|
||||||
)
|
|
||||||
ENDIF ()
|
|
||||||
EXECUTE_PROCESS(
|
EXECUTE_PROCESS(
|
||||||
COMMAND sh -c "git --git-dir=${CMAKE_CURRENT_LIST_DIR}/../.git --work-tree=${CMAKE_CURRENT_LIST_DIR}/.. status -z -s ${CMAKE_CURRENT_LIST_DIR}/taosdump.c"
|
COMMAND git log -1 --format=%H
|
||||||
RESULT_VARIABLE RESULT
|
WORKING_DIRECTORY ${TD_COMMUNITY_DIR}
|
||||||
OUTPUT_VARIABLE TAOSDUMP_STATUS
|
OUTPUT_VARIABLE GIT_COMMIT_ID
|
||||||
ERROR_QUIET
|
)
|
||||||
)
|
|
||||||
|
SET(TAOSBENCHMARK_COMMIT_SHA1, ${GIT_COMMIT_ID})
|
||||||
|
SET(TAOSDUMP_COMMIT_SHA1, ${GIT_COMMIT_ID})
|
||||||
|
MESSAGE("taosBenchmark commid_id:${TAOSBENCHMARK_COMMIT_SHA1}")
|
||||||
|
MESSAGE("taosdump commid_id:${TAOSDUMP_COMMIT_SHA1}")
|
||||||
|
|
||||||
# version
|
# version
|
||||||
IF (DEFINED TD_VER_NUMBER)
|
IF (DEFINED TD_VER_NUMBER)
|
||||||
|
@ -118,35 +72,6 @@ IF(GIT_FOUND)
|
||||||
MESSAGE(STATUS "taosBenchmark use origin version: " ${TAOSBENCHMARK_TAG})
|
MESSAGE(STATUS "taosBenchmark use origin version: " ${TAOSBENCHMARK_TAG})
|
||||||
ENDIF ()
|
ENDIF ()
|
||||||
|
|
||||||
EXECUTE_PROCESS(
|
|
||||||
COMMAND sh -c "git --git-dir=${CMAKE_CURRENT_LIST_DIR}/../.git --work-tree=${CMAKE_CURRENT_LIST_DIR}/.. status -z -s ${CMAKE_CURRENT_LIST_DIR}/bench*.c"
|
|
||||||
RESULT_VARIABLE RESULT
|
|
||||||
OUTPUT_VARIABLE TAOSBENCHMARK_STATUS
|
|
||||||
ERROR_QUIET
|
|
||||||
)
|
|
||||||
IF ("${TAOSDUMP_COMMIT_SHA1}" STREQUAL "")
|
|
||||||
SET(TAOSDUMP_COMMIT_SHA1 "unknown")
|
|
||||||
ELSE ()
|
|
||||||
STRING(SUBSTRING "${TAOSDUMP_COMMIT_SHA1}" 0 40 TAOSDUMP_COMMIT_SHA1)
|
|
||||||
STRING(STRIP "${TAOSDUMP_COMMIT_SHA1}" TAOSDUMP_COMMIT_SHA1)
|
|
||||||
ENDIF ()
|
|
||||||
IF ("${TAOSDUMP_TAG}" STREQUAL "")
|
|
||||||
SET(TAOSDUMP_TAG "0.1.0")
|
|
||||||
ELSE ()
|
|
||||||
STRING(STRIP "${TAOSDUMP_TAG}" TAOSDUMP_TAG)
|
|
||||||
ENDIF ()
|
|
||||||
|
|
||||||
IF ("${TAOSBENCHMARK_COMMIT_SHA1}" STREQUAL "")
|
|
||||||
SET(TAOSBENCHMARK_COMMIT_SHA1 "unknown")
|
|
||||||
ELSE ()
|
|
||||||
STRING(SUBSTRING "${TAOSBENCHMARK_COMMIT_SHA1}" 0 40 TAOSBENCHMARK_COMMIT_SHA1)
|
|
||||||
STRING(STRIP "${TAOSBENCHMARK_COMMIT_SHA1}" TAOSBENCHMARK_COMMIT_SHA1)
|
|
||||||
ENDIF ()
|
|
||||||
IF ("${TAOSBENCHMARK_TAG}" STREQUAL "")
|
|
||||||
SET(TAOSBENCHMARK_TAG "0.1.0")
|
|
||||||
ELSE ()
|
|
||||||
STRING(STRIP "${TAOSBENCHMARK_TAG}" TAOSBENCHMARK_TAG)
|
|
||||||
ENDIF ()
|
|
||||||
ELSE()
|
ELSE()
|
||||||
MESSAGE("Git not found")
|
MESSAGE("Git not found")
|
||||||
SET(TAOSDUMP_COMMIT_SHA1 "unknown")
|
SET(TAOSDUMP_COMMIT_SHA1 "unknown")
|
||||||
|
|
Loading…
Reference in New Issue