Split Common folder based on operating system families

This change will split common folder to four different folders: Linux, Unix, Windows and MacOS. Each of these folders includes scripts which are common for their operating system familes Task-number: QTQAINFRA-1451 Change-Id: Ic93b2183052335dee875d1452b21e38d268b6474 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
zwjkim · Jan 10, 2018 · 2a28ce8 · 2a28ce8
1 parent 52da24b
commit 2a28ce8
Show file tree

Hide file tree

Showing 282 changed files with 253 additions and 253 deletions.
diff --git a/coin/provisioning/common/android_linux.sh → ...rovisioning/common/linux/android_linux.sh b/coin/provisioning/common/android_linux.sh → ...rovisioning/common/linux/android_linux.sh
@@ -37,9 +37,9 @@
 
 # It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version
 
-source "${BASH_SOURCE%/*}/../common/try_catch.sh"
-source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
-source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh"
+source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+source "${BASH_SOURCE%/*}/../unix/check_and_set_proxy.sh"
 
 targetFolder="/opt/android"
 sdkTargetFolder="$targetFolder/sdk"

diff --git a/coin/provisioning/common/cmake_linux.sh → .../provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/cmake_linux.sh → .../provisioning/common/linux/cmake_linux.sh
@@ -38,7 +38,7 @@
 # CMake is needed for autotests that verify that Qt can be built with CMake
 
 # shellcheck source=InstallFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/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/disable_selinux.sh → ...visioning/common/linux/disable_selinux.sh b/coin/provisioning/common/disable_selinux.sh → ...visioning/common/linux/disable_selinux.sh
diff --git a/coin/provisioning/common/fbx_linux.sh → coin/provisioning/common/linux/fbx_linux.sh b/coin/provisioning/common/fbx_linux.sh → coin/provisioning/common/linux/fbx_linux.sh
@@ -34,7 +34,7 @@
 #############################################################################
 
 # This script installs FBX SDK
-source "${BASH_SOURCE%/*}/DownloadURL.sh"
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 #s script installs FBX SDK
 
 set -e

diff --git a/coin/provisioning/common/integrity.sh → coin/provisioning/common/linux/integrity.sh b/coin/provisioning/common/integrity.sh → coin/provisioning/common/linux/integrity.sh
@@ -35,7 +35,7 @@
 
 # This script installs INTEGRITY
 
-source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
+source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 
 version="11.4.4"
 PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/integrity/ghs_$version.tar.gz"

diff --git a/...oning/common/openssl_for_android_linux.sh → ...common/linux/openssl_for_android_linux.sh b/...oning/common/openssl_for_android_linux.sh → ...common/linux/openssl_for_android_linux.sh
@@ -36,8 +36,8 @@
 # This script install OpenSSL from sources.
 # Requires GCC and Perl to be in PATH.
 
-source "${BASH_SOURCE%/*}/try_catch.sh"
-source "${BASH_SOURCE%/*}/DownloadURL.sh"
+source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 
 version="1.0.2g"
 officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"

diff --git a/coin/provisioning/common/qnx_700.sh → coin/provisioning/common/linux/qnx_700.sh b/coin/provisioning/common/qnx_700.sh → coin/provisioning/common/linux/qnx_700.sh
diff --git a/coin/provisioning/common/version.sh → coin/provisioning/common/linux/version.sh b/coin/provisioning/common/version.sh → coin/provisioning/common/linux/version.sh
diff --git a/...on/InstallAppFromCompressedFileFromURL.sh → ...os/InstallAppFromCompressedFileFromURL.sh b/...on/InstallAppFromCompressedFileFromURL.sh → ...os/InstallAppFromCompressedFileFromURL.sh
@@ -38,9 +38,9 @@
 # to /Applications/. This can be overridden by a target parameter.
 
 # shellcheck source=try_catch.sh
-source "${BASH_SOURCE%/*}/try_catch.sh"
+source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
 # shellcheck source=DownloadURL.sh
