diff options
| author | lijia <[email protected]> | 2020-07-01 20:29:04 +0800 |
|---|---|---|
| committer | lijia <[email protected]> | 2020-07-01 20:29:04 +0800 |
| commit | d22950558954272a566c739a1c98da6772caddd6 (patch) | |
| tree | 8700757c140fbc81f05c99105dfd3cbaaaf2d34f | |
| parent | 49ef917028f9b2518ce9c06050a320c59db07e3b (diff) | |
无核心功能升级与修改, 修复rpm包安装会覆盖已有user file的BUG, 修复sapp -v无法显示版本信息的BUG.v4.0.16
| -rw-r--r-- | cmake/Version.cmake | 14 | ||||
| -rw-r--r-- | src/config/cmd_args.c | 9 |
2 files changed, 12 insertions, 11 deletions
diff --git a/cmake/Version.cmake b/cmake/Version.cmake index 752f20f..764bcd5 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -32,7 +32,7 @@ if(NOT VERSION_PATCH) set(VERSION_PATCH 0) endif() -set(VERSION "${VERSION_MAJOR}_${VERSION_MINOR}_${VERSION_PATCH}") +set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") set(VERSION_BUILD "${VCS_SHORT_HASH}") # print information @@ -41,13 +41,13 @@ message(STATUS "Version: ${VERSION}-${VERSION_BUILD}") if(NOT DEFINE_GIT_VERSION) option(DEFINE_GIT_VERSION "Set DEFINE_GIT_VERSION to OFF" OFF) -set(GIT_VERSION - "${VERSION}-${CMAKE_BUILD_TYPE}-${VERSION_BUILD}-${VCS_BRANCH}-${VCS_TAG}-${VCS_DATE}") +#set(GIT_VERSION "${VERSION}-${CMAKE_BUILD_TYPE}-${VERSION_BUILD}-${VCS_BRANCH}-${VCS_TAG}-${VCS_DATE}") +set(GIT_VERSION "${VERSION}-${VERSION_BUILD}") +message(STATUS "GIT_VERSION: ${VERSION}-${VERSION_BUILD}") + string(REGEX REPLACE "[-:+/\\.]" "_" GIT_VERSION ${GIT_VERSION}) -if(DEFINE_GIT_VERSION) - add_definitions(-DGIT_VERSION=${GIT_VERSION}) - option(DEFINE_GIT_VERSION "Set DEFINE_GIT_VERSION to OFF" ON) -endif() +add_definitions(-DGIT_VERSION=\"${GIT_VERSION}\") +option(DEFINE_GIT_VERSION "Set DEFINE_GIT_VERSION to OFF" ON) endif() diff --git a/src/config/cmd_args.c b/src/config/cmd_args.c index 1ae2667..bb5a779 100644 --- a/src/config/cmd_args.c +++ b/src/config/cmd_args.c @@ -5,6 +5,10 @@ extern "C" { #include "sapp_api.h" #include "sapp_private_api.h" +#ifdef GIT_VERSION + __attribute__((__used__)) const char *sapp_git_ver = GIT_VERSION; +#endif + static inline int dumpfile_speed_check(const char *opt_name, const char *opt_arg) { @@ -221,10 +225,7 @@ int sapp_parse_cmd_args(int argc, char *argv[]) case 'v': #ifdef GIT_VERSION - printf("Version: %s\n", GIT_VERSION); -#endif -#ifdef GITVER - printf("Version: %s\n", GITVER); + printf("Version: %s\n", sapp_git_ver); #endif exit(1); |