aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-osx-10.11-x86_64
diff options
context:
space:
mode:
Diffstat (limited to 'coin/provisioning/qtci-osx-10.11-x86_64')
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh4
-rwxr-xr-x[-rw-r--r--]coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh)5
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/01-system_updates.sh6
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh4
-rw-r--r--coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh1
-rwxr-xr-x[-rw-r--r--]coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/003-bashprofile.sh)4
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh)8
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh)5
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh)8
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh)12
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh)7
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/25-cmake.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh)4
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/25-homebrew.sh6
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh)8
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh)8
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh4
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/26-p7zip.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh)3
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh)4
18 files changed, 67 insertions, 34 deletions
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh
deleted file mode 100755
index b05dcf1c..00000000
--- a/coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-BASEDIR=$(dirname "$0")
-$BASEDIR/../common/system_updates.sh
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh b/coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh
index ba8dbdd3..8461c656 100644..100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/01-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-osx-10.11-x86_64/01-system_updates.sh b/coin/provisioning/qtci-osx-10.11-x86_64/01-system_updates.sh
new file mode 100755
index 00000000..94b53309
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/01-system_updates.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/macos/system_updates.sh
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh
deleted file mode 100755
index 63ec9b69..00000000
--- a/coin/provisioning/qtci-osx-10.11-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-osx-10.11-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh
deleted file mode 100644
index cd4e3fd9..00000000
--- a/coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh
+++ /dev/null
@@ -1 +0,0 @@
-source "${BASH_SOURCE%/*}/../common/python3.sh"
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/003-bashprofile.sh b/coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh
index 0fbe7628..2c3e45f3 100644..100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/003-bashprofile.sh
+++ b/coin/provisioning/qtci-osx-10.11-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-osx-10.11-x86_64/005-systemsetup.sh b/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh
index 4a07bbbe..5cb067a7 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -35,8 +35,10 @@
# This script modified system settings for automated use
-# 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"
VNCPassword=qt
NTS_IP=10.212.2.216
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh b/coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh
index 61406203..b68d62f8 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh
+++ b/coin/provisioning/qtci-osx-10.11-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-osx-10.11-x86_64/015-xz.sh b/coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh
index 8a3999b9..9f66cc66 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh
+++ b/coin/provisioning/qtci-osx-10.11-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/osx_10.11_el_capitan/XZ.pkg"
AltUrl="http://sourceforge.net/projects/macpkg/files/XZ/5.0.7/XZ.pkg"
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh b/coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh
index 37acc2ee..b1e1d657 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -42,12 +42,12 @@
# This will give you a file called "Content.part00.cpio.xz" that
# can be renamed to Xcode_8.xz for this script.
+set -ex
+# shellcheck source=../common/unix/try_catch.sh
+source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/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.2.xz 8.2
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh b/coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh
index 9145c12a..cb7dcfc6 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh
+++ b/coin/provisioning/qtci-osx-10.11-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.2"
packageName="Command_Line_Tools_macOS_10.11_for_Xcode_$version.dmg"
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-cmake.sh
index ddb01d64..e5dd1910 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh
+++ b/coin/provisioning/qtci-osx-10.11-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-osx-10.11-x86_64/25-homebrew.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-homebrew.sh
new file mode 100755
index 00000000..0ead5a58
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.11-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-osx-10.11-x86_64/025-mysql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh
index 1e4de16a..89534baf 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh
+++ b/coin/provisioning/qtci-osx-10.11-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/osx_10.11_el_capitan/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-osx-10.11-x86_64/025-postgresql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh
index a990829e..8d88630b 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh
+++ b/coin/provisioning/qtci-osx-10.11-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"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/Postgres-9.6.0.zip"
AltUrl="https://github.com/PostgresApp/PostgresApp/releases/download/9.6.0/Postgres-9.6.0.zip"
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh
new file mode 100755
index 00000000..92b05bf3
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.11-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-osx-10.11-x86_64/026-p7zip.sh b/coin/provisioning/qtci-osx-10.11-x86_64/26-p7zip.sh
index 4fb9ddbc..15511332 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh
+++ b/coin/provisioning/qtci-osx-10.11-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-osx-10.11-x86_64/08-libclang.sh b/coin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh
index d257ffa1..fea11e01 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh
+++ b/coin/provisioning/qtci-osx-10.11-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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 19:13:59 +0000