From 3436c4e9baac1fd847c4475b961802cd1c9bbe7e Mon Sep 17 00:00:00 2001 From: Julien Malik Date: Tue, 19 Apr 2016 15:22:49 +0200 Subject: [PATCH 1/2] upgrade cmake to 3.5.2 --- tools/travis-ci/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/travis-ci/install.sh b/tools/travis-ci/install.sh index c62feee8..be99383e 100755 --- a/tools/travis-ci/install.sh +++ b/tools/travis-ci/install.sh @@ -37,9 +37,9 @@ fi if [ "${OPJ_CI_ASAN:-}" == "1" ]; then # We need a new version of cmake than travis-ci provides - wget --no-check-certificate -qO - https://cmake.org/files/v3.3/cmake-3.3.2-Linux-x86_64.tar.gz | tar -xz + wget --no-check-certificate -qO - https://cmake.org/files/v3.5/cmake-3.5.2-Linux-x86_64.tar.gz | tar -xz # copy to a directory that will not changed every version - mv cmake-3.3.2-Linux-x86_64 cmake-install + mv cmake-3.5.2-Linux-x86_64 cmake-install fi if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then From 6ea2ff0b0627655d36ad7cc7483de7592b8bcbd1 Mon Sep 17 00:00:00 2001 From: Julien Malik Date: Tue, 19 Apr 2016 15:25:42 +0200 Subject: [PATCH 2/2] Update jpylyzer to 1.17.0 --- tools/travis-ci/install.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/travis-ci/install.sh b/tools/travis-ci/install.sh index be99383e..003f8fa8 100755 --- a/tools/travis-ci/install.sh +++ b/tools/travis-ci/install.sh @@ -62,16 +62,17 @@ if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then git clone --depth=1 --branch=${OPJ_DATA_BRANCH} git://github.com/uclouvain/openjpeg-data.git data # We need jpylyzer for the test suite + JPYLYZER_VERSION="1.17.0" echo "Retrieving jpylyzer" if [ "${APPVEYOR:-}" == "True" ]; then - wget --local-encoding=UTF-8 -q http://dl.bintray.com/openplanets/opf-windows/jpylyzer_1.14.2_win32.zip + wget --local-encoding=UTF-8 -q http://dl.bintray.com/openplanets/opf-windows/jpylyzer_${JPYLYZER_VERSION}_win32.zip mkdir jpylyzer cd jpylyzer - cmake -E tar -xf ../jpylyzer_1.14.2_win32.zip + cmake -E tar -xf ../jpylyzer_${JPYLYZER_VERSION}_win32.zip cd .. else - wget -qO - https://github.com/openpreserve/jpylyzer/archive/1.14.2.tar.gz | tar -xz - mv jpylyzer-1.14.2/jpylyzer ./ + wget -qO - https://github.com/openpreserve/jpylyzer/archive/${JPYLYZER_VERSION}.tar.gz | tar -xz + mv jpylyzer-${JPYLYZER_VERSION}/jpylyzer ./ chmod +x jpylyzer/jpylyzer.py fi