diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-12 12:51:53 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-12 21:13:56 +0100 |
commit | c2d188f225a96ccf409f4dbebd19f6e59caf7da6 (patch) | |
tree | 35d0320171ad60a4e25c41f0718d02016dfd4242 /coin/provisioning/qtci-macos-10.12-x86_64 | |
parent | ab25cb7af6602a558c84e3d30e8ce1c6e7ca6e73 (diff) | |
parent | 19872ea84352182ee974ff84d2e3872a21427117 (diff) | |
download | qt5-c2d188f225a96ccf409f4dbebd19f6e59caf7da6.tar.gz |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Task-number: QTBUG-65688
Change-Id: I17a303731dab4b967c9ef8a852ee0c1097b88f10
Diffstat (limited to 'coin/provisioning/qtci-macos-10.12-x86_64')
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh | 4 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh | 4 | ||||
-rw-r--r-- | coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh | 1 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh) | 4 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh) | 8 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh) | 5 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh) | 5 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh) | 8 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh) | 9 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh) | 12 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh) | 7 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh) | 4 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh | 6 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh) | 8 | ||||
-rwxr-xr-x[-rw-r--r--] | coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/030-fbx.sh) | 5 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh) | 8 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh | 4 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh) | 3 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh | 6 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh) | 4 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh) | 8 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh | 7 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh) | 12 | ||||
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/555-signtools.sh) | 2 |
25 files changed, 97 insertions, 51 deletions
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh deleted file mode 100755 index 63ec9b69..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -BASEDIR=$(dirname "$0") -$BASEDIR/../common/homebrew.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh deleted file mode 100755 index 07c9a617..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -BASEDIR=$(dirname "$0") -$BASEDIR/../common/pip.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh deleted file mode 100644 index cd4e3fd9..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh +++ /dev/null @@ -1 +0,0 @@ -source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh b/coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh deleted file mode 100755 index 9e4f1d3e..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -BASEDIR=$(dirname "$0") -$BASEDIR/../common/virtualenv.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh b/coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh index 0fbe7628..2c3e45f3 100644..100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh @@ -1,4 +1,6 @@ -#!/bin/sh +#!/usr/bin/env sh + +set -ex # Read .bashrc if exist printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n . ~/.bashrc\nfi\n" >> ~/.bash_profile diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh index 5819e9de..20430d6a 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -33,10 +33,12 @@ ## ############################################################################# +set -ex + # This script modified system settings for automated use -# shellcheck source=../common/try_catch.sh -source "${BASH_SOURCE%/*}/../common/try_catch.sh" +# shellcheck source=../common/unix/try_catch.sh +source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh" VNCPassword=qt NTS_IP=10.212.2.216 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh b/coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh index ba8dbdd3..8461c656 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh @@ -1,2 +1,5 @@ -#!/bin/sh +#!/usr/bin/env sh + +set -ex + defaults write com.apple.CrashReporter DialogType server diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh b/coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh index 61406203..b68d62f8 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh @@ -1,3 +1,6 @@ -#!/bin/sh +#!/usr/bin/env sh + +set -ex + # Enables the usage of temporary keychains for SSL autotests echo "export QT_SSL_USE_TEMPORARY_KEYCHAIN=1" >> ~/.bashrc diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh index ef676ab3..34202209 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -37,8 +37,10 @@ # XZ-Utils are needed for uncompressing xz-compressed files -# shellcheck source=../common/try_catch.sh -source "${BASH_SOURCE%/*}/../common/InstallPKGFromURL.sh" +set -ex + +# shellcheck source=../common/unix/try_catch.sh +source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/XZ.pkg" AltUrl="http://sourceforge.net/projects/macpkg/files/XZ/5.0.7/XZ.pkg" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh index 743cc9da..66e4dfde 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -34,10 +34,13 @@ ############################################################################# # This script installs JDK + +set -ex + echo "Installing Java Development Kit" -# shellcheck source=../common/try_catch.sh -source "${BASH_SOURCE%/*}/../common/try_catch.sh" +# shellcheck source=../common/unix/try_catch.sh +source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh" ExceptionDownloadPrimaryUrl=100 ExceptionDownloadAltUrl=101 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh index 6d57bfaa..a0611154 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -42,10 +42,12 @@ # This will give you a file called "Content.part00.cpio.xz" that # can be renamed to Xcode_8.xz for this script. -# shellcheck source=../common/try_catch.sh -source "${BASH_SOURCE%/*}/../common/try_catch.sh" +set -ex -# shellcheck source=../common/install_xcode.sh -source "${BASH_SOURCE%/*}/../common/install_xcode.sh" +# shellcheck source=../common/unix/try_catch.sh +source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh" + +# shellcheck source=../common/macos/install_xcode.sh +source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_8.3.3.xz 8.3.3 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh index b460cc02..d534e74d 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -32,7 +32,10 @@ ## $QT_END_LICENSE$ ## ############################################################################# -source "${BASH_SOURCE%/*}/../common/install-commandlinetools.sh" + +set -ex + +source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" version="8.3.2" packageName="CommandLineToolsforXcode$version.dmg" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh index ddb01d64..e5dd1910 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") -$BASEDIR/../common/cmake.sh +$BASEDIR/../common/macos/cmake.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh new file mode 100755 index 00000000..0ead5a58 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/macos/homebrew.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh index ca21f481..b47f9705 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -37,8 +37,10 @@ # MySQL is needed for Qt to be able to support MySQL -# shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" +set -ex + +# shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/mysql-5.7.15-osx10.11-x86_64.tar.gz" AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/030-fbx.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh index 50c6796b..69c6b318 100644..100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/030-fbx.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash -BASEDIR=$(dirname "$0") -$BASEDIR/../common/fbx_macos.sh +set -ex +BASEDIR=$(dirname "$0") +$BASEDIR/../common/macos/pip.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh index cb5c1852..8f3f85ec 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -37,8 +37,10 @@ # PostgreSQL is needed for Qt to be able to support PostgreSQL -# shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" +set -ex + +# shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh" psqlVersion="9.6.0" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh new file mode 100755 index 00000000..92b05bf3 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -ex + +source "${BASH_SOURCE%/*}/../common/macos/python3.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh index 4fb9ddbc..15511332 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh @@ -1,4 +1,7 @@ #!/usr/bin/env bash # Install 7z to be used from command line + +set -ex + brew update brew install p7zip diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh new file mode 100755 index 00000000..a35d26ca --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/macos/virtualenv.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh b/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh index d257ffa1..fea11e01 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") # There is only one mac package and common script uses it as a default -$BASEDIR/../common/libclang.sh +$BASEDIR/../common/unix/libclang.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh b/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh index bc8a95e6..b6e731f2 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -37,8 +37,10 @@ # It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version -# shellcheck source=../common/try_catch.sh -source "${BASH_SOURCE%/*}/../common/try_catch.sh" +set -ex + +# shellcheck source=../common/unix/try_catch.sh +source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh" targetFolder="/opt/android" sdkTargetFolder="$targetFolder/sdk" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh b/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh new file mode 100755 index 00000000..9ce5d9ff --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/macos/fbx_macos.sh + diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh index d109051d..ccff42c3 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## @@ -35,10 +35,12 @@ # This script install OpenSSL -# shellcheck source=../common/try_catch.sh -source "${BASH_SOURCE%/*}/../common/try_catch.sh" -# shellcheck source=../common/InstallFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" +set -ex + +# shellcheck source=../common/unix/try_catch.sh +source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh" +# shellcheck source=../common/unix/InstallFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/unix/InstallFromCompressedFileFromURL.sh" opensslVersion="1.0.2k" opensslFile="openssl-$opensslVersion.tar.gz" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/555-signtools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh index 49e087a8..e1a41835 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/555-signtools.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh ############################################################################# ## |