Split Common folder based on operating system families
authorHeikki Halmet <heikki.halmet@qt.io>
Thu, 21 Sep 2017 09:50:58 +0000 (12:50 +0300)
committerTony Sarajärvi <tony.sarajarvi@qt.io>
Wed, 24 Jan 2018 16:32:25 +0000 (16:32 +0000)
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: I0668885da43222663a54521ce85653da697425be
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
186 files changed:
coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1
coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1
coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1
coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1
coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1
coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1
coin/provisioning/common/linux/cmake_linux.sh [moved from coin/provisioning/common/cmake_linux.sh with 94% similarity]
coin/provisioning/common/linux/linux-removethemall.sh [moved from coin/provisioning/common/linux-removethemall.sh with 100% similarity]
coin/provisioning/common/linux/version.sh [moved from coin/provisioning/common/version.sh with 100% similarity]
coin/provisioning/common/macos/01-macos-removethemall.sh [moved from coin/provisioning/common/01-macos-removethemall.sh with 100% similarity]
coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh [moved from coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh with 96% similarity]
coin/provisioning/common/macos/InstallPKGFromURL.sh [moved from coin/provisioning/common/InstallPKGFromURL.sh with 97% similarity]
coin/provisioning/common/macos/cmake.sh [moved from coin/provisioning/common/cmake.sh with 100% similarity]
coin/provisioning/common/macos/homebrew.sh [moved from coin/provisioning/common/homebrew.sh with 100% similarity]
coin/provisioning/common/macos/install-commandlinetools.sh [moved from coin/provisioning/common/install-commandlinetools.sh with 96% similarity]
coin/provisioning/common/macos/install_xcode.sh [moved from coin/provisioning/common/install_xcode.sh with 97% similarity]
coin/provisioning/common/macos/python3.sh [moved from coin/provisioning/common/python3.sh with 100% similarity]
coin/provisioning/common/macos/system_updates.sh [moved from coin/provisioning/common/system_updates.sh with 100% similarity]
coin/provisioning/common/unix/DownloadURL.sh [moved from coin/provisioning/common/DownloadURL.sh with 100% similarity]
coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh [moved from coin/provisioning/common/InstallFromCompressedFileFromURL.sh with 100% similarity]
coin/provisioning/common/unix/libclang.sh [moved from coin/provisioning/common/libclang.sh with 100% similarity]
coin/provisioning/common/unix/try_catch.sh [moved from coin/provisioning/common/try_catch.sh with 100% similarity]
coin/provisioning/common/windows/allow-remote-desktop-access.ps1 [moved from coin/provisioning/common/allow-remote-desktop-access.ps1 with 100% similarity]
coin/provisioning/common/windows/cmake.ps1 [moved from coin/provisioning/common/cmake.ps1 with 100% similarity]
coin/provisioning/common/windows/disable-ntp.ps1 [moved from coin/provisioning/common/disable-ntp.ps1 with 100% similarity]
coin/provisioning/common/windows/disable-sleep.ps1 [moved from coin/provisioning/common/disable-sleep.ps1 with 100% similarity]
coin/provisioning/common/windows/disable-uac.ps1 [moved from coin/provisioning/common/disable-uac.ps1 with 100% similarity]
coin/provisioning/common/windows/disable-windefender.ps1 [moved from coin/provisioning/common/disable-windefender.ps1 with 100% similarity]
coin/provisioning/common/windows/disable-windows-updates.ps1 [moved from coin/provisioning/common/disable-windows-updates.ps1 with 100% similarity]
coin/provisioning/common/windows/helpers.ps1 [moved from coin/provisioning/common/helpers.ps1 with 100% similarity]
coin/provisioning/common/windows/icu.ps1 [moved from coin/provisioning/common/icu.ps1 with 100% similarity]
coin/provisioning/common/windows/install-dependencywalker.ps1 [moved from coin/provisioning/common/install-dependencywalker.ps1 with 98% similarity]
coin/provisioning/common/windows/install-git.ps1 [moved from coin/provisioning/common/install-git.ps1 with 98% similarity]
coin/provisioning/common/windows/install-java.ps1 [moved from coin/provisioning/common/install-java.ps1 with 98% similarity]
coin/provisioning/common/windows/install-mingw.ps1 [moved from coin/provisioning/common/install-mingw.ps1 with 100% similarity]
coin/provisioning/common/windows/install-notepad++.ps1 [moved from coin/provisioning/common/install-notepad++.ps1 with 98% similarity]
coin/provisioning/common/windows/install-qnx660.ps1 [moved from coin/provisioning/common/install-qnx660.ps1 with 100% similarity]
coin/provisioning/common/windows/install-ruby.ps1 [moved from coin/provisioning/common/install-ruby.ps1 with 98% similarity]
coin/provisioning/common/windows/install-sevenzip.ps1 [moved from coin/provisioning/common/install-sevenzip.ps1 with 98% similarity]
coin/provisioning/common/windows/install-strawberry-perl.ps1 [moved from coin/provisioning/common/install-strawberry-perl.ps1 with 98% similarity]
coin/provisioning/common/windows/jom.ps1 [moved from coin/provisioning/common/jom.ps1 with 100% similarity]
coin/provisioning/common/windows/memorypershell.ps1 [moved from coin/provisioning/common/memorypershell.ps1 with 100% similarity]
coin/provisioning/common/windows/mesa_llvmpipe.ps1 [moved from coin/provisioning/common/mesa_llvmpipe.ps1 with 98% similarity]
coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 [moved from coin/provisioning/common/msvc_2015_update3_patch.ps1 with 98% similarity]
coin/provisioning/common/windows/mysql.ps1 [moved from coin/provisioning/common/mysql.ps1 with 100% similarity]
coin/provisioning/common/windows/network_test_server_ip.txt [moved from coin/provisioning/common/network_test_server_ip.txt with 100% similarity]
coin/provisioning/common/windows/openssl.ps1 [moved from coin/provisioning/common/openssl.ps1 with 99% similarity]
coin/provisioning/common/windows/postgresql.ps1 [moved from coin/provisioning/common/postgresql.ps1 with 100% similarity]
coin/provisioning/common/windows/python.ps1 [moved from coin/provisioning/common/python.ps1 with 100% similarity]
coin/provisioning/common/windows/python3.ps1 [moved from coin/provisioning/common/python3.ps1 with 100% similarity]
coin/provisioning/common/windows/set-network-test-server.ps1 [moved from coin/provisioning/common/set-network-test-server.ps1 with 97% similarity]
coin/provisioning/common/windows/vc_redist.ps1 [moved from coin/provisioning/common/vc_redist.ps1 with 100% similarity]
coin/provisioning/common/windows/windows_removethemall.ps1 [moved from coin/provisioning/common/windows_removethemall.ps1 with 100% similarity]
coin/provisioning/common/windows/wsearch-off.ps1 [moved from coin/provisioning/common/wsearch-off.ps1 with 100% similarity]
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh
coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh
coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh
coin/provisioning/qtci-osx-10.10-x86_64/01-macos-removethemall.sh
coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh
coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh
coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh
coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh
coin/provisioning/qtci-osx-10.11-x86_64/020-java.sh
coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh
coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh
coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh
coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh
coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh
coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh
coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh
coin/provisioning/qtci-osx-10.11-x86_64/027-libclang.sh
coin/provisioning/qtci-osx-10.11-x86_64/035-openssl.sh
coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh
coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh
coin/provisioning/qtci-osx-10.9-x86_64/001-system_updates.sh
coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh
coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1
coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1
coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1
coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1
coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1
coin/provisioning/qtci-windows-10-x86/07-python.ps1
coin/provisioning/qtci-windows-10-x86/cmake.ps1
coin/provisioning/qtci-windows-10-x86/icu.ps1
coin/provisioning/qtci-windows-10-x86/jom.ps1
coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1
coin/provisioning/qtci-windows-10-x86/python3.ps1
coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1
coin/provisioning/qtci-windows-10-x86_64/004-disable-windefender.ps1
coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1
coin/provisioning/qtci-windows-10-x86_64/005-wsearch-off.ps1
coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1
coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1
coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1
coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1
coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1
coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1
coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1
coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1
coin/provisioning/qtci-windows-10-x86_64/07-python.ps1
coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1
coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1
coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps1
coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1
coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1
coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1
coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps1
coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps1
coin/provisioning/qtci-windows-10-x86_64/cmake.ps1
coin/provisioning/qtci-windows-10-x86_64/icu.ps1
coin/provisioning/qtci-windows-10-x86_64/jom.ps1
coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1
coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1
coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1
coin/provisioning/qtci-windows-10-x86_64/python3.ps1
coin/provisioning/qtci-windows-7-x86/004-disable-windefender.ps1
coin/provisioning/qtci-windows-7-x86/005-wsearch-off.ps1
coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1
coin/provisioning/qtci-windows-7-x86/02-disable-ntp.ps1
coin/provisioning/qtci-windows-7-x86/02-memorypershell.ps1
coin/provisioning/qtci-windows-7-x86/04-msys.ps1
coin/provisioning/qtci-windows-7-x86/06-android.ps1
coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1
coin/provisioning/qtci-windows-7-x86/07-vc_redist.ps1
coin/provisioning/qtci-windows-7-x86/08-mesa_llvmpipe.ps1
coin/provisioning/qtci-windows-7-x86/cmake.ps1
coin/provisioning/qtci-windows-7-x86/icu.ps1
coin/provisioning/qtci-windows-7-x86/jom.ps1
coin/provisioning/qtci-windows-7-x86/python.ps1
coin/provisioning/qtci-windows-7-x86/python3.ps1
coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1
coin/provisioning/qtci-windows-8-x86_64/02-disable-ntp.ps1
coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1
coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1
coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1
coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1
coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1
coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1
coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1
coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1
coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1
coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1
coin/provisioning/qtci-windows-8.1-x86/06-python.ps1
coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1
coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1
coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1
coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1
coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1
coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1
coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1
coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1
coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1
coin/provisioning/qtci-windows-8.1-x86/cmake.ps1
coin/provisioning/qtci-windows-8.1-x86/icu.ps1
coin/provisioning/qtci-windows-8.1-x86/jom.ps1
coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1
coin/provisioning/qtci-windows-8.1-x86/openssl.ps1
coin/provisioning/qtci-windows-8.1-x86/python3.ps1
coin/provisioning/qtci-windows-8.1-x86_64/001-disable-uac.ps1
coin/provisioning/qtci-windows-8.1-x86_64/004-disable-windows-updates.ps1
coin/provisioning/qtci-windows-8.1-x86_64/009-set-network-test-server.ps1
coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1
coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps1
coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps1
coin/provisioning/qtci-windows-8.1-x86_64/02-install-notepad++.ps1
coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1
coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1
coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1
coin/provisioning/qtci-windows-8.1-x86_64/06-python.ps1
coin/provisioning/qtci-windows-8.1-x86_64/07-mesa_llvmpipe.ps1
coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1
coin/provisioning/qtci-windows-8.1-x86_64/08-install-git.ps1
coin/provisioning/qtci-windows-8.1-x86_64/08-install-java.ps1
coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps1
coin/provisioning/qtci-windows-8.1-x86_64/09-install-ruby.ps1
coin/provisioning/qtci-windows-8.1-x86_64/09-install-strawberry-perl.ps1
coin/provisioning/qtci-windows-8.1-x86_64/09-mysql.ps1
coin/provisioning/qtci-windows-8.1-x86_64/09-postgresql.ps1
coin/provisioning/qtci-windows-8.1-x86_64/cmake.ps1
coin/provisioning/qtci-windows-8.1-x86_64/icu.ps1
coin/provisioning/qtci-windows-8.1-x86_64/jom.ps1
coin/provisioning/qtci-windows-8.1-x86_64/msvc-2013-update5.ps1
coin/provisioning/qtci-windows-8.1-x86_64/openssl.ps1
coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1

