diff options
| author | 杨威 <[email protected]> | 2019-05-23 15:11:18 +0800 |
|---|---|---|
| committer | 杨威 <[email protected]> | 2019-05-23 15:11:18 +0800 |
| commit | 6cdaba1ec75ada86b0365ab7b045e5d31dbd8109 (patch) | |
| tree | 58461b3ba23df0ad05b9ec8de9db917ed7cd5f42 | |
| parent | 863280915aa449b4628ccce2af1711934c6826b5 (diff) | |
| parent | e179e7ff9d7db44a7bd404a7b2919bab1061725d (diff) | |
Merge branch 'Feature-add-pack' into 'master'
Feature add pack
See merge request MESA_framework/FieldStat2!16
| -rwxr-xr-x | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | autorelease.sh | 32 | ||||
| -rw-r--r-- | cmake/Package.cmake | 36 |
3 files changed, 70 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4511f70..9735187 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,7 @@ file(GLOB SRC add_library(${lib_name}_shared SHARED ${SRC}) set_target_properties(${lib_name}_shared PROPERTIES LINK_FLAGS "-Wl,--version-script=${PROJECT_SOURCE_DIR}/src/version.map") -set_target_properties(${lib_name}_shared PROPERTIES OUTPUT_NAME ${lib_name} LIBRARY_OUTPUT_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib) +set_target_properties(${lib_name}_shared PROPERTIES OUTPUT_NAME ${lib_name}) # static Library Output add_library(${lib_name}_static STATIC ${SRC}) @@ -48,7 +48,7 @@ set_target_properties(${lib_name}_static PROPERTIES OUTPUT_NAME ${lib_name}) install(TARGETS ${lib_name}_shared ${lib_name}_static DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) install(FILES inc/field_stat2.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/MESA COMPONENT devel) - +include(Package) file(GLOB DEMO "test/*.c" diff --git a/autorelease.sh b/autorelease.sh new file mode 100644 index 0000000..95945e2 --- /dev/null +++ b/autorelease.sh @@ -0,0 +1,32 @@ +#!/bin/sh +if [ $# -lt 7 ] ; then + echo "USAGE: ./autorelease.sh [API_V4_URL] [PROJECT_URL] + [PROJECT_ID] [TOKEN] + [COMMIT_TAG] [JOB] [PROJECT_NAME]" +exit 1; +fi + +CI_API_V4_URL=$1 +CI_PROJECT_URL=$2 +CI_PROJECT_ID=$3 +CI_TOKEN=$4 +CI_COMMIT_TAG=$5 +ARTIFACTS_JOB=$6 +CI_PROJECT_NAME=$7 + +res=`echo -e "curl --header \"PRIVATE-TOKEN: $CI_TOKEN\" $CI_API_V4_URL/projects/$CI_PROJECT_ID/releases/$CI_COMMIT_TAG -o /dev/null -s -w %{http_code}"| /bin/bash` + +if [[ $res == "200" ]]; then + eval $(echo -e "curl --request POST --header \"PRIVATE-TOKEN: $CI_TOKEN\" \ + --data name=\"$CI_PROJECT_NAME-$CI_COMMIT_TAG-artifacts.zip\" \ + --data url=\"$CI_PROJECT_URL/-/jobs/artifacts/$CI_COMMIT_TAG/download?job=$ARTIFACTS_JOB\"\ + $CI_API_V4_URL/projects/$CI_PROJECT_ID/releases/$CI_COMMIT_TAG/assets/links") +else + eval $(echo -e "curl --header 'Content-Type: application/json' --header \ + \"PRIVATE-TOKEN: $CI_TOKEN\" --data '{ \"name\": \"$CI_COMMIT_TAG\", \ + \"tag_name\": \"$CI_COMMIT_TAG\", \"description\": \"auto_release\",\ + \"assets\": { \"links\": [{ \"name\": \ + \"$CI_PROJECT_NAME-$CI_COMMIT_TAG-artifacts.zip\", \"url\": \ + \"$CI_PROJECT_URL/-/jobs/artifacts/$CI_COMMIT_TAG/download?job=$ARTIFACTS_JOB\"\ + }] } }' --request POST $CI_API_V4_URL/projects/$CI_PROJECT_ID/releases/") +fi diff --git a/cmake/Package.cmake b/cmake/Package.cmake new file mode 100644 index 0000000..daf7e42 --- /dev/null +++ b/cmake/Package.cmake @@ -0,0 +1,36 @@ +if(CMAKE_BUILD_TYPE STREQUAL "Debug") + set(CPACK_PACKAGE_NAME "${lib_name}-debug") +else() + set(CPACK_PACKAGE_NAME ${lib_name}) +endif() + +message(STATUS "Package: ${CPACK_PACKAGE_NAME}") + +set(CPACK_PACKAGE_VECDOR "MESA") +set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}") +set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}") +set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}.${VERSION_BUILD}") +set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) + +set(CPACK_RPM_PACKAGE_DEBUG 1) + +# RPM Build +set(CPACK_GENERATOR "RPM") +set(CPACK_RPM_AUTO_GENERATED_FILE_NAME ON) +set(CPACK_RPM_FILE_NAME "RPM-DEFAULT") +set(CPACK_RPM_PACKAGE_VENDOR "MESA") +set(CPACK_RPM_PACKAGE_AUTOREQPROV "no") +set(CPACK_RPM_PACKAGE_RELEASE_DIST on) +set(CPACK_RPM_DEBUGINFO_PACKAGE on) + +set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}") + +# Must uninstall the debug package before install release package +if(CMAKE_BUILD_TYPE STREQUAL "Debug") + set(CPACK_RPM_PACKAGE_CONFLICTS "${lib_name}-debug") +else() + set(CPACK_RPM_PACKAGE_CONFLICTS ${lib_name}) + # set(CPACK_STRIP_FILES TRUE) +endif() + +include(CPack) |