-source "${BASH_SOURCE%/*}/DownloadURL.sh"
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 
 ExceptionDownload=99
 ExceptionCreateTmpFile=100

diff --git a/.../provisioning/common/InstallPKGFromURL.sh → ...sioning/common/macos/InstallPKGFromURL.sh b/.../provisioning/common/InstallPKGFromURL.sh → ...sioning/common/macos/InstallPKGFromURL.sh
@@ -34,7 +34,7 @@
 #############################################################################
 
 # shellcheck source=try_catch.sh
-source "${BASH_SOURCE%/*}/try_catch.sh"
+source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
 
 ExceptionCreateTmpFile=100
 ExceptionDownloadPrimaryUrl=101

diff --git a/coin/provisioning/common/cmake.sh → coin/provisioning/common/macos/cmake.sh b/coin/provisioning/common/cmake.sh → coin/provisioning/common/macos/cmake.sh
diff --git a/coin/provisioning/common/fbx_macos.sh → coin/provisioning/common/macos/fbx_macos.sh b/coin/provisioning/common/fbx_macos.sh → coin/provisioning/common/macos/fbx_macos.sh
@@ -34,8 +34,8 @@
 
 # This script installs FBX SDK
 
-# shellcheck source=./try_catch.sh
-source "${BASH_SOURCE%/*}/try_catch.sh"
+# shellcheck source=./../unix/try_catch.sh
+source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
 
 fileName="fbx20161_2_fbxsdk_clang_mac.pkg.tgz"
 targetFolder="/opt/fbx"

diff --git a/coin/provisioning/common/homebrew.sh → coin/provisioning/common/macos/homebrew.sh b/coin/provisioning/common/homebrew.sh → coin/provisioning/common/macos/homebrew.sh
diff --git a/...ioning/common/install-commandlinetools.sh → .../common/macos/install-commandlinetools.sh b/...ioning/common/install-commandlinetools.sh → .../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 → ...rovisioning/common/macos/install_xcode.sh b/coin/provisioning/common/install_xcode.sh → ...rovisioning/common/macos/install_xcode.sh
@@ -44,8 +44,8 @@
 
 
 
