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

Fix unbound variable

This commit is contained in:
mayeut 2015-09-12 03:13:45 +02:00
parent 9258f8f6a7
commit 7981908754
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,7 @@ chmod +x jpylyzer/jpylyzer/jpylyzer.py
# so long as such use or re-distribution is accompanied with this copyright notice and is not for commercial gain. # 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. # Note: Binaries can only be used for non-commercial purposes.
if [ "${OPJ_NONCOMMERCIAL:-}" == "1" ]; then if [ "${OPJ_NONCOMMERCIAL:-}" == "1" ]; then
if [ "${TRAVIS_OS_NAME:-}" == "linux" ]; 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/2014/06/KDU77_Demo_Apps_for_Linux-x86-64_150710.zip
cmake -E tar -xf KDU77_Demo_Apps_for_Linux-x86-64_150710.zip cmake -E tar -xf KDU77_Demo_Apps_for_Linux-x86-64_150710.zip

6
tools/travis-ci/run.sh
View File

@ -82,7 +82,11 @@ fi
set -x set -x
if [ "${OPJ_NONCOMMERCIAL:-}" == "1" ] && [ -d kdu ]; then if [ "${OPJ_NONCOMMERCIAL:-}" == "1" ] && [ -d kdu ]; then
if [ "${TRAVIS_OS_NAME}" == "linux" ]; then if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
export LD_LIBRARY_PATH=${PWD}/kdu:${LD_LIBRARY_PATH} if [ "${LD_LIBRARY_PATH:-}" == "" ]; then
export LD_LIBRARY_PATH=${PWD}/kdu
else
export LD_LIBRARY_PATH=${PWD}/kdu:${LD_LIBRARY_PATH}
fi
fi fi
export PATH=${PWD}/kdu:${PATH} export PATH=${PWD}/kdu:${PATH}
fi fi