diff options
| author | fumingwei <[email protected]> | 2020-10-15 11:59:51 +0800 |
|---|---|---|
| committer | fumingwei <[email protected]> | 2020-10-15 11:59:51 +0800 |
| commit | 3e6ac86853edcdc30da141073ef148f7818b54ba (patch) | |
| tree | 82cc2d944747bc90577ae29bea71227b91feb3b0 /cmake | |
| parent | 6d458ba380d2476f2ff5933a50521857e9946734 (diff) | |
1、增加编译asan 上传到 repo yum 源
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Package.cmake | 4 | ||||
| -rw-r--r-- | cmake/Version.cmake | 6 | ||||
| -rw-r--r-- | cmake/changelog.sh | 4 |
3 files changed, 14 insertions, 0 deletions
diff --git a/cmake/Package.cmake b/cmake/Package.cmake index 650de52..6833ec1 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -13,6 +13,10 @@ set(CPACK_PACKAGE_VERSION_PATCH "${KNI_VERSION_PATCH}.${KNI_DESCRIBE}") set(CMAKE_INSTALL_PREFIX "/home/mesasoft/sapp_run") set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") +execute_process(COMMAND sh changelog.sh ${CMAKE_BINARY_DIR} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/cmake) +SET(CPACK_RPM_CHANGELOG_FILE ${CMAKE_BINARY_DIR}/changelog.txt) + + # RPM Build set(CPACK_GENERATOR "RPM") set(CPACK_RPM_AUTO_GENERATED_FILE_NAME ON) diff --git a/cmake/Version.cmake b/cmake/Version.cmake index 226af85..e48f6b8 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -18,6 +18,12 @@ include(${__VERSION_CONFIG}) string(REGEX REPLACE "^v([0-9]+)\\..*" "\\1" KNI_VERSION_MAJOR "${VCS_TAG}") string(REGEX REPLACE "^v[0-9]+\\.([0-9]+).*" "\\1" KNI_VERSION_MINOR "${VCS_TAG}") string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" KNI_VERSION_PATCH "${VCS_TAG}") +string(REGEX REPLACE "[T\\:\\+\\-]" "" VERSION_DATE "${VCS_DATE}") + +if(VERSION_DAILY_BUILD) + set(VERSION_PATCH ${VERSION_PATCH}.${VERSION_DATE}) +endif() + if(NOT KNI_VERSION_MAJOR) set(KNI_VERSION_MAJOR 3) diff --git a/cmake/changelog.sh b/cmake/changelog.sh new file mode 100644 index 0000000..67f995f --- /dev/null +++ b/cmake/changelog.sh @@ -0,0 +1,4 @@ +#!/bin/sh +work_path=$1 +branch=`git status | grep branch | awk '{print $NF}'` +git log --branches=$branch --no-merges --date=local --show-signature --pretty="* %ad %an %ae %nhash: %H%ncommit:%n%B" | awk -F"-" '{print "- "$0}' | sed 's/- \*/\*/g' | sed 's/- $//g' | sed 's/-/ -/g' | sed 's/[0-9]\{2\}:[0-9]\{2\}:[0-9]\{2\}//g' > $work_path/changelog.txt |