walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #1348 from rouault/fix_kdu 

tools/travis-ci/install.sh: fix links to Kakadu and jpylyzer binaries
This commit is contained in:
Even Rouault 2021-05-04 19:15:06 +02:00 committed by GitHub
parent 0bda7188b7 9727f3ac69
commit 05263eeee9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
.travis.yml
View File

@ -3,9 +3,10 @@ language: cpp
matrix: matrix:
include: include:
# OSX # OSX
- os: osx # OPJ_NONCOMMERCIAL=0 because Kakadu install hangs (cf https://travis-ci.org/github/uclouvain/openjpeg/builds/769447606)
compiler: clang # - os: osx
env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release OPJ_CI_INCLUDE_IF_DEPLOY=1 # compiler: clang
# env: OPJ_NONCOMMERCIAL=0 OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release OPJ_CI_INCLUDE_IF_DEPLOY=1
# Test code style # Test code style
- os: linux - os: linux
@ -21,10 +22,11 @@ matrix:
- flip - flip
# Performance test with GCC # Performance test with GCC
- os: linux # Disabled because tests fail
compiler: g++ # - os: linux
dist: precise # compiler: g++
env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release OPJ_CI_INCLUDE_IF_DEPLOY=1 OPJ_CI_PERF_TESTS=1 # dist: precise
# env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release OPJ_CI_INCLUDE_IF_DEPLOY=1 OPJ_CI_PERF_TESTS=1
# Test compilation with AVX2 # Test compilation with AVX2
- os: linux - os: linux
@ -42,31 +44,34 @@ matrix:
- clang-3.8 - clang-3.8
# Test multi-threading # Test multi-threading
- os: linux # Disabled because tests fail (cf https://travis-ci.org/github/uclouvain/openjpeg/builds/769447606)
compiler: g++ # - os: linux
dist: precise # compiler: g++
env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release OPJ_NUM_THREADS=2 # dist: precise
# env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release OPJ_NUM_THREADS=2
# Test 32-bit compilation # Test 32-bit compilation
- os: linux # Disabled because tests fail (cf https://travis-ci.org/github/uclouvain/openjpeg/builds/769447606)
compiler: g++ # - os: linux
env: OPJ_CI_ARCH=i386 OPJ_CI_BUILD_CONFIGURATION=Release # compiler: g++
dist: trusty # env: OPJ_CI_ARCH=i386 OPJ_CI_BUILD_CONFIGURATION=Release
addons: # dist: trusty
apt: # addons:
packages: # apt:
- gcc-multilib # packages:
- g++-multilib # - gcc-multilib
# - g++-multilib
# Profile code (gcc -pg) # Profile code (gcc -pg)
- os: linux # Disabled because tests fail (cf https://travis-ci.org/github/uclouvain/openjpeg/builds/769447606)
compiler: g++ # - os: linux
env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Debug OPJ_CI_PROFILE=1 # compiler: g++
dist: trusty # env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Debug OPJ_CI_PROFILE=1
addons: # dist: trusty
apt: # addons:
packages: # apt:
- valgrind # packages:
# - valgrind
# Test under ASAN # Test under ASAN
# Temporarily disabled since broken. See https://github.com/uclouvain/openjpeg/issues/1091 # Temporarily disabled since broken. See https://github.com/uclouvain/openjpeg/issues/1091

28
tools/travis-ci/install.sh
View File

