diff options
| author | 刘学利 <[email protected]> | 2020-04-30 14:19:45 +0800 |
|---|---|---|
| committer | 刘学利 <[email protected]> | 2020-04-30 14:19:45 +0800 |
| commit | 5effe725bc37c01dcb250b7cb8b99589a9d7c813 (patch) | |
| tree | 5e1931f463c8659bef84a5a22aa806955b8e2a7b | |
| parent | f654552b29bb2f5ac05bd309c0ba81004de0340e (diff) | |
| parent | a9d7ad59f60a18df6676890ea94dc76c6e6114e8 (diff) | |
Merge branch 'develop' into 'master'v2.0.2
Develop
See merge request MESA_Platform/dns!2
| -rw-r--r-- | .gitlab-ci.yml | 8 | ||||
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | cmake/Package.cmake | 1 |
3 files changed, 8 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b98dbaa..9364006 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,8 +76,8 @@ release_build_release: BUILD_TYPE: RelWithDebInfo PACKAGE: 1 UPLOAD: 1 - PULP3_REPO_NAME: platform-stable-x86_64.el7 - PULP3_DIST_NAME: platform-stable-x86_64.el7 + PULP3_REPO_NAME: protocol-stable-x86_64.el7 + PULP3_DIST_NAME: protocol-stable-x86_64.el7 extends: .build_by_travis artifacts: name: "dns-$CI_COMMIT_REF_NAME-release" @@ -93,8 +93,8 @@ release_build_release_devel: ENABLE_DEVEL_SWITCH: "ON" PACKAGE: 1 UPLOAD: 1 - PULP3_REPO_NAME: platform-stable-x86_64.el7 - PULP3_DIST_NAME: platform-stable-x86_64.el7 + PULP3_REPO_NAME: protocol-stable-x86_64.el7 + PULP3_DIST_NAME: protocol-stable-x86_64.el7 extends: .build_by_travis artifacts: name: "dns-$CI_COMMIT_REF_NAME-release" diff --git a/CMakeLists.txt b/CMakeLists.txt index 59f7512..f740203 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,9 +47,9 @@ else() endif() set(CPACK_RPM_USER_FILELIST "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/plug/protocol/dns/dns.inf" - "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/conf/dns/dns.conf") - + "%config(noreplace) ${CMAKE_INSTALL_PREFIX}/conf/dns/dns.conf") +set(CMAKE_INSTALL_PREFIX /home/mesasoft/sapp_run) install(TARGETS dns LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/plug/protocol/dns COMPONENT LIBRARY) install(FILES bin/dns.inf DESTINATION ${CMAKE_INSTALL_PREFIX}/plug/protocol/dns COMPONENT PROFILE) install(FILES bin/dns.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/conf/dns COMPONENT PROFILE) @@ -64,7 +64,7 @@ add_library(dns_test SHARED ${DEMO}) set_target_properties(dns_test PROPERTIES PREFIX "") target_link_libraries(dns_test ${DNS_DEPEND_DYN_LIB}) -install(TARGETS dns_test LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/plug/business/dns_test) -install(FILES test/bin/dns_test.inf DESTINATION ${CMAKE_INSTALL_PREFIX}/plug/business/dns_test) +install(TARGETS dns_test LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/plug/business/dns_test COMPONENT LIBRARY) +install(FILES test/bin/dns_test.inf DESTINATION ${CMAKE_INSTALL_PREFIX}/plug/business/dns_test COMPONENT PROFILE) include(Package) diff --git a/cmake/Package.cmake b/cmake/Package.cmake index 6b4f698..edb4258 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -14,7 +14,6 @@ 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 bash -c "git log --branches=x10 --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'" OUTPUT_FILE "changelog.txt") execute_process(COMMAND sh changelog.sh WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/cmake) SET(CPACK_RPM_CHANGELOG_FILE ${PROJECT_SOURCE_DIR}/cmake/changelog.txt) |