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

Merge pull request #746 from senbox-org/update_cmake_jpylyzer 

Update cmake & jpylyzer for travis builds
This commit is contained in:
Matthieu Darbois 2016-04-22 12:54:25 +02:00
parent f5446fdcfb 6ea2ff0b06
commit 06e8dc9edd
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,9 +37,9 @@ fi
if [ "${OPJ_CI_ASAN:-}" == "1" ]; then if [ "${OPJ_CI_ASAN:-}" == "1" ]; then
# We need a new version of cmake than travis-ci provides # 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 # 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 fi
if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then
@ -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 git clone --depth=1 --branch=${OPJ_DATA_BRANCH} git://github.com/uclouvain/openjpeg-data.git data
# We need jpylyzer for the test suite # We need jpylyzer for the test suite
JPYLYZER_VERSION="1.17.0"
echo "Retrieving jpylyzer" echo "Retrieving jpylyzer"
if [ "${APPVEYOR:-}" == "True" ]; then 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 mkdir jpylyzer
cd jpylyzer cd jpylyzer
cmake -E tar -xf ../jpylyzer_1.14.2_win32.zip cmake -E tar -xf ../jpylyzer_${JPYLYZER_VERSION}_win32.zip
cd .. cd ..
else else
wget -qO - https://github.com/openpreserve/jpylyzer/archive/1.14.2.tar.gz | tar -xz wget -qO - https://github.com/openpreserve/jpylyzer/archive/${JPYLYZER_VERSION}.tar.gz | tar -xz
mv jpylyzer-1.14.2/jpylyzer ./ mv jpylyzer-${JPYLYZER_VERSION}/jpylyzer ./
chmod +x jpylyzer/jpylyzer.py chmod +x jpylyzer/jpylyzer.py
fi fi