-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/try_catch.sh"
+# shellcheck source=../common/unix/try_catch.sh
+source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
 
 function InstallXCode()
 {

diff --git a/coin/provisioning/common/pip.sh → coin/provisioning/common/macos/pip.sh b/coin/provisioning/common/pip.sh → coin/provisioning/common/macos/pip.sh
diff --git a/coin/provisioning/common/python3.sh → coin/provisioning/common/macos/python3.sh b/coin/provisioning/common/python3.sh → coin/provisioning/common/macos/python3.sh
diff --git a/coin/provisioning/common/system_updates.sh → ...ovisioning/common/macos/system_updates.sh b/coin/provisioning/common/system_updates.sh → ...ovisioning/common/macos/system_updates.sh
diff --git a/coin/provisioning/common/virtualenv.sh → coin/provisioning/common/macos/virtualenv.sh b/coin/provisioning/common/virtualenv.sh → coin/provisioning/common/macos/virtualenv.sh
diff --git a/coin/provisioning/common/DownloadURL.sh → coin/provisioning/common/unix/DownloadURL.sh b/coin/provisioning/common/DownloadURL.sh → coin/provisioning/common/unix/DownloadURL.sh
diff --git a/...ommon/InstallFromCompressedFileFromURL.sh → .../unix/InstallFromCompressedFileFromURL.sh b/...ommon/InstallFromCompressedFileFromURL.sh → .../unix/InstallFromCompressedFileFromURL.sh
diff --git a/...rovisioning/common/check_and_set_proxy.sh → ...ioning/common/unix/check_and_set_proxy.sh b/...rovisioning/common/check_and_set_proxy.sh → ...ioning/common/unix/check_and_set_proxy.sh
diff --git a/coin/provisioning/common/http_proxy.txt → coin/provisioning/common/unix/http_proxy.txt b/coin/provisioning/common/http_proxy.txt → coin/provisioning/common/unix/http_proxy.txt
diff --git a/coin/provisioning/common/libclang.sh → coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/libclang.sh → coin/provisioning/common/unix/libclang.sh
@@ -40,10 +40,10 @@
 # In case of Linux, we expect to get the values as args
 set -e
 
-source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh"
+source "${BASH_SOURCE%/*}/check_and_set_proxy.sh"
 
 BASEDIR=$(dirname "$0")
-. $BASEDIR/sw_versions.txt
+. $BASEDIR/../sw_versions.txt
 url=$1
 sha1=$2
 version=$3

diff --git a/coin/provisioning/common/try_catch.sh → coin/provisioning/common/unix/try_catch.sh b/coin/provisioning/common/try_catch.sh → coin/provisioning/common/unix/try_catch.sh
diff --git a/coin/provisioning/common/03-conan.ps1 → .../provisioning/common/windows/03-conan.ps1 b/coin/provisioning/common/03-conan.ps1 → .../provisioning/common/windows/03-conan.ps1
diff --git a/...provisioning/common/3dstudio_3rdparty.ps1 → ...ning/common/windows/3dstudio_3rdparty.ps1 b/...provisioning/common/3dstudio_3rdparty.ps1 → ...ning/common/windows/3dstudio_3rdparty.ps1
diff --git a/...ng/common/allow-remote-desktop-access.ps1 → ...n/windows/allow-remote-desktop-access.ps1 b/...ng/common/allow-remote-desktop-access.ps1 → ...n/windows/allow-remote-desktop-access.ps1
diff --git a/coin/provisioning/common/cmake.ps1 → coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/cmake.ps1 → coin/provisioning/common/windows/cmake.ps1
diff --git a/...1/annulen/stable/export/conanmanifest.txt → ...1/annulen/stable/export/conanmanifest.txt b/...1/annulen/stable/export/conanmanifest.txt → ...1/annulen/stable/export/conanmanifest.txt
diff --git a/...c575258bd175fe4d30ba476/conanmanifest.txt → ...c575258bd175fe4d30ba476/conanmanifest.txt b/...c575258bd175fe4d30ba476/conanmanifest.txt → ...c575258bd175fe4d30ba476/conanmanifest.txt
diff --git a/...vitallium/stable/export/conanmanifest.txt → ...vitallium/stable/export/conanmanifest.txt b/...vitallium/stable/export/conanmanifest.txt → ...vitallium/stable/export/conanmanifest.txt
diff --git a/...0f86200a4ea56c23f568ff9/conanmanifest.txt → ...0f86200a4ea56c23f568ff9/conanmanifest.txt b/...0f86200a4ea56c23f568ff9/conanmanifest.txt → ...0f86200a4ea56c23f568ff9/conanmanifest.txt
diff --git a/...df074e1c63b768a41181d7a/conanmanifest.txt → ...df074e1c63b768a41181d7a/conanmanifest.txt b/...df074e1c63b768a41181d7a/conanmanifest.txt → ...df074e1c63b768a41181d7a/conanmanifest.txt
diff --git a/...efcbcdef01d2c4689917df6/conanmanifest.txt → ...efcbcdef01d2c4689917df6/conanmanifest.txt b/...efcbcdef01d2c4689917df6/conanmanifest.txt → ...efcbcdef01d2c4689917df6/conanmanifest.txt
diff --git a/...04c82824988c42e9ac40ddf/conanmanifest.txt → ...04c82824988c42e9ac40ddf/conanmanifest.txt b/...04c82824988c42e9ac40ddf/conanmanifest.txt → ...04c82824988c42e9ac40ddf/conanmanifest.txt
diff --git a/...4/annulen/stable/export/conanmanifest.txt → ...4/annulen/stable/export/conanmanifest.txt b/...4/annulen/stable/export/conanmanifest.txt → ...4/annulen/stable/export/conanmanifest.txt
diff --git a/...e369d54132f4f21c3f13f7d/conanmanifest.txt → ...e369d54132f4f21c3f13f7d/conanmanifest.txt b/...e369d54132f4f21c3f13f7d/conanmanifest.txt → ...e369d54132f4f21c3f13f7d/conanmanifest.txt
diff --git a/...vitallium/stable/export/conanmanifest.txt → ...vitallium/stable/export/conanmanifest.txt b/...vitallium/stable/export/conanmanifest.txt → ...vitallium/stable/export/conanmanifest.txt
diff --git a/...8a6d90a8fcc34d2b4de2260/conanmanifest.txt → ...8a6d90a8fcc34d2b4de2260/conanmanifest.txt b/...8a6d90a8fcc34d2b4de2260/conanmanifest.txt → ...8a6d90a8fcc34d2b4de2260/conanmanifest.txt
diff --git a/...fb46571ac7caaa967c09c5d/conanmanifest.txt → ...fb46571ac7caaa967c09c5d/conanmanifest.txt b/...fb46571ac7caaa967c09c5d/conanmanifest.txt → ...fb46571ac7caaa967c09c5d/conanmanifest.txt
diff --git a/...12b3f2dafe88cc0962c29b9/conanmanifest.txt → ...12b3f2dafe88cc0962c29b9/conanmanifest.txt b/...12b3f2dafe88cc0962c29b9/conanmanifest.txt → ...12b3f2dafe88cc0962c29b9/conanmanifest.txt
diff --git a/...e89c4298d94b672829af1fe/conanmanifest.txt → ...e89c4298d94b672829af1fe/conanmanifest.txt b/...e89c4298d94b672829af1fe/conanmanifest.txt → ...e89c4298d94b672829af1fe/conanmanifest.txt
diff --git a/...9/annulen/stable/export/conanmanifest.txt → ...9/annulen/stable/export/conanmanifest.txt b/...9/annulen/stable/export/conanmanifest.txt → ...9/annulen/stable/export/conanmanifest.txt
diff --git a/...40f441a20f7d1be9a5c636c/conanmanifest.txt → ...40f441a20f7d1be9a5c636c/conanmanifest.txt b/...40f441a20f7d1be9a5c636c/conanmanifest.txt → ...40f441a20f7d1be9a5c636c/conanmanifest.txt
diff --git a/...vitallium/stable/export/conanmanifest.txt → ...vitallium/stable/export/conanmanifest.txt b/...vitallium/stable/export/conanmanifest.txt → ...vitallium/stable/export/conanmanifest.txt
diff --git a/...6b277c7fac0e00264689c20/conanmanifest.txt → ...6b277c7fac0e00264689c20/conanmanifest.txt b/...6b277c7fac0e00264689c20/conanmanifest.txt → ...6b277c7fac0e00264689c20/conanmanifest.txt
diff --git a/...2095aa945fff98630acdd12/conanmanifest.txt → ...2095aa945fff98630acdd12/conanmanifest.txt b/...2095aa945fff98630acdd12/conanmanifest.txt → ...2095aa945fff98630acdd12/conanmanifest.txt
diff --git a/...a2c6c18ff17d3b0b91202c6/conanmanifest.txt → ...a2c6c18ff17d3b0b91202c6/conanmanifest.txt b/...a2c6c18ff17d3b0b91202c6/conanmanifest.txt → ...a2c6c18ff17d3b0b91202c6/conanmanifest.txt
diff --git a/...5b56c1f3dd9b0a99f522727/conanmanifest.txt → ...5b56c1f3dd9b0a99f522727/conanmanifest.txt b/...5b56c1f3dd9b0a99f522727/conanmanifest.txt → ...5b56c1f3dd9b0a99f522727/conanmanifest.txt
diff --git a/...8/annulen/stable/export/conanmanifest.txt → ...8/annulen/stable/export/conanmanifest.txt b/...8/annulen/stable/export/conanmanifest.txt → ...8/annulen/stable/export/conanmanifest.txt
diff --git a/...067140a0973ea7204f67350/conanmanifest.txt → ...067140a0973ea7204f67350/conanmanifest.txt b/...067140a0973ea7204f67350/conanmanifest.txt → ...067140a0973ea7204f67350/conanmanifest.txt
diff --git a/coin/provisioning/common/disable-ntp.ps1 → ...ovisioning/common/windows/disable-ntp.ps1 b/coin/provisioning/common/disable-ntp.ps1 → ...ovisioning/common/windows/disable-ntp.ps1
diff --git a/coin/provisioning/common/disable-sleep.ps1 → ...isioning/common/windows/disable-sleep.ps1 b/coin/provisioning/common/disable-sleep.ps1 → ...isioning/common/windows/disable-sleep.ps1
diff --git a/coin/provisioning/common/disable-uac.ps1 → ...ovisioning/common/windows/disable-uac.ps1 b/coin/provisioning/common/disable-uac.ps1 → ...ovisioning/common/windows/disable-uac.ps1
diff --git a/...ovisioning/common/disable-windefender.ps1 → ...ng/common/windows/disable-windefender.ps1 b/...ovisioning/common/disable-windefender.ps1 → ...ng/common/windows/disable-windefender.ps1
diff --git a/...ioning/common/disable-windows-updates.ps1 → ...ommon/windows/disable-windows-updates.ps1 b/...ioning/common/disable-windows-updates.ps1 → ...ommon/windows/disable-windows-updates.ps1
diff --git a/coin/provisioning/common/fbx_windows.ps1 → ...ovisioning/common/windows/fbx_windows.ps1 b/coin/provisioning/common/fbx_windows.ps1 → ...ovisioning/common/windows/fbx_windows.ps1
diff --git a/coin/provisioning/common/helpers.ps1 → coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/helpers.ps1 → coin/provisioning/common/windows/helpers.ps1
diff --git a/coin/provisioning/common/icu.ps1 → coin/provisioning/common/windows/icu.ps1 b/coin/provisioning/common/icu.ps1 → coin/provisioning/common/windows/icu.ps1
diff --git a/...oning/common/install-dependencywalker.ps1 → ...mmon/windows/install-dependencywalker.ps1 b/...oning/common/install-dependencywalker.ps1 → ...mmon/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 → ...ovisioning/common/windows/install-git.ps1 b/coin/provisioning/common/install-git.ps1 → ...ovisioning/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-jdk.ps1 → ...ovisioning/common/windows/install-jdk.ps1 b/coin/provisioning/common/install-jdk.ps1 → ...ovisioning/common/windows/install-jdk.ps1
@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 # This script will install Java SE
 

diff --git a/coin/provisioning/common/install-mingw.ps1 → ...isioning/common/windows/install-mingw.ps1 b/coin/provisioning/common/install-mingw.ps1 → ...isioning/common/windows/install-mingw.ps1
@@ -31,7 +31,7 @@
 ##
 ############################################################################
 
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 function InstallMinGW
 {

diff --git a/...provisioning/common/install-notepad++.ps1 → ...ning/common/windows/install-notepad++.ps1 b/...provisioning/common/install-notepad++.ps1 → ...ning/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 → ...sioning/common/windows/install-qnx660.ps1 b/coin/provisioning/common/install-qnx660.ps1 → ...sioning/common/windows/install-qnx660.ps1
diff --git a/coin/provisioning/common/install-ruby.ps1 → ...visioning/common/windows/install-ruby.ps1 b/coin/provisioning/common/install-ruby.ps1 → ...visioning/common/windows/install-ruby.ps1
@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 # This script will install Ruby
 

diff --git a/.../provisioning/common/install-sevenzip.ps1 → ...oning/common/windows/install-sevenzip.ps1 b/.../provisioning/common/install-sevenzip.ps1 → ...oning/common/windows/install-sevenzip.ps1
@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 # This script installs 7-Zip
 

diff --git a/...ioning/common/install-strawberry-perl.ps1 → ...ommon/windows/install-strawberry-perl.ps1 b/...ioning/common/install-strawberry-perl.ps1 → ...ommon/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 → coin/provisioning/common/windows/jom.ps1 b/coin/provisioning/common/jom.ps1 → coin/provisioning/common/windows/jom.ps1
diff --git a/coin/provisioning/common/libclang.ps1 → .../provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/libclang.ps1 → .../provisioning/common/windows/libclang.ps1
@@ -1,10 +1,10 @@
 param([Int32]$archVer=32)
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/).
 # The Clang library (C-bindings), version 3.9 or higher is required for building.
 
-Get-Content "$PSScriptRoot\..\common\sw_versions.txt" | Foreach-Object {
+Get-Content "$PSScriptRoot\..\sw_versions.txt" | Foreach-Object {
     $var = $_.Split('=')
     New-Variable -Name $var[0] -Value $var[1]
     $libclang_version = $libclang_version -replace '["."]'

diff --git a/coin/provisioning/common/libusb.ps1 → coin/provisioning/common/windows/libusb.ps1 b/coin/provisioning/common/libusb.ps1 → coin/provisioning/common/windows/libusb.ps1
diff --git a/coin/provisioning/common/memorypershell.ps1 → ...sioning/common/windows/memorypershell.ps1 b/coin/provisioning/common/memorypershell.ps1 → ...sioning/common/windows/memorypershell.ps1
diff --git a/coin/provisioning/common/mesa_llvmpipe.ps1 → ...isioning/common/windows/mesa_llvmpipe.ps1 b/coin/provisioning/common/mesa_llvmpipe.ps1 → ...isioning/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/...ioning/common/msvc_2015_update3_patch.ps1 → ...ommon/windows/msvc_2015_update3_patch.ps1 b/...ioning/common/msvc_2015_update3_patch.ps1 → ...ommon/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 → coin/provisioning/common/windows/mysql.ps1 b/coin/provisioning/common/mysql.ps1 → coin/provisioning/common/windows/mysql.ps1
diff --git a/coin/provisioning/common/ninja.ps1 → coin/provisioning/common/windows/ninja.ps1 b/coin/provisioning/common/ninja.ps1 → coin/provisioning/common/windows/ninja.ps1
diff --git a/coin/provisioning/common/openssl.ps1 → coin/provisioning/common/windows/openssl.ps1 b/coin/provisioning/common/openssl.ps1 → 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/patch_qnx.ps1 → ...provisioning/common/windows/patch_qnx.ps1 b/coin/provisioning/common/patch_qnx.ps1 → ...provisioning/common/windows/patch_qnx.ps1
diff --git a/coin/provisioning/common/postgresql.ps1 → ...rovisioning/common/windows/postgresql.ps1 b/coin/provisioning/common/postgresql.ps1 → ...rovisioning/common/windows/postgresql.ps1
diff --git a/coin/provisioning/common/python.ps1 → coin/provisioning/common/windows/python.ps1 b/coin/provisioning/common/python.ps1 → coin/provisioning/common/windows/python.ps1
diff --git a/coin/provisioning/common/python3.ps1 → coin/provisioning/common/windows/python3.ps1 b/coin/provisioning/common/python3.ps1 → coin/provisioning/common/windows/python3.ps1
diff --git a/...ioning/common/set-network-test-server.ps1 → ...ommon/windows/set-network-test-server.ps1 b/...ioning/common/set-network-test-server.ps1 → ...ommon/windows/set-network-test-server.ps1
@@ -31,11 +31,11 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
 
 # This script will set the network test server IP in to hosts file
 
-$n = Get-Content "$PSScriptRoot\network_test_server_ip.txt"
+$n = Get-Content "$PSScriptRoot\..\network_test_server_ip.txt"
 $n = $n.Split('=')
 New-Variable -Name $n[0] -Value $n[1]
 

diff --git a/coin/provisioning/common/vc_redist.ps1 → ...provisioning/common/windows/vc_redist.ps1 b/coin/provisioning/common/vc_redist.ps1 → ...provisioning/common/windows/vc_redist.ps1
diff --git a/coin/provisioning/common/wsearch-off.ps1 → ...ovisioning/common/windows/wsearch-off.ps1 b/coin/provisioning/common/wsearch-off.ps1 → ...ovisioning/common/windows/wsearch-off.ps1
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh
@@ -35,7 +35,7 @@
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh"
+source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
 
 if [ "$proxy" != "" ]; then
     echo "proxy=$proxy" | sudo tee -a /etc/yum.conf

diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh
@@ -8,4 +8,4 @@ VERSION=$libclang_version
 URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z"
 SHA1="c7466109628418a6aa3db8b3f5825f847f1c4952"
 
-$BASEDIR/../common/libclang.sh "$URL" "$SHA1" "$VERSION"
+$BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION"
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
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -ex
 
-$(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/99-version.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh
@@ -44,4 +44,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-RHEL-7.4-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh
@@ -36,8 +36,8 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
+source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
 source $BASEDIR/../common/network_test_server_ip.txt
-source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh"
 
 echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
 echo "$network_test_server_ip    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts

diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh
@@ -35,7 +35,7 @@
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
+source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
 
 name="p7zip"
 version="7-11"

diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh
@@ -7,4 +7,4 @@ VERSION=$libclang_version
 URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
 SHA1="bbdbbc0296f42310077539b7247d285386119ef4"
 
-$BASEDIR/../common/libclang.sh "$URL" "$SHA1" "$VERSION"
+$BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh
@@ -39,4 +39,4 @@ set -ex
 
 # CMake is needed for autotests that verify that Qt can be built with CMake
 
-source "${BASH_SOURCE%/*}/../common/cmake_linux.sh"
+source "${BASH_SOURCE%/*}/../common/linux/cmake_linux.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh
@@ -35,4 +35,4 @@
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/qnx_700.sh"
+source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh
@@ -35,4 +35,4 @@
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/integrity.sh"
+source "${BASH_SOURCE%/*}/../common/linux/integrity.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh
@@ -35,7 +35,7 @@
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
+source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
 
 packageEpel="epel-release-latest-7.noarch.rpm"
 OfficialUrl="https://dl.fedoraproject.org/pub/epel/$packageEpel"

diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh
@@ -35,4 +35,4 @@
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/disable_selinux.sh"
+source "${BASH_SOURCE%/*}/../common/linux/disable_selinux.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh
@@ -37,4 +37,4 @@ source /opt/rh/devtoolset-4/enable
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/openssl_for_android_linux.sh"
+source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh
@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/fbx_linux.sh
+$BASEDIR/../common/linux/fbx_linux.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh
@@ -35,4 +35,4 @@
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/android_linux.sh"
+source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh
@@ -35,12 +35,12 @@
 
 # This script modifies system settings for automated use
 
-# shellcheck source=../common/try_catch.sh
-
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/try_catch.sh"
-source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh"
+source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
+source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
+# shellcheck source=../common/unix/try_catch.sh
+source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
 
 NTS_IP=10.212.2.216
 

diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
@@ -37,7 +37,7 @@
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/try_catch.sh"
+source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
 
 ExceptionAPTUpdate=100
 ExceptionAPT=101

diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh
@@ -37,7 +37,7 @@
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
+source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
 
 echo "Installing Yocto toolchain for 32-bit b2qt..."
 

diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh
@@ -35,4 +35,4 @@
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/openssl_for_android_linux.sh"
+source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh
@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/fbx_linux.sh
+$BASEDIR/../common/linux/fbx_linux.sh
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh
@@ -35,4 +35,4 @@
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../common/android_linux.sh"
+source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh"