diff options
| author | luqiuwen <[email protected]> | 2019-08-30 10:05:35 +0800 |
|---|---|---|
| committer | 陆秋文 <[email protected]> | 2019-08-30 15:46:08 +0800 |
| commit | a44578f80b9711374067497039af8e3dbc7946c9 (patch) | |
| tree | 372e6310dca0a724a0835ab600ecfbcdc0e11aba /cmake | |
| parent | 4810ef66c4e23964ee625136d4c78582ea49b595 (diff) | |
修正CI脚本，适配基于PULP的YUM仓库。
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Package.cmake | 1 | ||||
| -rw-r--r-- | cmake/Version.cmake | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/cmake/Package.cmake b/cmake/Package.cmake index 8822905..540be52 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -32,6 +32,5 @@ endif() # setup %config(noreplace) set(CPACK_RPM_USER_FILELIST "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/conf/pangu/pangu_pxy.conf" - "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/conf/tfe/decrypt_mirror.conf" "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/conf/tfe/tfe.conf") include(CPack) diff --git a/cmake/Version.cmake b/cmake/Version.cmake index b97c9c1..20b0416 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -18,6 +18,11 @@ include(${__VERSION_CONFIG}) string(REGEX REPLACE "^v([0-9]+)\\..*" "\\1" TFE_VERSION_MAJOR "${VCS_TAG}") string(REGEX REPLACE "^v[0-9]+\\.([0-9]+).*" "\\1" TFE_VERSION_MINOR "${VCS_TAG}") string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" TFE_VERSION_PATCH "${VCS_TAG}") +string(REGEX REPLACE "[T\\:\\+\\-]" "" TFE_VERSION_DATE "${VCS_DATE}") + +if(TFE_VERSION_DAILY_BUILD) + set(TFE_VERSION_PATCH ${TFE_VERSION_PATCH}.${TFE_VERSION_DATE}) +endif() if(NOT TFE_VERSION_MAJOR) set(TFE_VERSION_MAJOR 3) @@ -31,10 +36,12 @@ if(NOT TFE_VERSION_PATCH) set(TFE_VERSION_PATCH 0) endif() -set(TFE_VERSION "${TFE_VERSION_MAJOR}.${TFE_VERSION_MINOR}.${TFE_VERSION_PATCH}") set(TFE_DESCRIBE "${VCS_SHORT_HASH}") +set(TFE_VERSION "${TFE_VERSION_MAJOR}.${TFE_VERSION_MINOR}.${TFE_VERSION_PATCH}") 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}") + +# Replace .- with _ +string(REGEX REPLACE "[\\.\\-]" "_" TFE_VAR_VERSION "${TFE_GIT_VERSION}") # print information message(STATUS "Welcome to Tango Frontend Engine, Version: ${TFE_GIT_VERSION}") |