diff options
| author | liuxueli <[email protected]> | 2020-10-10 17:06:03 +0800 |
|---|---|---|
| committer | liuxueli <[email protected]> | 2020-10-10 17:06:03 +0800 |
| commit | c564bd6d0af55a8d4f6315fea89b610ed6550859 (patch) | |
| tree | cd9473ae69cd758725f8d8692ddce1fb9b850630 /cmake | |
| parent | 1eb98bafe136bc3b3566044de598ac5f7f1c47f5 (diff) | |
编译时链接ASAN
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Package.cmake | 4 | ||||
| -rw-r--r-- | cmake/PreUninstall.sh | 5 | ||||
| -rw-r--r-- | cmake/changelog.sh | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/cmake/Package.cmake b/cmake/Package.cmake index c69fec4..5eb84a3 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -14,8 +14,8 @@ set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) set(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_BUILD}") execute_process(COMMAND bash -c "echo -ne \"`uname -r | awk -F'.' '{print $5\".\"$6\".\"$7}'`\"" OUTPUT_VARIABLE SYSTEM_VERSION) -execute_process(COMMAND sh changelog.sh WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/cmake) -SET(CPACK_RPM_CHANGELOG_FILE ${PROJECT_SOURCE_DIR}/cmake/changelog.txt) +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") diff --git a/cmake/PreUninstall.sh b/cmake/PreUninstall.sh index 96abc6f..b6cb3ef 100644 --- a/cmake/PreUninstall.sh +++ b/cmake/PreUninstall.sh @@ -2,6 +2,11 @@ if [ $1 == 0 ]; then DST=${RPM_INSTALL_PREFIX} mkdir -p ${DST}/plug/platform/ + mkdir -p ${DST}/etc/ + + touch ${DST}/plug/conflist.inf + touch ${DST}/etc/project_list.conf + sed -i '/tsg_master.inf/d' ${DST}/plug/conflist.inf sed -i '/POLICY_PRIORITY/d' ${DST}/etc/project_list.conf sed -i '/TSG_MASTER_INTERNAL_LABEL/d' ${DST}/etc/project_list.conf diff --git a/cmake/changelog.sh b/cmake/changelog.sh index 7d8bf7f..67f995f 100644 --- a/cmake/changelog.sh +++ b/cmake/changelog.sh @@ -1,4 +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' > changelog.txt +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 |