From e21123b6991c2d64339ecebd6617f2f7c42de783 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Fri, 8 Dec 2023 11:40:31 +0100 Subject: [PATCH 1/2] CI: update KDU to new version (older one no longer available) --- tools/travis-ci/install.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/travis-ci/install.sh b/tools/travis-ci/install.sh index 294539861..62d8c30ec 100755 --- a/tools/travis-ci/install.sh +++ b/tools/travis-ci/install.sh @@ -79,29 +79,29 @@ if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then if [ "${OPJ_NONCOMMERCIAL:-}" == "1" ]; then if [ "${TRAVIS_OS_NAME:-}" == "linux" -o "${RUNNER_OS:-}" == "Linux" ] || uname -s | grep -i Linux &> /dev/null; then echo "Retrieving Kakadu" - wget -q http://kakadusoftware.com/wp-content/uploads/KDU805_Demo_Apps_for_Linux-x86-64_200602.zip - cmake -E tar -xf KDU805_Demo_Apps_for_Linux-x86-64_200602.zip - mv KDU805_Demo_Apps_for_Linux-x86-64_200602 kdu + wget -q http://kakadusoftware.com/wp-content/uploads/KDU841_Demo_Apps_for_Linux-x86-64_231117.zip + cmake -E tar -xf KDU841_Demo_Apps_for_Linux-x86-64_231117.zip + mv KDU841_Demo_Apps_for_Linux-x86-64_231117 kdu elif [ "${TRAVIS_OS_NAME:-}" == "osx" -o "${RUNNER_OS:-}" == "macOS" ] || uname -s | grep -i Darwin &> /dev/null; then echo "Retrieving Kakadu" - wget -v http://kakadusoftware.com/wp-content/uploads/KDU805_Demo_Apps_for_MacOS_200602.dmg_.zip - cmake -E tar -xf KDU805_Demo_Apps_for_MacOS_200602.dmg_.zip + wget -v http://kakadusoftware.com/wp-content/uploads/KDU841_Demo_Apps_for_MacOS_231117.dmg_.zip + cmake -E tar -xf KDU841_Demo_Apps_for_MacOS_231117.dmg_.zip wget -q http://downloads.sourceforge.net/project/catacombae/HFSExplorer/0.23/hfsexplorer-0.23-bin.zip mkdir hfsexplorer && cmake -E chdir hfsexplorer tar -xf ../hfsexplorer-0.23-bin.zip - ./hfsexplorer/bin/unhfs.sh -o ./ -fsroot Kakadu-demo-apps.pkg KDU805_Demo_Apps_for_MacOS_200602.dmg + ./hfsexplorer/bin/unhfs.sh -o ./ -fsroot Kakadu-demo-apps.pkg KDU841_Demo_Apps_for_MacOS_231117.dmg pkgutil --expand Kakadu-demo-apps.pkg ./kdu cd kdu - cat libkduv80r.pkg/Payload | gzip -d | cpio -id + cat libkduv84r.pkg/Payload | gzip -d | cpio -id cat kduexpand.pkg/Payload | gzip -d | cpio -id cat kducompress.pkg/Payload | gzip -d | cpio -id - install_name_tool -id ${PWD}/libkdu_v80R.dylib libkdu_v80R.dylib - install_name_tool -change /usr/local/lib/libkdu_v80R.dylib ${PWD}/libkdu_v80R.dylib kdu_compress - install_name_tool -change /usr/local/lib/libkdu_v80R.dylib ${PWD}/libkdu_v80R.dylib kdu_expand + install_name_tool -id ${PWD}/libkdu_v84R.dylib libkdu_v84R.dylib + install_name_tool -change /usr/local/lib/libkdu_v84R.dylib ${PWD}/libkdu_v84R.dylib kdu_compress + install_name_tool -change /usr/local/lib/libkdu_v84R.dylib ${PWD}/libkdu_v84R.dylib kdu_expand elif [ "${APPVEYOR:-}" == "True" -o "${RUNNER_OS:-}" == "Windows" ] || uname -s | grep -i MINGW &> /dev/null || uname -s | grep -i CYGWIN &> /dev/null; then echo "Retrieving Kakadu" - wget -q http://kakadusoftware.com/wp-content/uploads/KDU805_Demo_Apps_for_Win64_200602.msi_.zip - cmake -E tar -xf KDU805_Demo_Apps_for_Win64_200602.msi_.zip - msiexec /i KDU805_Demo_Apps_for_Win64_200602.msi /quiet /qn /norestart + wget -q http://kakadusoftware.com/wp-content/uploads/KDU841_Demo_Apps_for_Win64_231117.msi_.zip + cmake -E tar -xf KDU841_Demo_Apps_for_Win64_231117.msi_.zip + msiexec /i KDU841_Demo_Apps_for_Win64_231117.msi /quiet /qn /norestart if [ -d "C:/Program Files/Kakadu" ]; then cp -r "C:/Program Files/Kakadu" ./kdu else From d5af1d23a718e1d55ea368bad044f7f2b9e98012 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Fri, 8 Dec 2023 12:06:51 +0100 Subject: [PATCH 2/2] tools/travis-ci/install.sh: workaround issue with jpylyzer on Mac --- tools/ctest_scripts/travis-ci.cmake | 12 +++++++++--- tools/travis-ci/install.sh | 4 +++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/tools/ctest_scripts/travis-ci.cmake b/tools/ctest_scripts/travis-ci.cmake index 6dbe52c4d..b9f75fff3 100644 --- a/tools/ctest_scripts/travis-ci.cmake +++ b/tools/ctest_scripts/travis-ci.cmake @@ -127,13 +127,19 @@ BUILD_UNIT_TESTS:BOOL=TRUE # JPEG2000 test files are available with git clone https://github.com/uclouvain/openjpeg-data.git OPJ_DATA_ROOT:PATH=$ENV{PWD}/data -# jpylyzer is available with on GitHub: https://github.com/openpreserve/jpylyzer -JPYLYZER_EXECUTABLE=$ENV{PWD}/jpylyzer/jpylyzer.${JPYLYZER_EXT} - # Enable astyle WITH_ASTYLE:BOOL=${BUILD_ASTYLE} " ) +if(EXISTS "$ENV{PWD}/jpylyzer/jpylyzer.${JPYLYZER_EXT}") + set(CACHE_CONTENTS " +${CACHE_CONTENTS} + +# jpylyzer is available with on GitHub: https://github.com/openpreserve/jpylyzer +JPYLYZER_EXECUTABLE=$ENV{PWD}/jpylyzer/jpylyzer.${JPYLYZER_EXT} +") +endif() + #--------------------- #1. openjpeg specific: set( CTEST_PROJECT_NAME "OPENJPEG" ) diff --git a/tools/travis-ci/install.sh b/tools/travis-ci/install.sh index 62d8c30ec..1407ae8b2 100755 --- a/tools/travis-ci/install.sh +++ b/tools/travis-ci/install.sh @@ -59,7 +59,9 @@ if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then # We need jpylyzer for the test suite JPYLYZER_VERSION="1.17.0" echo "Retrieving jpylyzer" - if [ "${APPVEYOR:-}" == "True" -o "${RUNNER_OS:-}" == "Windows" ]; then + if [ "${TRAVIS_OS_NAME:-}" == "osx" -o "${RUNNER_OS:-}" == "macOS" ] || uname -s | grep -i Darwin &> /dev/null; then + echo "Skip Retrieving jpylyzer on OSX. Related tests no longer work on CI" + elif [ "${APPVEYOR:-}" == "True" -o "${RUNNER_OS:-}" == "Windows" ]; then wget -q https://github.com/openpreserve/jpylyzer/releases/download/${JPYLYZER_VERSION}/jpylyzer_${JPYLYZER_VERSION}_win32.zip mkdir jpylyzer cd jpylyzer