index 556a352..c415ca4 100644 (file)
@@ -30,7 +30,7 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
 
 # This script will install Visual Studio 2017 Build Tools
 # https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017
index fb6a659..286345a 100644 (file)
@@ -30,7 +30,7 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\..\provisioning\common\helpers.ps1"
+. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
 
 # Install Visual Studio $version with $update_version
 # Original download page: https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs
index 0144232..37dca27 100644 (file)
@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
 
 # This script will install Visual Studio 2017
 
index 556a352..c415ca4 100644 (file)
@@ -30,7 +30,7 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
 
 # This script will install Visual Studio 2017 Build Tools
 # https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017
index fb6a659..286345a 100644 (file)
@@ -30,7 +30,7 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\..\provisioning\common\helpers.ps1"
+. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
 
 # Install Visual Studio $version with $update_version
 # Original download page: https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs
index 0144232..37dca27 100644 (file)
@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
 
 # This script will install Visual Studio 2017
 
similarity index 94%
rename from coin/provisioning/common/cmake_linux.sh
rename to coin/provisioning/common/linux/cmake_linux.sh
index c23cf9b..56dd648 100755 (executable)
@@ -37,8 +37,8 @@
 
 # CMake is needed for autotests that verify that Qt can be built with CMake
 
-# shellcheck source=../common/InstallFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
+# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
+source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 
 version="3.6.2"
 PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz"
 # uncompresses it and installs it by default
 # to /Applications/. This can be overridden by a target parameter.
 
