Revert LICENSE filename

diff --git a/cmake/OpenJPEGCPack.cmake b/cmake/OpenJPEGCPack.cmake
index ff2bf48a1320b6bac88776ca987af00cb5bdcd0c..a6e9a866e2b80cbcb84ee38cb5fd08f96416cac0 100644 (file)
--- a/cmake/OpenJPEGCPack.cmake
+++ b/cmake/OpenJPEGCPack.cmake
@@ -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")
-  set(CPACK_RESOURCE_FILE_LICENSE    "${CMAKE_CURRENT_BINARY_DIR}/LICENSE")
+  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_VERSION_MAJOR    "${OPENJPEG_VERSION_MAJOR}")
   set(CPACK_PACKAGE_VERSION_MINOR    "${OPENJPEG_VERSION_MINOR}")
   set(CPACK_PACKAGE_VERSION_PATCH    "${OPENJPEG_VERSION_BUILD}")

diff --git a/tools/travis-ci/run.sh b/tools/travis-ci/run.sh
index fbaf7ce8873047c6b1005cfa9470ebc78dd6a791..65662709c6201262f9af86108d4669891ea57473 100755 (executable)
--- a/tools/travis-ci/run.sh
+++ b/tools/travis-ci/run.sh
@@ -277,7 +277,7 @@ 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
-       cpack --config ${OPJ_SOURCE_DIR}/cmake/OpenJPEGCPack.cmake -V -G ZIP -P "OpenJPEG-${TRAVIS_TAG}-${OPJ_BUILDNAME_TEST}.zip"
+       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