aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-macos-10.12-x86_64
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2017-11-02 16:09:11 +0200
committerFrederik Gladhorn <frederik.gladhorn@qt.io>2018-01-10 07:58:26 +0000
commit2a28ce864bed677e4ac2477eedf6bee498075d94 (patch)
tree8fe52c45bc62fd7185fccaa7f4b66baa544fa779 /coin/provisioning/qtci-macos-10.12-x86_64
parent52da24b78eaac04b490b1d4a1750515284521423 (diff)
Split Common folder based on operating system families
This change will split common folder to four different folders: Linux, Unix, Windows and MacOS. Each of these folders includes scripts which are common for their operating system familes Task-number: QTQAINFRA-1451 Change-Id: Ic93b2183052335dee875d1452b21e38d268b6474 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Diffstat (limited to 'coin/provisioning/qtci-macos-10.12-x86_64')
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh4
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh4
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/20-java.sh4
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh8
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh4
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh4
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/30-android.sh4
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh8
16 files changed, 28 insertions, 28 deletions
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh
index dceb3bcc..20430d6a 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh
@@ -37,8 +37,8 @@ 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/15-xz.sh b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh
index 6f5faee0..34202209 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh
@@ -39,8 +39,8 @@
set -ex
-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/InstallPKGFromURL.sh"
+# 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/20-java.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh
index 39719bb8..66e4dfde 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh
@@ -39,8 +39,8 @@ 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/20-xcode.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh
index f879d756..a0611154 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh
@@ -44,10 +44,10 @@
set -ex
-# 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"
-# shellcheck source=../common/install_xcode.sh
-source "${BASH_SOURCE%/*}/../common/install_xcode.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/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh
index 9801e99c..d534e74d 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh
@@ -35,7 +35,7 @@
set -ex
-source "${BASH_SOURCE%/*}/../common/install-commandlinetools.sh"
+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/25-cmake.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh
index 3cdbd463..e5dd1910 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh
@@ -3,4 +3,4 @@
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
index 9fb5d672..0ead5a58 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh
@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/homebrew.sh
+$BASEDIR/../common/macos/homebrew.sh
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh
index b37bb02d..b47f9705 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh
@@ -39,8 +39,8 @@
set -ex
-# shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh"
+# 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/25-pip.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh
index 9e1df19a..69c6b318 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh
@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/pip.sh
+$BASEDIR/../common/macos/pip.sh
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh
index c9e9c842..8f3f85ec 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh
@@ -39,8 +39,8 @@
set -ex
-# shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh"
+# 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
index b18e4923..92b05bf3 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
set -ex
-source "${BASH_SOURCE%/*}/../common/python3.sh"
+source "${BASH_SOURCE%/*}/../common/macos/python3.sh"
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
index 8cdb7108..a35d26ca 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh
@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/virtualenv.sh
+$BASEDIR/../common/macos/virtualenv.sh
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh b/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh
index 2a8a90c3..fea11e01 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh
@@ -4,4 +4,4 @@ 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/30-android.sh b/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh
index 9c754dbf..b6e731f2 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh
@@ -39,8 +39,8 @@
set -ex
-# 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"
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
index acefd8b7..9ce5d9ff 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh
@@ -3,5 +3,5 @@
set -ex
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/fbx_macos.sh
+$BASEDIR/../common/macos/fbx_macos.sh
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh
index 503a4c07..ccff42c3 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh
@@ -37,10 +37,10 @@
set -ex
-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/try_catch.sh"
-# shellcheck source=../common/InstallFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
+# 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"