@ -65,7 +65,7 @@ if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then
JPYLYZER_VERSION="1.17.0" JPYLYZER_VERSION="1.17.0"
echo "Retrieving jpylyzer" echo "Retrieving jpylyzer"
if [ "${APPVEYOR:-}" == "True" ]; then if [ "${APPVEYOR:-}" == "True" ]; then
wget -q http://dl.bintray.com/openplanets/opf-windows/jpylyzer_${JPYLYZER_VERSION}_win32.zip wget -q https://github.com/openpreserve/jpylyzer/releases/download/${JPYLYZER_VERSION}/jpylyzer_${JPYLYZER_VERSION}_win32.zip
mkdir jpylyzer mkdir jpylyzer
cd jpylyzer cd jpylyzer
cmake -E tar -xf ../jpylyzer_${JPYLYZER_VERSION}_win32.zip cmake -E tar -xf ../jpylyzer_${JPYLYZER_VERSION}_win32.zip
@ -84,29 +84,29 @@ if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then
if [ "${OPJ_NONCOMMERCIAL:-}" == "1" ]; then if [ "${OPJ_NONCOMMERCIAL:-}" == "1" ]; then
if [ "${TRAVIS_OS_NAME:-}" == "linux" ] || uname -s | grep -i Linux &> /dev/null; then if [ "${TRAVIS_OS_NAME:-}" == "linux" ] || uname -s | grep -i Linux &> /dev/null; then
echo "Retrieving Kakadu" echo "Retrieving Kakadu"
wget -q http://kakadusoftware.com/wp-content/uploads/2014/06/KDU77_Demo_Apps_for_Linux-x86-64_150710.zip wget -q http://kakadusoftware.com/wp-content/uploads/KDU805_Demo_Apps_for_Linux-x86-64_200602.zip
cmake -E tar -xf KDU77_Demo_Apps_for_Linux-x86-64_150710.zip cmake -E tar -xf KDU805_Demo_Apps_for_Linux-x86-64_200602.zip
mv KDU77_Demo_Apps_for_Linux-x86-64_150710 kdu mv KDU805_Demo_Apps_for_Linux-x86-64_200602 kdu
elif [ "${TRAVIS_OS_NAME:-}" == "osx" ] || uname -s | grep -i Darwin &> /dev/null; then elif [ "${TRAVIS_OS_NAME:-}" == "osx" ] || uname -s | grep -i Darwin &> /dev/null; then
echo "Retrieving Kakadu" echo "Retrieving Kakadu"
wget -v http://kakadusoftware.com/wp-content/uploads/2014/06/KDU77_Demo_Apps_for_OSX109_150710.dmg_.zip wget -v http://kakadusoftware.com/wp-content/uploads/KDU805_Demo_Apps_for_MacOS_200602.dmg_.zip
cmake -E tar -xf KDU77_Demo_Apps_for_OSX109_150710.dmg_.zip cmake -E tar -xf KDU805_Demo_Apps_for_MacOS_200602.dmg_.zip
wget -q http://downloads.sourceforge.net/project/catacombae/HFSExplorer/0.23/hfsexplorer-0.23-bin.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 mkdir hfsexplorer && cmake -E chdir hfsexplorer tar -xf ../hfsexplorer-0.23-bin.zip
./hfsexplorer/bin/unhfs.sh -o ./ -fsroot Kakadu-demo-apps.pkg KDU77_Demo_Apps_for_OSX109_150710.dmg ./hfsexplorer/bin/unhfs.sh -o ./ -fsroot Kakadu-demo-apps.pkg KDU805_Demo_Apps_for_MacOS_200602.dmg
pkgutil --expand Kakadu-demo-apps.pkg ./kdu pkgutil --expand Kakadu-demo-apps.pkg ./kdu
cd kdu cd kdu
cat libkduv77r.pkg/Payload | gzip -d | cpio -id cat libkduv80r.pkg/Payload | gzip -d | cpio -id
cat kduexpand.pkg/Payload | gzip -d | cpio -id cat kduexpand.pkg/Payload | gzip -d | cpio -id
cat kducompress.pkg/Payload | gzip -d | cpio -id cat kducompress.pkg/Payload | gzip -d | cpio -id
install_name_tool -id ${PWD}/libkdu_v77R.dylib libkdu_v77R.dylib install_name_tool -id ${PWD}/libkdu_v80R.dylib libkdu_v80R.dylib
install_name_tool -change /usr/local/lib/libkdu_v77R.dylib ${PWD}/libkdu_v77R.dylib kdu_compress install_name_tool -change /usr/local/lib/libkdu_v80R.dylib ${PWD}/libkdu_v80R.dylib kdu_compress
install_name_tool -change /usr/local/lib/libkdu_v77R.dylib ${PWD}/libkdu_v77R.dylib kdu_expand install_name_tool -change /usr/local/lib/libkdu_v80R.dylib ${PWD}/libkdu_v80R.dylib kdu_expand
elif [ "${APPVEYOR:-}" == "True" ] || uname -s | grep -i MINGW &> /dev/null || uname -s | grep -i CYGWIN &> /dev/null; then elif [ "${APPVEYOR:-}" == "True" ] || uname -s | grep -i MINGW &> /dev/null || uname -s | grep -i CYGWIN &> /dev/null; then
echo "Retrieving Kakadu" echo "Retrieving Kakadu"
wget -q http://kakadusoftware.com/wp-content/uploads/2014/06/KDU77_Demo_Apps_for_Win32_150710.msi_.zip wget -q http://kakadusoftware.com/wp-content/uploads/KDU805_Demo_Apps_for_Win64_200602.msi_.zip
cmake -E tar -xf KDU77_Demo_Apps_for_Win32_150710.msi_.zip cmake -E tar -xf KDU805_Demo_Apps_for_Win64_200602.msi_.zip
msiexec /i KDU77_Demo_Apps_for_Win32_150710.msi /quiet /qn /norestart msiexec /i KDU805_Demo_Apps_for_Win64_200602.msi /quiet /qn /norestart
if [ -d "C:/Program Files/Kakadu" ]; then if [ -d "C:/Program Files/Kakadu" ]; then
cp -r "C:/Program Files/Kakadu" ./kdu cp -r "C:/Program Files/Kakadu" ./kdu
else else