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: I0668885da43222663a54521ce85653da697425be Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
author: Heikki Halmet <heikki.halmet@qt.io> 2017-09-21 12:50:58 +0300
committer: Tony Sarajärvi <tony.sarajarvi@qt.io> 2018-01-24 16:32:25 +0000
commit: b2efef48753b0592a6082be0079eb337d309c73d (patch)
tree: fc255c6d49ee03443d8ee72da0949cb51a1d8883
parent: 8c657080f66880683d270f3d4e8d02ad83dd9896 (diff)
186 files changed, 172 insertions, 173 deletions
diff --git a/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1
index 556a352f..c415ca43 100644
--- a/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1
@@ -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
diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1
index fb6a6594..286345a7 100644
--- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1
@@ -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
diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1
index 01442324..37dca27c 100644
--- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1
@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
 
 # This script will install Visual Studio 2017
 
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1
index 556a352f..c415ca43 100644
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1
@@ -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
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1
index fb6a6594..286345a7 100644
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1
@@ -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
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1
index 01442324..37dca27c 100644
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1
@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
 
 # This script will install Visual Studio 2017
 
diff --git a/coin/provisioning/common/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh
index c23cf9b2..56dd6486 100755
--- a/coin/provisioning/common/cmake_linux.sh
+++ b/coin/provisioning/common/linux/cmake_linux.sh
@@ -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"
diff --git a/coin/provisioning/common/linux-removethemall.sh b/coin/provisioning/common/linux/linux-removethemall.sh
index 4386ec74..4386ec74 100755
--- a/coin/provisioning/common/linux-removethemall.sh
+++ b/coin/provisioning/common/linux/linux-removethemall.sh
diff --git a/coin/provisioning/common/version.sh b/coin/provisioning/common/linux/version.sh
index e7662e1e..e7662e1e 100755
--- a/coin/provisioning/common/version.sh
+++ b/coin/provisioning/common/linux/version.sh
diff --git a/coin/provisioning/common/01-macos-removethemall.sh b/coin/provisioning/common/macos/01-macos-removethemall.sh
index f0e26480..f0e26480 100644
--- a/coin/provisioning/common/01-macos-removethemall.sh
+++ b/coin/provisioning/common/macos/01-macos-removethemall.sh
diff --git a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh b/coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh
index 2af2db10..1fd93204 100644
--- a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh
+++ b/coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh
@@ -37,10 +37,10 @@
 # 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