-# shellcheck source=try_catch.sh
-source "${BASH_SOURCE%/*}/try_catch.sh"
-# shellcheck source=DownloadURL.sh
-source "${BASH_SOURCE%/*}/DownloadURL.sh"
+# shellcheck source=../unix/try_catch.sh
+source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
+# shellcheck source=../unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 
 ExceptionDownload=99
 ExceptionCreateTmpFile=100
@@ -33,8 +33,8 @@
 ##
 #############################################################################
 
-# shellcheck source=try_catch.sh
-source "${BASH_SOURCE%/*}/try_catch.sh"
+# shellcheck source=../unix/try_catch.sh
+source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
 
 ExceptionCreateTmpFile=100
 ExceptionDownloadPrimaryUrl=101
@@ -32,8 +32,8 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-source "${BASH_SOURCE%/*}/DownloadURL.sh"
-source "${BASH_SOURCE%/*}/try_catch.sh"
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
 set -ex
 
 # Command line tools is need by Homebrew
similarity index 97%
rename from coin/provisioning/common/install_xcode.sh
rename to coin/provisioning/common/macos/install_xcode.sh
index c6f00ee..a628044 100755 (executable)
@@ -44,8 +44,8 @@
 
 
 
-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/try_catch.sh"
+# shellcheck source=../unix/try_catch.sh
+source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
 
 function InstallXCode()
 {
@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 # This script will install Dependency Walker 2.2.6000
 
similarity index 98%
rename from coin/provisioning/common/install-git.ps1
rename to coin/provisioning/common/windows/install-git.ps1
index 6b4a34b..00700a2 100644 (file)
@@ -30,7 +30,7 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 # Install Git version 2.13.0
 
@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 # This script will install Java RE
 # Official Java RE 7 downloads require Oracle accounts. Using local mirrors only.
@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 # This script will install Notepad++
 
@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 # This script will install Ruby
 
@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 # This script installs 7-Zip
 
@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 # This script installs Strawberry Perl
 
@@ -30,7 +30,7 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 $version = "11_2_2"
 $package = "C:\Windows\temp\opengl32sw.7z"
@@ -30,7 +30,7 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 # Install Cumulative Servicing Release Visual Studio 2015 update 3
 # Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx
similarity index 99%
rename from coin/provisioning/common/openssl.ps1
rename to coin/provisioning/common/windows/openssl.ps1
index df320c7..f826849 100644 (file)
@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 # This script installs OpenSSL $version.
 # Both x86 and x64 versions needed when x86 integrations are done on x64 machine
@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 # This script will set the network test server IP in to hosts file
 
index 5ef5f0e..baedb6d 100644 (file)
@@ -41,4 +41,4 @@ echo "***** All installed RPM packages *****" >> ~/versions.txt
 rpm -q -a | sort >> ~/versions.txt
 echo "*********************************************" >> ~/versions.txt
 
-$(dirname $0)/../common/version.sh
+$(dirname $0)/../common/linux/version.sh
index b05dcf1..f047fe8 100755 (executable)
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/system_updates.sh
+$BASEDIR/../common/macos/system_updates.sh
index 6b56aac..35372b5 100644 (file)
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 BASEDIR=$(dirname "$0")
-source "$BASEDIR/../common/01-macos-removethemall.sh"
+source "$BASEDIR/../common/macos/01-macos-removethemall.sh"
 
index cd4e3fd..2ffb776 100644 (file)
@@ -1 +1 @@
-source "${BASH_SOURCE%/*}/../common/python3.sh"
+source "${BASH_SOURCE%/*}/../common/macos/python3.sh"
index b05dcf1..f047fe8 100755 (executable)
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/system_updates.sh
+$BASEDIR/../common/macos/system_updates.sh
index 4a07bbb..a45a3a7 100755 (executable)
@@ -35,8 +35,8 @@
 
 # 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
index 8a3999b..e1b3e63 100755 (executable)
@@ -37,8 +37,8 @@
 
 # XZ-Utils are needed for uncompressing xz-compressed files
 
-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/InstallPKGFromURL.sh"
+# shellcheck source=../common/macos/InstallPKGFromURL.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"
index b90313e..b28bd5d 100755 (executable)
@@ -36,8 +36,8 @@
 # This script installs JDK
 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
index 37acc2e..b988215 100755 (executable)
 
 
 
-# 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.2.xz 8.2
index 9145c12..2279d72 100755 (executable)
@@ -32,7 +32,7 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-source "${BASH_SOURCE%/*}/../common/install-commandlinetools.sh"
+source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
 
 version="8.2"
 packageName="Command_Line_Tools_macOS_10.11_for_Xcode_$version.dmg"
index ddb01d6..bb8207f 100755 (executable)
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/cmake.sh
+$BASEDIR/../common/macos/cmake.sh
index 63ec9b6..bd2d0cb 100755 (executable)
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/homebrew.sh
+$BASEDIR/../common/macos/homebrew.sh
index 1e4de16..e1614ad 100755 (executable)
@@ -37,8 +37,8 @@
 
 # MySQL is needed for Qt to be able to support MySQL
 
-# 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/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"
index a990829..63d5623 100755 (executable)
@@ -37,8 +37,8 @@
 
 # PostgreSQL is needed for Qt to be able to support PostgreSQL
 
-# 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/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"
index cd4e3fd..2ffb776 100755 (executable)
@@ -1 +1 @@
-source "${BASH_SOURCE%/*}/../common/python3.sh"
+source "${BASH_SOURCE%/*}/../common/macos/python3.sh"
index ba962b0..1b87da6 100755 (executable)
@@ -3,4 +3,4 @@
 
 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
index aa494c9..5141c33 100755 (executable)
 
 # 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"
+# 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"
index b05dcf1..f047fe8 100755 (executable)
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/system_updates.sh
+$BASEDIR/../common/macos/system_updates.sh
index cd4e3fd..2ffb776 100644 (file)
@@ -1 +1 @@
-source "${BASH_SOURCE%/*}/../common/python3.sh"
+source "${BASH_SOURCE%/*}/../common/macos/python3.sh"
index b05dcf1..f047fe8 100755 (executable)
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/system_updates.sh
+$BASEDIR/../common/macos/system_updates.sh
index cd4e3fd..2ffb776 100644 (file)
@@ -1 +1 @@
-source "${BASH_SOURCE%/*}/../common/python3.sh"
+source "${BASH_SOURCE%/*}/../common/macos/python3.sh"
index 27c618e..19e64a9 100644 (file)
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\python.ps1" 32
+. "$PSScriptRoot\..\common\windows\python.ps1" 32
index 8dbe037..73dc7bc 100644 (file)
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\cmake.ps1"
+. "$PSScriptRoot\..\common\windows\cmake.ps1"
index 325be36..074a7a6 100644 (file)
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\icu.ps1"
+. "$PSScriptRoot\..\common\windows\icu.ps1"
index 842c65d..b246ce2 100644 (file)
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\jom.ps1"
+. "$PSScriptRoot\..\common\windows\jom.ps1"
index 37af711..103cc29 100644 (file)
@@ -30,5 +30,4 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\common\msvc_2015_update3_patch.ps1"
-
+. "$PSScriptRoot\..\common\windows\msvc_2015_update3_patch.ps1"
index 164fbe4..2829930 100644 (file)
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\python3.ps1" 32
+. "$PSScriptRoot\..\common\windows\python3.ps1" 32
index 3962762..2a71fd5 100644 (file)
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-qnx660.ps1"
+. "$PSScriptRoot\..\common\windows\install-qnx660.ps1"
index ded894a..896db75 100644 (file)
@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\common\install-mingw.ps1"
+. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
 
 # This script will install MinGW 5.3.0
 
index a271076..192a3ba 100644 (file)
@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\common\install-mingw.ps1"
+. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
 
 # This script will install MinGW 6.3.0
 
index 325be36..074a7a6 100644 (file)
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\icu.ps1"
+. "$PSScriptRoot\..\common\windows\icu.ps1"
index 842c65d..b246ce2 100644 (file)
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\jom.ps1"
+. "$PSScriptRoot\..\common\windows\jom.ps1"
index 37af711..fe1aec7 100644 (file)
@@ -30,5 +30,5 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\common\msvc_2015_update3_patch.ps1"
+. "$PSScriptRoot\..\common\windows\msvc_2015_update3_patch.ps1"
 
index ee101fa..1c19715 100644 (file)
@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
 
 $version = "11_2_2"
 $openglPackage = "C:\Windows\SysWOW64\opengl32.dll"
index b0c2199..3201032 100644 (file)
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\python3.ps1" 64
+. "$PSScriptRoot\..\common\windows\python3.ps1" 64
index 9c1d90d..8bfcdba 100644 (file)
@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
 
 # This script will install msys which is needed for configuring openssl for Android
 
index 2c26c5e..d271fbb 100644 (file)
@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
 
 # This script installs Android sdk and ndk
 # It also runs update for SDK API level 18, latest SDK tools, latest platform-tools and build-tools version $sdkBuildToolsVersion
index 553f956..7834d31 100644 (file)
@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
 
 # OpenSSL need to be configured from sources for Android build in windows 7
 # Msys need to be installed to target machine
index ad3d595..b9d8153 100644 (file)
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\vc_redist.ps1" 32
+. "$PSScriptRoot\..\common\windows\vc_redist.ps1" 32
index 8dbe037..73dc7bc 100644 (file)
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\cmake.ps1"
+. "$PSScriptRoot\..\common\windows\cmake.ps1"
index 325be36..074a7a6 100644 (file)
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\icu.ps1"
+. "$PSScriptRoot\..\common\windows\icu.ps1"
index 842c65d..b246ce2 100644 (file)
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\jom.ps1"
+. "$PSScriptRoot\..\common\windows\jom.ps1"
index 5f8aa2f..3e825ab 100644 (file)
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\python.ps1"
+. "$PSScriptRoot\..\common\windows\python.ps1"
index 164fbe4..2829930 100644 (file)
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\python3.ps1" 32
+. "$PSScriptRoot\..\common\windows\python3.ps1" 32
index 44c1c5f..e2e9be9 100644 (file)
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\python.ps1" 64
+. "$PSScriptRoot\..\common\windows\python.ps1" 64
index ad3d595..b9d8153 100644 (file)
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\vc_redist.ps1" 32
+. "$PSScriptRoot\..\common\windows\vc_redist.ps1" 32
index 8dbe037..73dc7bc 100644 (file)
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\cmake.ps1"
+. "$PSScriptRoot\..\common\windows\cmake.ps1"
index 325be36..074a7a6 100644 (file)
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\icu.ps1"
+. "$PSScriptRoot\..\common\windows\icu.ps1"
index 842c65d..b246ce2 100644 (file)
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\jom.ps1"
+. "$PSScriptRoot\..\common\windows\jom.ps1"
index 8540c67..202d072 100644 (file)
@@ -30,7 +30,7 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
 
 # Install Visual Studio 2013 update 5
 
index f3906f7..d57ad1c 100644 (file)
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\openssl.ps1"
+. "$PSScriptRoot\..\common\windows\openssl.ps1"
index 164fbe4..2829930 100644 (file)
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\python3.ps1" 32
+. "$PSScriptRoot\..\common\windows\python3.ps1" 32
index 8540c67..202d072 100644 (file)
@@ -30,7 +30,7 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
 
 # Install Visual Studio 2013 update 5
 
index b0c2199..3201032 100644 (file)
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\python3.ps1" 64
+. "$PSScriptRoot\..\common\windows\python3.ps1" 64