From dd00120e96f063e9c18f7c0705e6a9deec9e38a2 Mon Sep 17 00:00:00 2001 From: mayeut Date: Tue, 8 Sep 2015 22:24:06 +0200 Subject: [PATCH 1/6] Add Kakadu tests --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1f7966f4a..6a376bfd5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,12 @@ before_install: - cmake --version - git clone --depth=1 --branch=master git://github.com/uclouvain/openjpeg-data.git data - wget -qO - https://github.com/openpreserve/jpylyzer/archive/1.14.2.tar.gz | tar -xvz + - wget -q http://kakadusoftware.com/wp-content/uploads/2014/06/KDU77_Demo_Apps_for_Linux-x86-64_150710.zip install: - chmod +x jpylyzer-1.14.2/jpylyzer/jpylyzer.py + - cmake -E tar -xf KDU77_Demo_Apps_for_Linux-x86-64_150710.zip + - export LD_LIBRARY_PATH=${PWD}/KDU77_Demo_Apps_for_Linux-x86-64_150710:${LD_LIBRARY_PATH} + - export PATH=${PWD}/KDU77_Demo_Apps_for_Linux-x86-64_150710:${PATH} script: - mkdir build From 0a27667878009ae271ebe45283d74537daedaef0 Mon Sep 17 00:00:00 2001 From: mayeut Date: Wed, 9 Sep 2015 21:35:50 +0200 Subject: [PATCH 2/6] Add notice for kakadu use --- .travis.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6a376bfd5..3ea5dfcde 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,15 @@ before_install: - cmake --version - git clone --depth=1 --branch=master git://github.com/uclouvain/openjpeg-data.git data - wget -qO - https://github.com/openpreserve/jpylyzer/archive/1.14.2.tar.gz | tar -xvz - - wget -q http://kakadusoftware.com/wp-content/uploads/2014/06/KDU77_Demo_Apps_for_Linux-x86-64_150710.zip +# When OPJ_NONCOMMERCIAL=1, kakadu trial binaries are used for testing. Here's the copyright notice from kakadu: +# Copyright is owned by NewSouth Innovations Pty Limited, commercial arm of the UNSW Australia in Sydney. +# You are free to trial these executables and even to re-distribute them, +# so long as such use or re-distribution is accompanied with this copyright notice and is not for commercial gain. +# Note: Binaries can only be used for non-commercial purposes. + - if [ "${OPJ_NONCOMMERCIAL:-}" == "1" ]; then wget -q http://kakadusoftware.com/wp-content/uploads/2014/06/KDU77_Demo_Apps_for_Linux-x86-64_150710.zip; fi install: - chmod +x jpylyzer-1.14.2/jpylyzer/jpylyzer.py - - cmake -E tar -xf KDU77_Demo_Apps_for_Linux-x86-64_150710.zip + - if [ "${OPJ_NONCOMMERCIAL:-}" == "1" ]; then cmake -E tar -xf KDU77_Demo_Apps_for_Linux-x86-64_150710.zip; fi - export LD_LIBRARY_PATH=${PWD}/KDU77_Demo_Apps_for_Linux-x86-64_150710:${LD_LIBRARY_PATH} - export PATH=${PWD}/KDU77_Demo_Apps_for_Linux-x86-64_150710:${PATH} From 29ce132df414c00ac570ce10ed7086ca21d77557 Mon Sep 17 00:00:00 2001 From: mayeut Date: Fri, 11 Sep 2015 21:04:49 +0200 Subject: [PATCH 3/6] Echo Kakadu copyright notice --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 3ea5dfcde..b63aeffcd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ before_install: # You are free to trial these executables and even to re-distribute them, # so long as such use or re-distribution is accompanied with this copyright notice and is not for commercial gain. # Note: Binaries can only be used for non-commercial purposes. + - if [ "${OPJ_NONCOMMERCIAL:-}" == "1" ]; then echo -e "Testing will use Kakadu trial binaries. Here's the copyright notice from kakadu:\nCopyright is owned by NewSouth Innovations Pty Limited, commercial arm of the UNSW Australia in Sydney.\nYou are free to trial these executables and even to re-distribute them,\nso long as such use or re-distribution is accompanied with this copyright notice and is not for commercial gain.\nNote: Binaries can only be used for non-commercial purposes.\n"; fi - if [ "${OPJ_NONCOMMERCIAL:-}" == "1" ]; then wget -q http://kakadusoftware.com/wp-content/uploads/2014/06/KDU77_Demo_Apps_for_Linux-x86-64_150710.zip; fi install: - chmod +x jpylyzer-1.14.2/jpylyzer/jpylyzer.py From cd10f46572a76efe68447f30d12406fc275d6a06 Mon Sep 17 00:00:00 2001 From: mayeut Date: Fri, 11 Sep 2015 21:15:17 +0200 Subject: [PATCH 4/6] Echo Kakadu copyright notice --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b63aeffcd..86e6feb6e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ before_install: # You are free to trial these executables and even to re-distribute them, # so long as such use or re-distribution is accompanied with this copyright notice and is not for commercial gain. # Note: Binaries can only be used for non-commercial purposes. - - if [ "${OPJ_NONCOMMERCIAL:-}" == "1" ]; then echo -e "Testing will use Kakadu trial binaries. Here's the copyright notice from kakadu:\nCopyright is owned by NewSouth Innovations Pty Limited, commercial arm of the UNSW Australia in Sydney.\nYou are free to trial these executables and even to re-distribute them,\nso long as such use or re-distribution is accompanied with this copyright notice and is not for commercial gain.\nNote: Binaries can only be used for non-commercial purposes.\n"; fi + - if [ "${OPJ_NONCOMMERCIAL:-}" == "1" ]; then echo "Testing will use Kakadu trial binaries. Here's the copyright notice from kakadu:"; echo "Copyright is owned by NewSouth Innovations Pty Limited, commercial arm of the UNSW Australia in Sydney."; echo "You are free to trial these executables and even to re-distribute them,"; echo "so long as such use or re-distribution is accompanied with this copyright notice and is not for commercial gain."; echo "Note: Binaries can only be used for non-commercial purposes."; fi - if [ "${OPJ_NONCOMMERCIAL:-}" == "1" ]; then wget -q http://kakadusoftware.com/wp-content/uploads/2014/06/KDU77_Demo_Apps_for_Linux-x86-64_150710.zip; fi install: - chmod +x jpylyzer-1.14.2/jpylyzer/jpylyzer.py From c31a28fcd1337725b148de7ae5faf73856e9203e Mon Sep 17 00:00:00 2001 From: mayeut Date: Fri, 11 Sep 2015 21:21:22 +0200 Subject: [PATCH 5/6] Echo Kakadu copyright notice --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 86e6feb6e..6883227c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ before_install: # You are free to trial these executables and even to re-distribute them, # so long as such use or re-distribution is accompanied with this copyright notice and is not for commercial gain. # Note: Binaries can only be used for non-commercial purposes. - - if [ "${OPJ_NONCOMMERCIAL:-}" == "1" ]; then echo "Testing will use Kakadu trial binaries. Here's the copyright notice from kakadu:"; echo "Copyright is owned by NewSouth Innovations Pty Limited, commercial arm of the UNSW Australia in Sydney."; echo "You are free to trial these executables and even to re-distribute them,"; echo "so long as such use or re-distribution is accompanied with this copyright notice and is not for commercial gain."; echo "Note: Binaries can only be used for non-commercial purposes."; fi + - if [ "${OPJ_NONCOMMERCIAL:-}" == "1" ]; then echo "Testing will use Kakadu trial binaries. Here's the copyright notice from kakadu:"; echo "Copyright is owned by NewSouth Innovations Pty Limited, commercial arm of the UNSW Australia in Sydney."; echo "You are free to trial these executables and even to re-distribute them,"; echo "so long as such use or re-distribution is accompanied with this copyright notice and is not for commercial gain."; echo "Note:\ Binaries can only be used for non-commercial purposes."; fi - if [ "${OPJ_NONCOMMERCIAL:-}" == "1" ]; then wget -q http://kakadusoftware.com/wp-content/uploads/2014/06/KDU77_Demo_Apps_for_Linux-x86-64_150710.zip; fi install: - chmod +x jpylyzer-1.14.2/jpylyzer/jpylyzer.py From 47b7b2787b753a76426c6b4f59e2d8c9d78d5dd4 Mon Sep 17 00:00:00 2001 From: mayeut Date: Fri, 11 Sep 2015 21:25:45 +0200 Subject: [PATCH 6/6] Echo Kakadu copyright notice MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move to script so that travis-ci doesn’t hide this by default --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6883227c9..a7f975ee1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ before_install: # You are free to trial these executables and even to re-distribute them, # so long as such use or re-distribution is accompanied with this copyright notice and is not for commercial gain. # Note: Binaries can only be used for non-commercial purposes. - - if [ "${OPJ_NONCOMMERCIAL:-}" == "1" ]; then echo "Testing will use Kakadu trial binaries. Here's the copyright notice from kakadu:"; echo "Copyright is owned by NewSouth Innovations Pty Limited, commercial arm of the UNSW Australia in Sydney."; echo "You are free to trial these executables and even to re-distribute them,"; echo "so long as such use or re-distribution is accompanied with this copyright notice and is not for commercial gain."; echo "Note:\ Binaries can only be used for non-commercial purposes."; fi - if [ "${OPJ_NONCOMMERCIAL:-}" == "1" ]; then wget -q http://kakadusoftware.com/wp-content/uploads/2014/06/KDU77_Demo_Apps_for_Linux-x86-64_150710.zip; fi install: - chmod +x jpylyzer-1.14.2/jpylyzer/jpylyzer.py @@ -20,10 +19,11 @@ install: - export PATH=${PWD}/KDU77_Demo_Apps_for_Linux-x86-64_150710:${PATH} script: - - mkdir build - - cd build - - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DBUILD_CODEC=ON -DBUILD_THIRDPARTY=ON -DBUILD_TESTING=ON -DOPJ_DATA_ROOT=${PWD}/../data -DJPYLYZER_EXECUTABLE=${PWD}/../jpylyzer-1.14.2/jpylyzer/jpylyzer.py -DSITE=travis-ci.org -DBUILDNAME=${TRAVIS_OS_NAME}-${CC}$(${CC} -dumpversion)-x86_64-${TRAVIS_BRANCH}$( [[ "${TRAVIS_PULL_REQUEST}" != "false" ]] && echo "-pr${TRAVIS_PULL_REQUEST}" )-Release-3rdP .. - - ctest -D ExperimentalStart - - ctest -D ExperimentalBuild -V - - ctest -D ExperimentalTest -j2 || true - - ctest -D ExperimentalSubmit || true + - if [ "${OPJ_NONCOMMERCIAL:-}" == "1" ]; then echo -e "\nTesting will use Kakadu trial binaries. Here's the copyright notice from kakadu:\nCopyright is owned by NewSouth Innovations Pty Limited, commercial arm of the UNSW Australia in Sydney.\nYou are free to trial these executables and even to re-distribute them,\nso long as such use or re-distribution is accompanied with this copyright notice and is not for commercial gain.\nNote:\ Binaries can only be used for non-commercial purposes.\n"; fi + - mkdir build + - cd build + - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DBUILD_CODEC=ON -DBUILD_THIRDPARTY=ON -DBUILD_TESTING=ON -DOPJ_DATA_ROOT=${PWD}/../data -DJPYLYZER_EXECUTABLE=${PWD}/../jpylyzer-1.14.2/jpylyzer/jpylyzer.py -DSITE=travis-ci.org -DBUILDNAME=${TRAVIS_OS_NAME}-${CC}$(${CC} -dumpversion)-x86_64-${TRAVIS_BRANCH}$( [[ "${TRAVIS_PULL_REQUEST}" != "false" ]] && echo "-pr${TRAVIS_PULL_REQUEST}" )-Release-3rdP .. + - ctest -D ExperimentalStart + - ctest -D ExperimentalBuild -V + - ctest -D ExperimentalTest -j2 || true + - ctest -D ExperimentalSubmit || true