diff --git a/coin/provisioning/common/InstallPKGFromURL.sh b/coin/provisioning/common/macos/InstallPKGFromURL.sh
index c00b646c..c8988205 100644
--- a/coin/provisioning/common/InstallPKGFromURL.sh
+++ b/coin/provisioning/common/macos/InstallPKGFromURL.sh
@@ -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
diff --git a/coin/provisioning/common/cmake.sh b/coin/provisioning/common/macos/cmake.sh
index e10dd41d..e10dd41d 100755
--- a/coin/provisioning/common/cmake.sh
+++ b/coin/provisioning/common/macos/cmake.sh
diff --git a/coin/provisioning/common/homebrew.sh b/coin/provisioning/common/macos/homebrew.sh
index a6efe123..a6efe123 100755
--- a/coin/provisioning/common/homebrew.sh
+++ b/coin/provisioning/common/macos/homebrew.sh
diff --git a/coin/provisioning/common/install-commandlinetools.sh b/coin/provisioning/common/macos/install-commandlinetools.sh
index b54d87b6..48c8f759 100644
--- a/coin/provisioning/common/install-commandlinetools.sh
+++ b/coin/provisioning/common/macos/install-commandlinetools.sh
@@ -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
diff --git a/coin/provisioning/common/install_xcode.sh b/coin/provisioning/common/macos/install_xcode.sh
index c6f00ee7..a6280441 100755
--- a/coin/provisioning/common/install_xcode.sh
+++ b/coin/provisioning/common/macos/install_xcode.sh
@@ -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()
 {
diff --git a/coin/provisioning/common/python3.sh b/coin/provisioning/common/macos/python3.sh
index 56e82386..56e82386 100755
--- a/coin/provisioning/common/python3.sh
+++ b/coin/provisioning/common/macos/python3.sh
diff --git a/coin/provisioning/common/system_updates.sh b/coin/provisioning/common/macos/system_updates.sh
index 2dee2708..2dee2708 100755
--- a/coin/provisioning/common/system_updates.sh
+++ b/coin/provisioning/common/macos/system_updates.sh
diff --git a/coin/provisioning/common/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh
index c60fae21..c60fae21 100644
--- a/coin/provisioning/common/DownloadURL.sh
+++ b/coin/provisioning/common/unix/DownloadURL.sh
diff --git a/coin/provisioning/common/InstallFromCompressedFileFromURL.sh b/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh
index 1f097d32..1f097d32 100644
--- a/coin/provisioning/common/InstallFromCompressedFileFromURL.sh
+++ b/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh
diff --git a/coin/provisioning/common/libclang.sh b/coin/provisioning/common/unix/libclang.sh
index 97a35924..97a35924 100755
--- a/coin/provisioning/common/libclang.sh
+++ b/coin/provisioning/common/unix/libclang.sh
diff --git a/coin/provisioning/common/try_catch.sh b/coin/provisioning/common/unix/try_catch.sh
index b21861e3..b21861e3 100644
--- a/coin/provisioning/common/try_catch.sh
+++ b/coin/provisioning/common/unix/try_catch.sh
diff --git a/coin/provisioning/common/allow-remote-desktop-access.ps1 b/coin/provisioning/common/windows/allow-remote-desktop-access.ps1
index 06ea20a4..06ea20a4 100644
--- a/coin/provisioning/common/allow-remote-desktop-access.ps1
+++ b/coin/provisioning/common/windows/allow-remote-desktop-access.ps1
diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1
index 8a94dc5d..8a94dc5d 100644
--- a/coin/provisioning/common/cmake.ps1
+++ b/coin/provisioning/common/windows/cmake.ps1
diff --git a/coin/provisioning/common/disable-ntp.ps1 b/coin/provisioning/common/windows/disable-ntp.ps1
index 4ec9d1bd..4ec9d1bd 100644
--- a/coin/provisioning/common/disable-ntp.ps1
+++ b/coin/provisioning/common/windows/disable-ntp.ps1
diff --git a/coin/provisioning/common/disable-sleep.ps1 b/coin/provisioning/common/windows/disable-sleep.ps1
index dda785ac..dda785ac 100644
--- a/coin/provisioning/common/disable-sleep.ps1
+++ b/coin/provisioning/common/windows/disable-sleep.ps1
diff --git a/coin/provisioning/common/disable-uac.ps1 b/coin/provisioning/common/windows/disable-uac.ps1
index 757c4a7e..757c4a7e 100644
--- a/coin/provisioning/common/disable-uac.ps1
+++ b/coin/provisioning/common/windows/disable-uac.ps1
diff --git a/coin/provisioning/common/disable-windefender.ps1 b/coin/provisioning/common/windows/disable-windefender.ps1
index 2d1f0783..2d1f0783 100644
--- a/coin/provisioning/common/disable-windefender.ps1
+++ b/coin/provisioning/common/windows/disable-windefender.ps1
diff --git a/coin/provisioning/common/disable-windows-updates.ps1 b/coin/provisioning/common/windows/disable-windows-updates.ps1
index 1a014733..1a014733 100644
--- a/coin/provisioning/common/disable-windows-updates.ps1
+++ b/coin/provisioning/common/windows/disable-windows-updates.ps1
diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1
index b957603a..b957603a 100644
--- a/coin/provisioning/common/helpers.ps1
+++ b/coin/provisioning/common/windows/helpers.ps1
diff --git a/coin/provisioning/common/icu.ps1 b/coin/provisioning/common/windows/icu.ps1
index 16dd8a6f..16dd8a6f 100644
--- a/coin/provisioning/common/icu.ps1
+++ b/coin/provisioning/common/windows/icu.ps1
diff --git a/coin/provisioning/common/install-dependencywalker.ps1 b/coin/provisioning/common/windows/install-dependencywalker.ps1
index ad89fc7b..3fc17052 100644
--- a/coin/provisioning/common/install-dependencywalker.ps1
+++ b/coin/provisioning/common/windows/install-dependencywalker.ps1
@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 # This script will install Dependency Walker 2.2.6000
 
diff --git a/coin/provisioning/common/install-git.ps1 b/coin/provisioning/common/windows/install-git.ps1
index 6b4a34b0..00700a22 100644
--- a/coin/provisioning/common/install-git.ps1
+++ b/coin/provisioning/common/windows/install-git.ps1
@@ -30,7 +30,7 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 # Install Git version 2.13.0
 
diff --git a/coin/provisioning/common/install-java.ps1 b/coin/provisioning/common/windows/install-java.ps1
index 4b9dd097..dc684b70 100644
--- a/coin/provisioning/common/install-java.ps1
+++ b/coin/provisioning/common/windows/install-java.ps1
@@ -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.
diff --git a/coin/provisioning/common/install-mingw.ps1 b/coin/provisioning/common/windows/install-mingw.ps1
index fc02631d..fc02631d 100644
--- a/coin/provisioning/common/install-mingw.ps1
+++ b/coin/provisioning/common/windows/install-mingw.ps1
diff --git a/coin/provisioning/common/install-notepad++.ps1 b/coin/provisioning/common/windows/install-notepad++.ps1
index 2e893852..a6e20d5e 100644
--- a/coin/provisioning/common/install-notepad++.ps1
+++ b/coin/provisioning/common/windows/install-notepad++.ps1
@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 # This script will install Notepad++
 
diff --git a/coin/provisioning/common/install-qnx660.ps1 b/coin/provisioning/common/windows/install-qnx660.ps1
index bf9c9d09..bf9c9d09 100644
--- a/coin/provisioning/common/install-qnx660.ps1
+++ b/coin/provisioning/common/windows/install-qnx660.ps1
diff --git a/coin/provisioning/common/install-ruby.ps1 b/coin/provisioning/common/windows/install-ruby.ps1
index 57cf227f..eae2c390 100644
--- a/coin/provisioning/common/install-ruby.ps1
+++ b/coin/provisioning/common/windows/install-ruby.ps1
@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 # This script will install Ruby
 
diff --git a/coin/provisioning/common/install-sevenzip.ps1 b/coin/provisioning/common/windows/install-sevenzip.ps1
index 1db41cc1..dce39d90 100644
--- a/coin/provisioning/common/install-sevenzip.ps1
+++ b/coin/provisioning/common/windows/install-sevenzip.ps1
@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 # This script installs 7-Zip
 
diff --git a/coin/provisioning/common/install-strawberry-perl.ps1 b/coin/provisioning/common/windows/install-strawberry-perl.ps1
index bd5347b6..8b4a4a25 100644
--- a/coin/provisioning/common/install-strawberry-perl.ps1
+++ b/coin/provisioning/common/windows/install-strawberry-perl.ps1
@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 # This script installs Strawberry Perl
 
diff --git a/coin/provisioning/common/jom.ps1 b/coin/provisioning/common/windows/jom.ps1
index c1e2cbf7..c1e2cbf7 100644
--- a/coin/provisioning/common/jom.ps1
+++ b/coin/provisioning/common/windows/jom.ps1
diff --git a/coin/provisioning/common/memorypershell.ps1 b/coin/provisioning/common/windows/memorypershell.ps1
index 2a8ebb68..2a8ebb68 100644
--- a/coin/provisioning/common/memorypershell.ps1
+++ b/coin/provisioning/common/windows/memorypershell.ps1
diff --git a/coin/provisioning/common/mesa_llvmpipe.ps1 b/coin/provisioning/common/windows/mesa_llvmpipe.ps1
index 7ea0629d..5043aa83 100644
--- a/coin/provisioning/common/mesa_llvmpipe.ps1
+++ b/coin/provisioning/common/windows/mesa_llvmpipe.ps1
@@ -30,7 +30,7 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 $version = "11_2_2"
 $package = "C:\Windows\temp\opengl32sw.7z"
diff --git a/coin/provisioning/common/msvc_2015_update3_patch.ps1 b/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1
index 02c5e61e..bab0f3a1 100644
--- a/coin/provisioning/common/msvc_2015_update3_patch.ps1
+++ b/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1
@@ -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
diff --git a/coin/provisioning/common/mysql.ps1 b/coin/provisioning/common/windows/mysql.ps1
index e300566e..e300566e 100644
--- a/coin/provisioning/common/mysql.ps1
+++ b/coin/provisioning/common/windows/mysql.ps1
diff --git a/coin/provisioning/common/network_test_server_ip.txt b/coin/provisioning/common/windows/network_test_server_ip.txt
index ec3d058a..ec3d058a 100644
--- a/coin/provisioning/common/network_test_server_ip.txt
+++ b/coin/provisioning/common/windows/network_test_server_ip.txt
diff --git a/coin/provisioning/common/openssl.ps1 b/coin/provisioning/common/windows/openssl.ps1
index df320c72..f8268492 100644
--- a/coin/provisioning/common/openssl.ps1
+++ b/coin/provisioning/common/windows/openssl.ps1
@@ -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
diff --git a/coin/provisioning/common/postgresql.ps1 b/coin/provisioning/common/windows/postgresql.ps1
index dd5858a3..dd5858a3 100644
--- a/coin/provisioning/common/postgresql.ps1
+++ b/coin/provisioning/common/windows/postgresql.ps1
diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/windows/python.ps1
index c3eba2d8..c3eba2d8 100644
--- a/coin/provisioning/common/python.ps1
+++ b/coin/provisioning/common/windows/python.ps1
diff --git a/coin/provisioning/common/python3.ps1 b/coin/provisioning/common/windows/python3.ps1
index 3c565874..3c565874 100644
--- a/coin/provisioning/common/python3.ps1
+++ b/coin/provisioning/common/windows/python3.ps1
diff --git a/coin/provisioning/common/set-network-test-server.ps1 b/coin/provisioning/common/windows/set-network-test-server.ps1
index 1a1f50b7..c9a5291e 100644
--- a/coin/provisioning/common/set-network-test-server.ps1
+++ b/coin/provisioning/common/windows/set-network-test-server.ps1
@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 # This script will set the network test server IP in to hosts file
 
diff --git a/coin/provisioning/common/vc_redist.ps1 b/coin/provisioning/common/windows/vc_redist.ps1
index 4213dde9..4213dde9 100644
--- a/coin/provisioning/common/vc_redist.ps1
+++ b/coin/provisioning/common/windows/vc_redist.ps1
diff --git a/coin/provisioning/common/windows_removethemall.ps1 b/coin/provisioning/common/windows/windows_removethemall.ps1
index 0e584900..0e584900 100644
--- a/coin/provisioning/common/windows_removethemall.ps1
+++ b/coin/provisioning/common/windows/windows_removethemall.ps1
diff --git a/coin/provisioning/common/wsearch-off.ps1 b/coin/provisioning/common/windows/wsearch-off.ps1
index 09c45bbd..09c45bbd 100644
--- a/coin/provisioning/common/wsearch-off.ps1
+++ b/coin/provisioning/common/windows/wsearch-off.ps1
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh
index d7abd285..cb435a7d 100644
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh
@@ -1 +1 @@
-$(dirname $0)/../common/cmake_linux.sh
+$(dirname $0)/../common/linux/cmake_linux.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh
index 5ef5f0e9..baedb6d5 100644
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh
@@ -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
diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh
index d7abd285..cb435a7d 100644
--- a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh
@@ -1 +1 @@
-$(dirname $0)/../common/cmake_linux.sh
+$(dirname $0)/../common/linux/cmake_linux.sh
diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh
index b05dcf1c..f047fe8f 100755
--- a/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/system_updates.sh
+$BASEDIR/../common/macos/system_updates.sh
diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/01-macos-removethemall.sh b/coin/provisioning/qtci-osx-10.10-x86_64/01-macos-removethemall.sh
index 6b56aac4..35372b5b 100644
--- a/coin/provisioning/qtci-osx-10.10-x86_64/01-macos-removethemall.sh
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/01-macos-removethemall.sh
@@ -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"
 
diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh
index cd4e3fd9..2ffb776e 100644
--- a/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh
@@ -1 +1 @@
-source "${BASH_SOURCE%/*}/../common/python3.sh"
+source "${BASH_SOURCE%/*}/../common/macos/python3.sh"
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
index b05dcf1c..f047fe8f 100755
--- 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
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/system_updates.sh
+$BASEDIR/../common/macos/system_updates.sh
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh b/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh
index 4a07bbbe..a45a3a71 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh
@@ -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
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh b/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh
index 8a3999b9..e1b3e63b 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh
@@ -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"
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/020-java.sh b/coin/provisioning/qtci-osx-10.11-x86_64/020-java.sh
index b90313e1..b28bd5d6 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/020-java.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/020-java.sh
@@ -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
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh b/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh
index 37acc2ee..b9882154 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh
@@ -44,10 +44,10 @@
 
 
 
-# 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
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh b/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh
index 9145c12a..2279d721 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh
@@ -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"
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh
index ddb01d64..bb8207f7 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/cmake.sh
+$BASEDIR/../common/macos/cmake.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
index 63ec9b69..bd2d0cb9 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/homebrew.sh
+$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/025-mysql.sh
index 1e4de16a..e1614ad3 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh
@@ -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"
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh
index a990829e..63d56235 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh
@@ -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"
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
index cd4e3fd9..2ffb776e 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh
@@ -1 +1 @@
-source "${BASH_SOURCE%/*}/../common/python3.sh"
+source "${BASH_SOURCE%/*}/../common/macos/python3.sh"
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/027-libclang.sh b/coin/provisioning/qtci-osx-10.11-x86_64/027-libclang.sh
index ba962b00..1b87da66 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/027-libclang.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/027-libclang.sh
@@ -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
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/035-openssl.sh b/coin/provisioning/qtci-osx-10.11-x86_64/035-openssl.sh
index aa494c9e..5141c337 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/035-openssl.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/035-openssl.sh
@@ -35,10 +35,10 @@
 
 # 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"
diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh
index b05dcf1c..f047fe8f 100755
--- a/coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh
+++ b/coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/system_updates.sh
+$BASEDIR/../common/macos/system_updates.sh
diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh
index cd4e3fd9..2ffb776e 100644
--- a/coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh
+++ b/coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh
@@ -1 +1 @@
-source "${BASH_SOURCE%/*}/../common/python3.sh"
+source "${BASH_SOURCE%/*}/../common/macos/python3.sh"
diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.9-x86_64/001-system_updates.sh
index b05dcf1c..f047fe8f 100755
--- a/coin/provisioning/qtci-osx-10.9-x86_64/001-system_updates.sh
+++ b/coin/provisioning/qtci-osx-10.9-x86_64/001-system_updates.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/system_updates.sh
+$BASEDIR/../common/macos/system_updates.sh
diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh
index cd4e3fd9..2ffb776e 100644
--- a/coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh
+++ b/coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh
@@ -1 +1 @@
-source "${BASH_SOURCE%/*}/../common/python3.sh"
+source "${BASH_SOURCE%/*}/../common/macos/python3.sh"
diff --git a/coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1
index f92acd91..8f94b3d5 100644
--- a/coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\disable-windefender.ps1"
+. "$PSScriptRoot\..\common\windows\disable-windefender.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1
index 167cfd35..eed6b734 100644
--- a/coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\wsearch-off.ps1"
+. "$PSScriptRoot\..\common\windows\wsearch-off.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1
index dfca166f..934a7356 100644
--- a/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\windows_removethemall.ps1"
+. "$PSScriptRoot\..\common\windows\windows_removethemall.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1
index 1042c846..ee3b3b7d 100644
--- a/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\disable-ntp.ps1"
+. "$PSScriptRoot\..\common\windows\disable-ntp.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1
index b405191e..1b1a07e9 100644
--- a/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1"
+. "$PSScriptRoot\..\common\windows\mesa_llvmpipe.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/07-python.ps1 b/coin/provisioning/qtci-windows-10-x86/07-python.ps1
index 27c618e1..19e64a94 100644
--- a/coin/provisioning/qtci-windows-10-x86/07-python.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/07-python.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\python.ps1" 32
+. "$PSScriptRoot\..\common\windows\python.ps1" 32
diff --git a/coin/provisioning/qtci-windows-10-x86/cmake.ps1 b/coin/provisioning/qtci-windows-10-x86/cmake.ps1
index 8dbe0372..73dc7bc2 100644
--- a/coin/provisioning/qtci-windows-10-x86/cmake.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/cmake.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\cmake.ps1"
+. "$PSScriptRoot\..\common\windows\cmake.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/icu.ps1 b/coin/provisioning/qtci-windows-10-x86/icu.ps1
index 325be36a..074a7a6d 100644
--- a/coin/provisioning/qtci-windows-10-x86/icu.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/icu.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\icu.ps1"
+. "$PSScriptRoot\..\common\windows\icu.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/jom.ps1 b/coin/provisioning/qtci-windows-10-x86/jom.ps1
index 842c65dd..b246ce25 100644
--- a/coin/provisioning/qtci-windows-10-x86/jom.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/jom.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\jom.ps1"
+. "$PSScriptRoot\..\common\windows\jom.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1
index 37af7119..103cc298 100644
--- a/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1
@@ -30,5 +30,4 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\common\msvc_2015_update3_patch.ps1"
-
+. "$PSScriptRoot\..\common\windows\msvc_2015_update3_patch.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/python3.ps1 b/coin/provisioning/qtci-windows-10-x86/python3.ps1
index 164fbe43..28299307 100644
--- a/coin/provisioning/qtci-windows-10-x86/python3.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/python3.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\python3.ps1" 32
+. "$PSScriptRoot\..\common\windows\python3.ps1" 32
diff --git a/coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1 b/coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1
index ae3f327d..5bf811ef 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\disable-sleep.ps1"
+. "$PSScriptRoot\..\common\windows\disable-sleep.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86_64/004-disable-windefender.ps1
index f92acd91..8f94b3d5 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windefender.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/004-disable-windefender.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\disable-windefender.ps1"
+. "$PSScriptRoot\..\common\windows\disable-windefender.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1
index c19bf6cd..57428310 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\disable-windows-updates.ps1"
+. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/005-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86_64/005-wsearch-off.ps1
index 167cfd35..eed6b734 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/005-wsearch-off.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/005-wsearch-off.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\wsearch-off.ps1"
+. "$PSScriptRoot\..\common\windows\wsearch-off.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1
index f3906f78..d57ad1cd 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\openssl.ps1"
+. "$PSScriptRoot\..\common\windows\openssl.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1
index e8e24995..af05e838 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\allow-remote-desktop-access.ps1"
+. "$PSScriptRoot\..\common\windows\allow-remote-desktop-access.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1
index dfca166f..934a7356 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\windows_removethemall.ps1"
+. "$PSScriptRoot\..\common\windows\windows_removethemall.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1
index 1042c846..ee3b3b7d 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\disable-ntp.ps1"
+. "$PSScriptRoot\..\common\windows\disable-ntp.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1
index 1f26c731..455d92bf 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-notepad++.ps1"
+. "$PSScriptRoot\..\common\windows\install-notepad++.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1
index ee3f36a9..a9044256 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-sevenzip.ps1"
+. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1 b/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1
index 39627626..2a71fd55 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-qnx660.ps1"
+. "$PSScriptRoot\..\common\windows\install-qnx660.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1
index b405191e..1b1a07e9 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1"
+. "$PSScriptRoot\..\common\windows\mesa_llvmpipe.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/07-python.ps1 b/coin/provisioning/qtci-windows-10-x86_64/07-python.ps1
index 44c1c5ff..e2e9be9c 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/07-python.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/07-python.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\python.ps1" 64
+. "$PSScriptRoot\..\common\windows\python.ps1" 64
diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1
index f9129cff..38106de7 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-git.ps1"
+. "$PSScriptRoot\..\common\windows\install-git.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1
index 07c4f487..d4e39412 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-java.ps1"
+. "$PSScriptRoot\..\common\windows\install-java.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps1
index 8d549455..331de489 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-dependencywalker.ps1"
+. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1
index ded894a5..896db75f 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1
@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\common\install-mingw.ps1"
+. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
 
 # This script will install MinGW 5.3.0
 
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1
index a2710760..192a3bab 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1
@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\common\install-mingw.ps1"
+. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
 
 # This script will install MinGW 6.3.0
 
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1
index 0d28ea1e..875b426f 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-ruby.ps1"
+. "$PSScriptRoot\..\common\windows\install-ruby.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps1
index 18109622..2b5756be 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-strawberry-perl.ps1"
+. "$PSScriptRoot\..\common\windows\install-strawberry-perl.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps1
index 16d2e180..7918fabf 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\set-network-test-server.ps1"
+. "$PSScriptRoot\..\common\windows\set-network-test-server.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 b/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1
index 8dbe0372..73dc7bc2 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\cmake.ps1"
+. "$PSScriptRoot\..\common\windows\cmake.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-10-x86_64/icu.ps1
index 325be36a..074a7a6d 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/icu.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/icu.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\icu.ps1"
+. "$PSScriptRoot\..\common\windows\icu.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-10-x86_64/jom.ps1
index 842c65dd..b246ce25 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/jom.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/jom.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\jom.ps1"
+. "$PSScriptRoot\..\common\windows\jom.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1
index 37af7119..fe1aec7d 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1
@@ -30,5 +30,5 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\common\msvc_2015_update3_patch.ps1"
+. "$PSScriptRoot\..\common\windows\msvc_2015_update3_patch.ps1"
 
diff --git a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
index f6902153..864a79a5 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
@@ -1,2 +1,2 @@
-. "$PSScriptRoot\..\common\mysql.ps1"
+. "$PSScriptRoot\..\common\windows\mysql.ps1"
 
diff --git a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1
index ee101fa5..1c197151 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1
@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
 
 $version = "11_2_2"
 $openglPackage = "C:\Windows\SysWOW64\opengl32.dll"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1
index c1d8e13e..0e0d87be 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1
@@ -1,2 +1,2 @@
-. "$PSScriptRoot\..\common\postgresql.ps1"
+. "$PSScriptRoot\..\common\windows\postgresql.ps1"
 
diff --git a/coin/provisioning/qtci-windows-10-x86_64/python3.ps1 b/coin/provisioning/qtci-windows-10-x86_64/python3.ps1
index b0c21996..3201032d 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/python3.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/python3.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\python3.ps1" 64
+. "$PSScriptRoot\..\common\windows\python3.ps1" 64
diff --git a/coin/provisioning/qtci-windows-7-x86/004-disable-windefender.ps1 b/coin/provisioning/qtci-windows-7-x86/004-disable-windefender.ps1
index f92acd91..8f94b3d5 100644
--- a/coin/provisioning/qtci-windows-7-x86/004-disable-windefender.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/004-disable-windefender.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\disable-windefender.ps1"
+. "$PSScriptRoot\..\common\windows\disable-windefender.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/005-wsearch-off.ps1 b/coin/provisioning/qtci-windows-7-x86/005-wsearch-off.ps1
index 167cfd35..eed6b734 100644
--- a/coin/provisioning/qtci-windows-7-x86/005-wsearch-off.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/005-wsearch-off.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\wsearch-off.ps1"
+. "$PSScriptRoot\..\common\windows\wsearch-off.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1
index dfca166f..934a7356 100644
--- a/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\windows_removethemall.ps1"
+. "$PSScriptRoot\..\common\windows\windows_removethemall.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-7-x86/02-disable-ntp.ps1
index 1042c846..ee3b3b7d 100644
--- a/coin/provisioning/qtci-windows-7-x86/02-disable-ntp.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/02-disable-ntp.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\disable-ntp.ps1"
+. "$PSScriptRoot\..\common\windows\disable-ntp.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/02-memorypershell.ps1 b/coin/provisioning/qtci-windows-7-x86/02-memorypershell.ps1
index ba24f9d7..e9a9c438 100644
--- a/coin/provisioning/qtci-windows-7-x86/02-memorypershell.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/02-memorypershell.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\memorypershell.ps1"
+. "$PSScriptRoot\..\common\windows\memorypershell.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1
index 9c1d90d4..8bfcdbae 100644
--- a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1
@@ -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
 
diff --git a/coin/provisioning/qtci-windows-7-x86/06-android.ps1 b/coin/provisioning/qtci-windows-7-x86/06-android.ps1
index 2c26c5e2..d271fbbf 100644
--- a/coin/provisioning/qtci-windows-7-x86/06-android.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/06-android.ps1
@@ -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
diff --git a/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1
index 553f9560..7834d311 100644
--- a/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1
@@ -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
diff --git a/coin/provisioning/qtci-windows-7-x86/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-7-x86/07-vc_redist.ps1
index ad3d5950..b9d8153e 100644
--- a/coin/provisioning/qtci-windows-7-x86/07-vc_redist.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/07-vc_redist.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\vc_redist.ps1" 32
+. "$PSScriptRoot\..\common\windows\vc_redist.ps1" 32
diff --git a/coin/provisioning/qtci-windows-7-x86/08-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-7-x86/08-mesa_llvmpipe.ps1
index b405191e..1b1a07e9 100644
--- a/coin/provisioning/qtci-windows-7-x86/08-mesa_llvmpipe.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/08-mesa_llvmpipe.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1"
+. "$PSScriptRoot\..\common\windows\mesa_llvmpipe.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/cmake.ps1 b/coin/provisioning/qtci-windows-7-x86/cmake.ps1
index 8dbe0372..73dc7bc2 100644
--- a/coin/provisioning/qtci-windows-7-x86/cmake.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/cmake.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\cmake.ps1"
+. "$PSScriptRoot\..\common\windows\cmake.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/icu.ps1 b/coin/provisioning/qtci-windows-7-x86/icu.ps1
index 325be36a..074a7a6d 100644
--- a/coin/provisioning/qtci-windows-7-x86/icu.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/icu.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\icu.ps1"
+. "$PSScriptRoot\..\common\windows\icu.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/jom.ps1 b/coin/provisioning/qtci-windows-7-x86/jom.ps1
index 842c65dd..b246ce25 100644
--- a/coin/provisioning/qtci-windows-7-x86/jom.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/jom.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\jom.ps1"
+. "$PSScriptRoot\..\common\windows\jom.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/python.ps1 b/coin/provisioning/qtci-windows-7-x86/python.ps1
index 5f8aa2f8..3e825ab8 100644
--- a/coin/provisioning/qtci-windows-7-x86/python.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/python.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\python.ps1"
+. "$PSScriptRoot\..\common\windows\python.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/python3.ps1 b/coin/provisioning/qtci-windows-7-x86/python3.ps1
index 164fbe43..28299307 100644
--- a/coin/provisioning/qtci-windows-7-x86/python3.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/python3.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\python3.ps1" 32
+. "$PSScriptRoot\..\common\windows\python3.ps1" 32
diff --git a/coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1
index 1042c846..ee3b3b7d 100644
--- a/coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1
+++ b/coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\disable-ntp.ps1"
+. "$PSScriptRoot\..\common\windows\disable-ntp.ps1"
diff --git a/coin/provisioning/qtci-windows-8-x86_64/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-8-x86_64/02-disable-ntp.ps1
index 1042c846..ee3b3b7d 100644
--- a/coin/provisioning/qtci-windows-8-x86_64/02-disable-ntp.ps1
+++ b/coin/provisioning/qtci-windows-8-x86_64/02-disable-ntp.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\disable-ntp.ps1"
+. "$PSScriptRoot\..\common\windows\disable-ntp.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1 b/coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1
index 2303699c..51eb0b2b 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\disable-uac.ps1"
+. "$PSScriptRoot\..\common\windows\disable-uac.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1
index c19bf6cd..57428310 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\disable-windows-updates.ps1"
+. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1
index 16d2e180..7918fabf 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\set-network-test-server.ps1"
+. "$PSScriptRoot\..\common\windows\set-network-test-server.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1
index e8e24995..af05e838 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\allow-remote-desktop-access.ps1"
+. "$PSScriptRoot\..\common\windows\allow-remote-desktop-access.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1
index 1042c846..ee3b3b7d 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\disable-ntp.ps1"
+. "$PSScriptRoot\..\common\windows\disable-ntp.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1
index ae3f327d..5bf811ef 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\disable-sleep.ps1"
+. "$PSScriptRoot\..\common\windows\disable-sleep.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1
index 1f26c731..455d92bf 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-notepad++.ps1"
+. "$PSScriptRoot\..\common\windows\install-notepad++.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1
index ee3f36a9..a9044256 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-sevenzip.ps1"
+. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1
index f92acd91..8f94b3d5 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\disable-windefender.ps1"
+. "$PSScriptRoot\..\common\windows\disable-windefender.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1
index 167cfd35..eed6b734 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\wsearch-off.ps1"
+. "$PSScriptRoot\..\common\windows\wsearch-off.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/06-python.ps1 b/coin/provisioning/qtci-windows-8.1-x86/06-python.ps1
index 44c1c5ff..e2e9be9c 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/06-python.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/06-python.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\python.ps1" 64
+. "$PSScriptRoot\..\common\windows\python.ps1" 64
diff --git a/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1
index b405191e..1b1a07e9 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1"
+. "$PSScriptRoot\..\common\windows\mesa_llvmpipe.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1
index ad3d5950..b9d8153e 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\vc_redist.ps1" 32
+. "$PSScriptRoot\..\common\windows\vc_redist.ps1" 32
diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1
index f9129cff..38106de7 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-git.ps1"
+. "$PSScriptRoot\..\common\windows\install-git.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1
index 07c4f487..d4e39412 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-java.ps1"
+. "$PSScriptRoot\..\common\windows\install-java.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1
index 8d549455..331de489 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-dependencywalker.ps1"
+. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1
index 0d28ea1e..875b426f 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-ruby.ps1"
+. "$PSScriptRoot\..\common\windows\install-ruby.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1
index 18109622..2b5756be 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-strawberry-perl.ps1"
+. "$PSScriptRoot\..\common\windows\install-strawberry-perl.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1
index a41035da..eca19011 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\mysql.ps1"
+. "$PSScriptRoot\..\common\windows\mysql.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1
index 92339a45..451d2452 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\postgresql.ps1"
+. "$PSScriptRoot\..\common\windows\postgresql.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/cmake.ps1 b/coin/provisioning/qtci-windows-8.1-x86/cmake.ps1
index 8dbe0372..73dc7bc2 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/cmake.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/cmake.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\cmake.ps1"
+. "$PSScriptRoot\..\common\windows\cmake.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/icu.ps1 b/coin/provisioning/qtci-windows-8.1-x86/icu.ps1
index 325be36a..074a7a6d 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/icu.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/icu.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\icu.ps1"
+. "$PSScriptRoot\..\common\windows\icu.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86/jom.ps1
index 842c65dd..b246ce25 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/jom.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/jom.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\jom.ps1"
+. "$PSScriptRoot\..\common\windows\jom.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1 b/coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1
index 8540c67d..202d072d 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1
@@ -30,7 +30,7 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
 
 # Install Visual Studio 2013 update 5
 
diff --git a/coin/provisioning/qtci-windows-8.1-x86/openssl.ps1 b/coin/provisioning/qtci-windows-8.1-x86/openssl.ps1
index f3906f78..d57ad1cd 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/openssl.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/openssl.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\openssl.ps1"
+. "$PSScriptRoot\..\common\windows\openssl.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86/python3.ps1
index 164fbe43..28299307 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/python3.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/python3.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\python3.ps1" 32
+. "$PSScriptRoot\..\common\windows\python3.ps1" 32
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/001-disable-uac.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/001-disable-uac.ps1
index 2303699c..51eb0b2b 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/001-disable-uac.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/001-disable-uac.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\disable-uac.ps1"
+. "$PSScriptRoot\..\common\windows\disable-uac.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/004-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/004-disable-windows-updates.ps1
index c19bf6cd..57428310 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/004-disable-windows-updates.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/004-disable-windows-updates.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\disable-windows-updates.ps1"
+. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/009-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/009-set-network-test-server.ps1
index 16d2e180..7918fabf 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/009-set-network-test-server.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/009-set-network-test-server.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\set-network-test-server.ps1"
+. "$PSScriptRoot\..\common\windows\set-network-test-server.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1
index e8e24995..af05e838 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\allow-remote-desktop-access.ps1"
+. "$PSScriptRoot\..\common\windows\allow-remote-desktop-access.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps1
index 1042c846..ee3b3b7d 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\disable-ntp.ps1"
+. "$PSScriptRoot\..\common\windows\disable-ntp.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps1
index ae3f327d..5bf811ef 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\disable-sleep.ps1"
+. "$PSScriptRoot\..\common\windows\disable-sleep.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/02-install-notepad++.ps1
index 1f26c731..455d92bf 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/02-install-notepad++.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/02-install-notepad++.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-notepad++.ps1"
+. "$PSScriptRoot\..\common\windows\install-notepad++.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1
index ee3f36a9..a9044256 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-sevenzip.ps1"
+. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1
index f92acd91..8f94b3d5 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\disable-windefender.ps1"
+. "$PSScriptRoot\..\common\windows\disable-windefender.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1
index 167cfd35..eed6b734 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\wsearch-off.ps1"
+. "$PSScriptRoot\..\common\windows\wsearch-off.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/06-python.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/06-python.ps1
index 44c1c5ff..e2e9be9c 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/06-python.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/06-python.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\python.ps1" 64
+. "$PSScriptRoot\..\common\windows\python.ps1" 64
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/07-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/07-mesa_llvmpipe.ps1
index b405191e..1b1a07e9 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/07-mesa_llvmpipe.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/07-mesa_llvmpipe.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1"
+. "$PSScriptRoot\..\common\windows\mesa_llvmpipe.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1
index 6070c80b..b8c1ce9f 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\vc_redist.ps1" 64
+. "$PSScriptRoot\..\common\windows\vc_redist.ps1" 64
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-git.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-git.ps1
index f9129cff..38106de7 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-git.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-git.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-git.ps1"
+. "$PSScriptRoot\..\common\windows\install-git.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-java.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-java.ps1
index 07c4f487..d4e39412 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-java.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-java.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-java.ps1"
+. "$PSScriptRoot\..\common\windows\install-java.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps1
index 8d549455..331de489 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-dependencywalker.ps1"
+. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-ruby.ps1
index 0d28ea1e..875b426f 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-ruby.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-ruby.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-ruby.ps1"
+. "$PSScriptRoot\..\common\windows\install-ruby.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-strawberry-perl.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-strawberry-perl.ps1
index 18109622..2b5756be 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-strawberry-perl.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-strawberry-perl.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-strawberry-perl.ps1"
+. "$PSScriptRoot\..\common\windows\install-strawberry-perl.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-mysql.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-mysql.ps1
index a41035da..eca19011 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/09-mysql.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/09-mysql.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\mysql.ps1"
+. "$PSScriptRoot\..\common\windows\mysql.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-postgresql.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-postgresql.ps1
index 92339a45..451d2452 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/09-postgresql.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/09-postgresql.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\postgresql.ps1"
+. "$PSScriptRoot\..\common\windows\postgresql.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/cmake.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/cmake.ps1
index 8dbe0372..73dc7bc2 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/cmake.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/cmake.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\cmake.ps1"
+. "$PSScriptRoot\..\common\windows\cmake.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/icu.ps1
index 325be36a..074a7a6d 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/icu.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/icu.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\icu.ps1"
+. "$PSScriptRoot\..\common\windows\icu.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/jom.ps1
index 842c65dd..b246ce25 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/jom.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/jom.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\jom.ps1"
+. "$PSScriptRoot\..\common\windows\jom.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/msvc-2013-update5.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/msvc-2013-update5.ps1
index 8540c67d..202d072d 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/msvc-2013-update5.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/msvc-2013-update5.ps1
@@ -30,7 +30,7 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
 
 # Install Visual Studio 2013 update 5
 
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/openssl.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/openssl.ps1
index f3906f78..d57ad1cd 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/openssl.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/openssl.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\openssl.ps1"
+. "$PSScriptRoot\..\common\windows\openssl.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1
index b0c21996..3201032d 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\python3.ps1" 64
+. "$PSScriptRoot\..\common\windows\python3.ps1" 64
author	Heikki Halmet <heikki.halmet@qt.io>	2017-09-21 12:50:58 +0300
committer	Tony Sarajärvi <tony.sarajarvi@qt.io>	2018-01-24 16:32:25 +0000
commit	b2efef48753b0592a6082be0079eb337d309c73d (patch)
tree	fc255c6d49ee03443d8ee72da0949cb51a1d8883
parent	8c657080f66880683d270f3d4e8d02ad83dd9896 (diff)