diff --git a/.travis.yml b/.travis.yml index dcac7c7693a6b2c08b81332a9d9a0f6000cef286..01b5156df0739e8b9127df872cd2d5e88acac025 100644 --- a/.travis.yml +++ b/.travis.yml @@ -115,8 +115,8 @@ install: # osx dependencies: qt, gstreamer, gstreamer-devel - if [ "${SPEC}" = "macx-clang" ]; then - wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.9.1-mac-clang-min.tar.bz2 && - tar jxf Qt5.9.1-mac-clang-min.tar.bz2 -C /tmp + wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.9.3-clang_64-min.tar.bz2 && + tar jxf Qt5.9.3-clang_64-min.tar.bz2 -C /tmp ; fi @@ -135,7 +135,7 @@ install: - if [ "${SPEC}" = "macx-clang" ]; then wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/osx-gstreamer.tar.bz2 && sudo tar jxf osx-gstreamer.tar.bz2 -C /Library/Frameworks && - export QT_DIR=Qt5.9-mac-clang/5.9.1/clang_64 && + export QT_DIR=Qt5.9-clang_64/5.9.3/clang_64 && export QT_QPA_PLATFORM_PLUGIN_PATH=/tmp/$QT_DIR/plugins && export QML2_IMPORT_PATH=/tmp/$QT_DIR/qml && export PATH=/tmp/$QT_DIR/bin:$PATH diff --git a/deploy/MakeQtTravisTarball.sh b/deploy/MakeQtTravisTarball.sh new file mode 100755 index 0000000000000000000000000000000000000000..7d9d9e27cd6cbeff6b4803e7e627573d8af6290a --- /dev/null +++ b/deploy/MakeQtTravisTarball.sh @@ -0,0 +1,31 @@ +#!/bin/bash -x + +if [[ $# -eq 0 ]]; then + echo 'MakeQtTravisTarball.sh QtDirectory QtFullVersion QtBaseVersion BuildType' + exit 1 +fi + +QT_DIRECTORY=$1 +if [ ! -d ${QT_DIRECTORY} ]; then + echo 'Specify directory for Qt Directory.' + exit 1 +fi + +QT_FULL_VERSION=$2 +if [ ! -d ${QT_DIRECTORY}/${QT_FULL_VERSION} ]; then + echo 'Qt version directory not found' + exit 1 +fi + +QT_BASE_VERSION=$3 + +QT_BUILD_TYPE=$4 +if [ ! -d ${QT_DIRECTORY}/${QT_FULL_VERSION}/${QT_BUILD_TYPE} ]; then + echo 'Qt build type directory not found' + exit 1 +fi + +mkdir -p Qt${QT_BASE_VERSION}-${QT_BUILD_TYPE}/${QT_FULL_VERSION}/${QT_BUILD_TYPE} +cp -r ${QT_DIRECTORY}/${QT_FULL_VERSION}/${QT_BUILD_TYPE} Qt${QT_BASE_VERSION}-${QT_BUILD_TYPE}/${QT_FULL_VERSION} +rm -rf Qt${QT_BASE_VERSION}-${QT_BUILD_TYPE}/${QT_FULL_VERSION}/${QT_BUILD_TYPE}/doc +tar -jcvf Qt${QT_FULL_VERSION}-${QT_BUILD_TYPE}-min.tar.bz2 Qt${QT_BASE_VERSION}-${QT_BUILD_TYPE}/