remove cygwin specifics
This commit is contained in:
parent
70a16d80d9
commit
53d7f70c15
|
@ -2,20 +2,6 @@
|
||||||
|
|
||||||
# This script executes the install step when running under travis-ci
|
# This script executes the install step when running under travis-ci
|
||||||
|
|
||||||
#if cygwin, check path
|
|
||||||
case ${MACHTYPE} in
|
|
||||||
*cygwin*) OPJ_CI_IS_CYGWIN=1;;
|
|
||||||
*) ;;
|
|
||||||
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
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Set-up some error handling
|
# Set-up some error handling
|
||||||
set -o nounset ## set -u : exit the script if you try to use an uninitialised variable
|
set -o nounset ## set -u : exit the script if you try to use an uninitialised variable
|
||||||
set -o errexit ## set -e : exit the script if any statement returns a non-true return value
|
set -o errexit ## set -e : exit the script if any statement returns a non-true return value
|
||||||
|
@ -69,7 +55,7 @@ if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then
|
||||||
# We need jpylyzer for the test suite
|
# We need jpylyzer for the test suite
|
||||||
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
|
curl -o jpylyzer_1.14.2_win32.zip -L http://dl.bintray.com/openplanets/opf-windows/jpylyzer_1.14.2_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_1.14.2_win32.zip
|
||||||
|
@ -107,7 +93,7 @@ if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then
|
||||||
install_name_tool -change /usr/local/lib/libkdu_v77R.dylib ${PWD}/libkdu_v77R.dylib kdu_compress
|
install_name_tool -change /usr/local/lib/libkdu_v77R.dylib ${PWD}/libkdu_v77R.dylib kdu_compress
|
||||||
install_name_tool -change /usr/local/lib/libkdu_v77R.dylib ${PWD}/libkdu_v77R.dylib kdu_expand
|
install_name_tool -change /usr/local/lib/libkdu_v77R.dylib ${PWD}/libkdu_v77R.dylib kdu_expand
|
||||||
elif [ "${APPVEYOR:-}" == "True" ]; then
|
elif [ "${APPVEYOR:-}" == "True" ]; then
|
||||||
wget -q http://kakadusoftware.com/wp-content/uploads/2014/06/KDU77_Demo_Apps_for_Win32_150710.msi_.zip
|
curl -o KDU77_Demo_Apps_for_Win32_150710.msi_.zip -L 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
|
cmake -E tar -xf KDU77_Demo_Apps_for_Win32_150710.msi_.zip
|
||||||
msiexec /i KDU77_Demo_Apps_for_Win32_150710.msi /quiet /qn /norestart
|
msiexec /i KDU77_Demo_Apps_for_Win32_150710.msi /quiet /qn /norestart
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue