diff options
| -rw-r--r-- | scripts/mac/before_install.sh | 16 | ||||
| -rw-r--r-- | scripts/mac/travisbuild.sh | 4 |
2 files changed, 9 insertions, 11 deletions
diff --git a/scripts/mac/before_install.sh b/scripts/mac/before_install.sh index 2c283e413..f5afb81f1 100644 --- a/scripts/mac/before_install.sh +++ b/scripts/mac/before_install.sh @@ -40,14 +40,12 @@ sudo ln -s /usr/local/include/hidapi /usr/local/include/libusb-1.0/hidapi pushd ${TRAVIS_BUILD_DIR} -mkdir -p Qt/5.9.1 +mkdir -p Qt/5.11.1 echo "Get custom Qt build and unpack it" -curl --output ${TRAVIS_BUILD_DIR}/Qt-5.9.1-mac.tar.xz \ - https://storage.googleapis.com/travis-cache/Qt-5.9.1-mac.tar.xz -# wget -q http://subsurface-divelog.org/downloads/Qt-5.9.1-mac.tar.xz -tar -xJ -C Qt/5.9.1 -f Qt-5.9.1-mac.tar.xz - -sudo mkdir -p /Users/hohndel -sudo ln -s ${TRAVIS_BUILD_DIR}//Qt/5.9.1 /Users/hohndel/Qt5.9.1 -ls -l /Users/hohndel +curl --output Qt-5.11.1-mac.tar.xz \ + https://storage.googleapis.com/travis-cache/Qt-5.11.1-mac.tar.xz +md5 Qt-5.11.1-mac.tar.xz + +tar -xJ -C Qt/5.11.1 -f Qt-5.11.1-mac.tar.xz + diff --git a/scripts/mac/travisbuild.sh b/scripts/mac/travisbuild.sh index 029deebe0..5aabd022a 100644 --- a/scripts/mac/travisbuild.sh +++ b/scripts/mac/travisbuild.sh @@ -6,7 +6,7 @@ set -e # this gets executed by Travis when building an App for Mac # it gets started from inside the subsurface directory -export QT_ROOT=${TRAVIS_BUILD_DIR}/Qt/5.9.1 +export QT_ROOT=${TRAVIS_BUILD_DIR}/Qt/5.11.1/clang_64 export PATH=$QT_ROOT/bin:$PATH # Make sure correct qmake is found on the $PATH export CMAKE_PREFIX_PATH=$QT_ROOT/lib/cmake export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH @@ -15,7 +15,7 @@ export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH cd ${TRAVIS_BUILD_DIR}/.. DIR=$(pwd) -bash -e -x ./subsurface/scripts/build.sh -desktop -build-with-webkit +bash -e -x ./subsurface/scripts/build.sh -desktop -build-with-webkit -release cd ${TRAVIS_BUILD_DIR}/build |