diff options
| author | mayeut <mayeut@users.noreply.github.com> | 2015-10-10 19:26:42 +0200 |
|---|---|---|
| committer | mayeut <mayeut@users.noreply.github.com> | 2015-10-10 19:26:42 +0200 |
| commit | c5a8732b0eb6c1124df2e9d488d4f0311f65c455 (patch) | |
| tree | dd85c9aad3fbf1040c55e729827ed6bf0d06278a /tools | |
| parent | 101a0034e2b8fe1621a3a94b4606d1d30f85ecd0 (diff) | |
Update kdu copy
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/travis-ci/install.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tools/travis-ci/install.sh b/tools/travis-ci/install.sh index 6a0b1fc4..7a419e45 100755 --- a/tools/travis-ci/install.sh +++ b/tools/travis-ci/install.sh @@ -9,11 +9,8 @@ case ${MACHTYPE} in esac if [ "${OPJ_CI_IS_CYGWIN:-}" == "1" ]; then - # Hack for appveyor - if ! which wget; then - # PATH is not yet set up - export PATH=$PATH:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin - fi + # PATH is not yet set up + export PATH=$PATH:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin fi # Set-up some error handling @@ -111,7 +108,11 @@ if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then wget -q http://kakadusoftware.com/wp-content/uploads/2014/06/KDU77_Demo_Apps_for_Win32_150710.msi_.zip cmake -E tar -xf KDU77_Demo_Apps_for_Win32_150710.msi_.zip msiexec /i KDU77_Demo_Apps_for_Win32_150710.msi /quiet /qn /norestart - cp -r "C:/Program Files (x86)/Kakadu" ./kdu + if [ -d "C:/Program Files/Kakadu" ]; then + cp -r "C:/Program Files/Kakadu" ./kdu + else + cp -r "C:/Program Files (x86)/Kakadu" ./kdu + endif fi fi fi |