WIP automatic release (ctd)

This commit is contained in:
Antonin Descampe 2016-05-15 02:03:13 +02:00
parent 7219854639
commit 595f0e1b2b
4 changed files with 8 additions and 5 deletions

View File

@ -80,4 +80,5 @@ deploy:
on:
repo: uclouvain/openjpeg
tags: true
condition: "$OPJ_CI_DEPLOY = 1"

View File

@ -36,3 +36,4 @@ deploy:
on:
branch: openjpeg-*
appveyor_repo_tag: true # deploy on tag push only
OPJ_CI_DEPLOY: 1

View File

@ -18,8 +18,8 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
"${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt" COPYONLY
)
# For PackageMaker on MacOSX it is important to have a file extension:
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt")
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_BINARY_DIR}/LICENSE")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/LICENSE")
set(CPACK_PACKAGE_VERSION_MAJOR "${OPENJPEG_VERSION_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${OPENJPEG_VERSION_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${OPENJPEG_VERSION_BUILD}")

View File

@ -277,12 +277,13 @@ echo "TRAVIS_TAG: ${TRAVIS_TAG:-}"
echo "APPVEYOR_REPO_TAG: ${APPVEYOR_REPO_TAG:-}"
echo "APPVEYOR_REPO_TAG_NAME: ${APPVEYOR_REPO_TAG_NAME:-}"
if [ "${OPJ_CI_DEPLOY:-}" == "1" ]; then
if [ "${TRAVIS_TAG:-}" != "" ]; then
cpack --config ${OPJ_SOURCE_DIR}/cmake/OpenJPEGCPack.cmake -V -G ZIP -P "OpenJPEG-${TRAVIS_TAG}-${OPJ_BUILDNAME_TEST}.zip"
if [ "${TRAVIS_TAG:-}" != "" ]; then
#cpack --config ${OPJ_SOURCE_DIR}/cmake/OpenJPEGCPack.cmake -V -G ZIP -P "OpenJPEG-${TRAVIS_TAG}-${OPJ_BUILDNAME_TEST}.zip"
fi
if [ "${APPVEYOR_REPO_TAG:-}" == "true" ]; then
cpack -G ZIP -P "OpenJPEG-${APPVEYOR_REPO_TAG_NAME}-${OPJ_BUILDNAME_TEST}.zip"
appveyor PushArtifact "OpenJPEG-${APPVEYOR_REPO_TAG_NAME}-${OPJ_BUILDNAME_TEST}.zip"
#cpack -G ZIP -P "OpenJPEG-${APPVEYOR_REPO_TAG_NAME}-${OPJ_BUILDNAME_TEST}.zip"
#appveyor PushArtifact "OpenJPEG-${APPVEYOR_REPO_TAG_NAME}-${OPJ_BUILDNAME_TEST}.zip"
fi
fi