From 1563e1abbaf53b353ca834dd94f698d06783767e Mon Sep 17 00:00:00 2001 From: Lu Qiuwen Date: Thu, 25 Oct 2018 17:08:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3autorevision.sh=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=8D=A2=E8=A1=8C=E7=AC=A6=E5=AF=BC=E8=87=B4=E7=9A=84?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/Version.cmake | 9 ++------- platform/src/proxy.cpp | 5 ++++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/cmake/Version.cmake b/cmake/Version.cmake index 0f4bc5b..63c2b55 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -11,7 +11,7 @@ file(COPY ${__SOURCE_AUTORESIVISION} DESTINATION ${CMAKE_BINARY_DIR} WORLD_READ WORLD_EXECUTE) # execute autorevision.sh to generate version information -execute_process(COMMAND ${__AUTORESIVISION} -t cmake -o ${__VERSION_CACHE} OUTPUT_FILE ${__VERSION_CONFIG} ERROR_QUIET) +execute_process(COMMAND ${__AUTORESIVISION} -t cmake -o ${__VERSION_CACHE} OUTPUT_FILE ${__VERSION_CONFIG}) include(${__VERSION_CONFIG}) # extract major, minor, patch version from git tag @@ -33,15 +33,10 @@ endif() set(TFE_VERSION "${TFE_VERSION_MAJOR}.${TFE_VERSION_MINOR}.${TFE_VERSION_PATCH}") set(TFE_DESCRIBE "${VCS_SHORT_HASH}") -set(TFE_GIT_VERSION "${TFE_VERSION_MAJOR}.${TFE_VERSION_MINOR}.${TFE_VERSION_PATCH}-${TFE_VERSION_BUILD}") +set(TFE_GIT_VERSION "${TFE_VERSION_MAJOR}.${TFE_VERSION_MINOR}.${TFE_VERSION_PATCH}-${TFE_DESCRIBE}") set(TFE_VAR_VERSION "${TFE_VERSION_MAJOR}_${TFE_VERSION_MINOR}_${TFE_VERSION_PATCH}_${TFE_DESCRIBE}") -# system information -execute_process(COMMAND uname -r OUTPUT_VARIABLE TFE_VERSION_KERNEL) - # print information message(STATUS "TFE Version: ${TFE_GIT_VERSION}") -message(STATUS "Kernel Version: ${TFE_VERSION_KERNEL}") - add_definitions(-DTFE_GIT_VERSION=\"${TFE_GIT_VERSION}\") add_definitions(-DTFE_VAR_VERSION=${TFE_VAR_VERSION}) diff --git a/platform/src/proxy.cpp b/platform/src/proxy.cpp index f7a7052..6038500 100644 --- a/platform/src/proxy.cpp +++ b/platform/src/proxy.cpp @@ -49,9 +49,11 @@ struct tfe_proxy * g_default_proxy = NULL; thread_local unsigned int __currect_thread_id = 0; thread_local void * __currect_default_logger = NULL; -#define TFE_VAR_VERSION_CATTER(v) static __attribute__((__used__)) const char * TFE_VERSION_version_##v = NULL +#define TFE_VAR_VERSION_CATTER(v) __attribute__((__used__)) const char * TFE_VERSION_version_##v = NULL #define TFE_VAR_VERSION_EXPEND(v) TFE_VAR_VERSION_CATTER(v) +extern "C" +{ /* VERSION TAG */ #ifdef TFE_VAR_VERSION TFE_VAR_VERSION_EXPEND(TFE_VAR_VERSION); @@ -60,6 +62,7 @@ static __attribute__((__used__)) const char * TFE_VERSION_version_UNKNOWN = NULL #endif #undef TFE_VAR_VERSION_CATTER #undef TFE_VAR_VERSION_EXPEND +} /* VERSION STRING */ #ifdef TFE_GIT_VERSION