summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2017-11-02 16:09:11 +0200
committerFrederik Gladhorn <frederik.gladhorn@qt.io>2018-01-10 07:58:26 +0000
commit2a28ce864bed677e4ac2477eedf6bee498075d94 (patch)
tree8fe52c45bc62fd7185fccaa7f4b66baa544fa779
parent52da24b78eaac04b490b1d4a1750515284521423 (diff)
Split Common folder based on operating system families
This change will split common folder to four different folders: Linux, Unix, Windows and MacOS. Each of these folders includes scripts which are common for their operating system familes Task-number: QTQAINFRA-1451 Change-Id: Ic93b2183052335dee875d1452b21e38d268b6474 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
-rwxr-xr-xcoin/provisioning/common/linux/android_linux.sh (renamed from coin/provisioning/common/android_linux.sh)6
-rwxr-xr-xcoin/provisioning/common/linux/cmake_linux.sh (renamed from coin/provisioning/common/cmake_linux.sh)2
-rwxr-xr-xcoin/provisioning/common/linux/disable_selinux.sh (renamed from coin/provisioning/common/disable_selinux.sh)0
-rwxr-xr-xcoin/provisioning/common/linux/fbx_linux.sh (renamed from coin/provisioning/common/fbx_linux.sh)2
-rwxr-xr-xcoin/provisioning/common/linux/integrity.sh (renamed from coin/provisioning/common/integrity.sh)2
-rwxr-xr-xcoin/provisioning/common/linux/openssl_for_android_linux.sh (renamed from coin/provisioning/common/openssl_for_android_linux.sh)4
-rwxr-xr-xcoin/provisioning/common/linux/qnx_700.sh (renamed from coin/provisioning/common/qnx_700.sh)0
-rwxr-xr-xcoin/provisioning/common/linux/version.sh (renamed from coin/provisioning/common/version.sh)0
-rwxr-xr-xcoin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh (renamed from coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh)4
-rwxr-xr-xcoin/provisioning/common/macos/InstallPKGFromURL.sh (renamed from coin/provisioning/common/InstallPKGFromURL.sh)2
-rwxr-xr-xcoin/provisioning/common/macos/cmake.sh (renamed from coin/provisioning/common/cmake.sh)0
-rwxr-xr-xcoin/provisioning/common/macos/fbx_macos.sh (renamed from coin/provisioning/common/fbx_macos.sh)4
-rwxr-xr-xcoin/provisioning/common/macos/homebrew.sh (renamed from coin/provisioning/common/homebrew.sh)0
-rwxr-xr-xcoin/provisioning/common/macos/install-commandlinetools.sh (renamed from coin/provisioning/common/install-commandlinetools.sh)4
-rwxr-xr-xcoin/provisioning/common/macos/install_xcode.sh (renamed from coin/provisioning/common/install_xcode.sh)4
-rwxr-xr-xcoin/provisioning/common/macos/pip.sh (renamed from coin/provisioning/common/pip.sh)0
-rwxr-xr-xcoin/provisioning/common/macos/python3.sh (renamed from coin/provisioning/common/python3.sh)0
-rwxr-xr-xcoin/provisioning/common/macos/system_updates.sh (renamed from coin/provisioning/common/system_updates.sh)0
-rwxr-xr-xcoin/provisioning/common/macos/virtualenv.sh (renamed from coin/provisioning/common/virtualenv.sh)0
-rwxr-xr-xcoin/provisioning/common/unix/DownloadURL.sh (renamed from coin/provisioning/common/DownloadURL.sh)0
-rwxr-xr-xcoin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh (renamed from coin/provisioning/common/InstallFromCompressedFileFromURL.sh)0
-rwxr-xr-xcoin/provisioning/common/unix/check_and_set_proxy.sh (renamed from coin/provisioning/common/check_and_set_proxy.sh)0
-rw-r--r--coin/provisioning/common/unix/http_proxy.txt (renamed from coin/provisioning/common/http_proxy.txt)0
-rwxr-xr-xcoin/provisioning/common/unix/libclang.sh (renamed from coin/provisioning/common/libclang.sh)4
-rwxr-xr-xcoin/provisioning/common/unix/try_catch.sh (renamed from coin/provisioning/common/try_catch.sh)0
-rw-r--r--coin/provisioning/common/windows/03-conan.ps1 (renamed from coin/provisioning/common/03-conan.ps1)0
-rw-r--r--coin/provisioning/common/windows/3dstudio_3rdparty.ps1 (renamed from coin/provisioning/common/3dstudio_3rdparty.ps1)0
-rw-r--r--coin/provisioning/common/windows/allow-remote-desktop-access.ps1 (renamed from coin/provisioning/common/allow-remote-desktop-access.ps1)0
-rw-r--r--coin/provisioning/common/windows/cmake.ps1 (renamed from coin/provisioning/common/cmake.ps1)0
-rw-r--r--coin/provisioning/common/windows/conan_manifests/icu/57.1/annulen/stable/export/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/icu/57.1/annulen/stable/export/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/windows/conan_manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/export/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/export/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/970e773c5651dc2560f86200a4ea56c23f568ff9/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/970e773c5651dc2560f86200a4ea56c23f568ff9/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/c97b9e1abccf18d0aefcbcdef01d2c4689917df6/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/c97b9e1abccf18d0aefcbcdef01d2c4689917df6/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/3c9b592a3dd15507b8a6d90a8fcc34d2b4de2260/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/3c9b592a3dd15507b8a6d90a8fcc34d2b4de2260/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/61c4f21bb72fcb92afb46571ac7caaa967c09c5d/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/61c4f21bb72fcb92afb46571ac7caaa967c09c5d/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/8ec39b27fb5828ba512b3f2dafe88cc0962c29b9/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/8ec39b27fb5828ba512b3f2dafe88cc0962c29b9/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/e08083f0910e4ba3ae89c4298d94b672829af1fe/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/e08083f0910e4ba3ae89c4298d94b672829af1fe/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt (renamed from coin/provisioning/common/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt)0
-rw-r--r--coin/provisioning/common/windows/disable-ntp.ps1 (renamed from coin/provisioning/common/disable-ntp.ps1)0
-rw-r--r--coin/provisioning/common/windows/disable-sleep.ps1 (renamed from coin/provisioning/common/disable-sleep.ps1)0
-rw-r--r--coin/provisioning/common/windows/disable-uac.ps1 (renamed from coin/provisioning/common/disable-uac.ps1)0
-rw-r--r--coin/provisioning/common/windows/disable-windefender.ps1 (renamed from coin/provisioning/common/disable-windefender.ps1)0
-rw-r--r--coin/provisioning/common/windows/disable-windows-updates.ps1 (renamed from coin/provisioning/common/disable-windows-updates.ps1)0
-rw-r--r--coin/provisioning/common/windows/fbx_windows.ps1 (renamed from coin/provisioning/common/fbx_windows.ps1)0
-rw-r--r--coin/provisioning/common/windows/helpers.ps1 (renamed from coin/provisioning/common/helpers.ps1)0
-rw-r--r--coin/provisioning/common/windows/icu.ps1 (renamed from coin/provisioning/common/icu.ps1)0
-rw-r--r--coin/provisioning/common/windows/install-dependencywalker.ps1 (renamed from coin/provisioning/common/install-dependencywalker.ps1)2
-rw-r--r--coin/provisioning/common/windows/install-git.ps1 (renamed from coin/provisioning/common/install-git.ps1)2
-rw-r--r--coin/provisioning/common/windows/install-jdk.ps1 (renamed from coin/provisioning/common/install-jdk.ps1)2
-rw-r--r--coin/provisioning/common/windows/install-mingw.ps1 (renamed from coin/provisioning/common/install-mingw.ps1)2
-rw-r--r--coin/provisioning/common/windows/install-notepad++.ps1 (renamed from coin/provisioning/common/install-notepad++.ps1)2
-rw-r--r--coin/provisioning/common/windows/install-qnx660.ps1 (renamed from coin/provisioning/common/install-qnx660.ps1)0
-rw-r--r--coin/provisioning/common/windows/install-ruby.ps1 (renamed from coin/provisioning/common/install-ruby.ps1)2
-rw-r--r--coin/provisioning/common/windows/install-sevenzip.ps1 (renamed from coin/provisioning/common/install-sevenzip.ps1)2
-rw-r--r--coin/provisioning/common/windows/install-strawberry-perl.ps1 (renamed from coin/provisioning/common/install-strawberry-perl.ps1)2
-rw-r--r--coin/provisioning/common/windows/jom.ps1 (renamed from coin/provisioning/common/jom.ps1)0
-rw-r--r--coin/provisioning/common/windows/libclang.ps1 (renamed from coin/provisioning/common/libclang.ps1)4
-rw-r--r--coin/provisioning/common/windows/libusb.ps1 (renamed from coin/provisioning/common/libusb.ps1)0
-rw-r--r--coin/provisioning/common/windows/memorypershell.ps1 (renamed from coin/provisioning/common/memorypershell.ps1)0
-rw-r--r--coin/provisioning/common/windows/mesa_llvmpipe.ps1 (renamed from coin/provisioning/common/mesa_llvmpipe.ps1)2
-rw-r--r--coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 (renamed from coin/provisioning/common/msvc_2015_update3_patch.ps1)2
-rw-r--r--coin/provisioning/common/windows/mysql.ps1 (renamed from coin/provisioning/common/mysql.ps1)0
-rw-r--r--coin/provisioning/common/windows/ninja.ps1 (renamed from coin/provisioning/common/ninja.ps1)0
-rw-r--r--coin/provisioning/common/windows/openssl.ps1 (renamed from coin/provisioning/common/openssl.ps1)2
-rw-r--r--coin/provisioning/common/windows/patch_qnx.ps1 (renamed from coin/provisioning/common/patch_qnx.ps1)0
-rw-r--r--coin/provisioning/common/windows/postgresql.ps1 (renamed from coin/provisioning/common/postgresql.ps1)0
-rw-r--r--coin/provisioning/common/windows/python.ps1 (renamed from coin/provisioning/common/python.ps1)0
-rw-r--r--coin/provisioning/common/windows/python3.ps1 (renamed from coin/provisioning/common/python3.ps1)0
-rw-r--r--coin/provisioning/common/windows/set-network-test-server.ps1 (renamed from coin/provisioning/common/set-network-test-server.ps1)4
-rw-r--r--coin/provisioning/common/windows/vc_redist.ps1 (renamed from coin/provisioning/common/vc_redist.ps1)0
-rw-r--r--coin/provisioning/common/windows/wsearch-off.ps1 (renamed from coin/provisioning/common/wsearch-off.ps1)0
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh8
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh4
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh4
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/20-java.sh4
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh8
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh4
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh4
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/30-android.sh4
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh8
-rwxr-xr-xcoin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh2
-rwxr-xr-xcoin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh2
-rwxr-xr-xcoin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh2
-rwxr-xr-xcoin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh2
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/01-system_updates.sh2
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh4
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh4
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh8
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh2
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/25-cmake.sh2
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/25-homebrew.sh2
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh4
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh4
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh2
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh2
-rw-r--r--coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86/02-python.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86/03-conan.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86/06-ninja.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86/08-libclang.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86/08-python3.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86/10-icu.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86/60-jom.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86/70-cmake.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86/90-libusb.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/02-disable-sleep.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/02-python.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/03-conan.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/06-ninja.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/08-python3.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/09-openssl.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/10-icu.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/30-qnx660.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/60-jom.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/90-3dstudio_3rdparty.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/90-install-notepad++.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/90-mysql.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/90-postgresql.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/01-allow-remote-desktop-access.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/01-disable-uac.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/02-disable-ntp.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/02-disable-sleep.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/02-memorypershell.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/02-python.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/03-conan.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/03-install-sevenzip.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/04-disable-windows-updates.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/04-msys.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/07-vc_redist.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/08-install-git.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/08-install-jdk.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/08-mesa_llvmpipe.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/08-ninja.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/08-python3.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/09-cmake.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/09-install-dependencywalker.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/09-install-mingw530.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/09-install-ruby.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/09-install-strawberry-perl.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/09-jom.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/09-mysql.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/09-openssl.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/09-postgresql.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/09-set-network-test-server.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/10-icu.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/30-android.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/50-patch_qnx.ps12
-rw-r--r--coin/provisioning/qtci-windows-7-x86/90-install-notepad++.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/02-python.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/08-python3.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/10-icu.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/70-jom.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/01-disable-uac.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/02-python.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windows-updates.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/07-mesa_llvmpipe.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/08-install-git.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/08-libclang.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/09-install-ruby.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/09-install-strawberry-perl.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/09-mysql.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/09-openssl.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/09-postgresql.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/09-set-network-test-server.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/10-icu.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/60-cmake.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/70-jom.ps12
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/90-install-notepad++.ps12
282 files changed, 253 insertions, 253 deletions
diff --git a/coin/provisioning/common/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh
index c218ffe4..b4a412c8 100755
--- a/coin/provisioning/common/android_linux.sh
+++ b/coin/provisioning/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 b/coin/provisioning/common/linux/cmake_linux.sh
index 35313d3c..7aaa4cb4 100755
--- a/coin/provisioning/common/cmake_linux.sh
+++ b/coin/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 b/coin/provisioning/common/linux/disable_selinux.sh
index 30162166..30162166 100755
--- a/coin/provisioning/common/disable_selinux.sh
+++ b/coin/provisioning/common/linux/disable_selinux.sh
diff --git a/coin/provisioning/common/fbx_linux.sh b/coin/provisioning/common/linux/fbx_linux.sh
index 9827f9ab..0b587aed 100755
--- a/coin/provisioning/common/fbx_linux.sh
+++ b/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 b/coin/provisioning/common/linux/integrity.sh
index 6c96d9e0..0c7234b3 100755
--- a/coin/provisioning/common/integrity.sh
+++ b/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/coin/provisioning/common/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh
index 2ca38db9..cda41d72 100755
--- a/coin/provisioning/common/openssl_for_android_linux.sh
+++ b/coin/provisioning/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 b/coin/provisioning/common/linux/qnx_700.sh
index 73783468..73783468 100755
--- a/coin/provisioning/common/qnx_700.sh
+++ b/coin/provisioning/common/linux/qnx_700.sh
diff --git a/coin/provisioning/common/version.sh b/coin/provisioning/common/linux/version.sh
index ed24d805..ed24d805 100755
--- a/coin/provisioning/common/version.sh
+++ b/coin/provisioning/common/linux/version.sh
diff --git a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh b/coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh
index bb7f772f..4d2ba1f8 100755
--- a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh
+++ b/coin/provisioning/common/macos/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/coin/provisioning/common/InstallPKGFromURL.sh b/coin/provisioning/common/macos/InstallPKGFromURL.sh
index bf834e5d..881086ba 100755
--- a/coin/provisioning/common/InstallPKGFromURL.sh
+++ b/coin/provisioning/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 b/coin/provisioning/common/macos/cmake.sh
index c727c8ff..c727c8ff 100755
--- a/coin/provisioning/common/cmake.sh
+++ b/coin/provisioning/common/macos/cmake.sh
diff --git a/coin/provisioning/common/fbx_macos.sh b/coin/provisioning/common/macos/fbx_macos.sh
index 0f5e16a3..9dc97814 100755
--- a/coin/provisioning/common/fbx_macos.sh
+++ b/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 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 876d0b9c..d57e1d2f 100755
--- 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 5d8009e3..1fe611b3 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=../common/unix/try_catch.sh
+source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
function InstallXCode()
{
diff --git a/coin/provisioning/common/pip.sh b/coin/provisioning/common/macos/pip.sh
index c9af5fbc..c9af5fbc 100755
--- a/coin/provisioning/common/pip.sh
+++ b/coin/provisioning/common/macos/pip.sh
diff --git a/coin/provisioning/common/python3.sh b/coin/provisioning/common/macos/python3.sh
index fc20aa2d..fc20aa2d 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 0736d740..0736d740 100755
--- a/coin/provisioning/common/system_updates.sh
+++ b/coin/provisioning/common/macos/system_updates.sh
diff --git a/coin/provisioning/common/virtualenv.sh b/coin/provisioning/common/macos/virtualenv.sh
index b6a9a796..b6a9a796 100755
--- a/coin/provisioning/common/virtualenv.sh
+++ b/coin/provisioning/common/macos/virtualenv.sh
diff --git a/coin/provisioning/common/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh
index cb890e8a..cb890e8a 100755
--- 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 fb77b714..fb77b714 100755
--- a/coin/provisioning/common/InstallFromCompressedFileFromURL.sh
+++ b/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh
diff --git a/coin/provisioning/common/check_and_set_proxy.sh b/coin/provisioning/common/unix/check_and_set_proxy.sh
index 8dad878c..8dad878c 100755
--- a/coin/provisioning/common/check_and_set_proxy.sh
+++ b/coin/provisioning/common/unix/check_and_set_proxy.sh
diff --git a/coin/provisioning/common/http_proxy.txt b/coin/provisioning/common/unix/http_proxy.txt
index 3aa6ceba..3aa6ceba 100644
--- a/coin/provisioning/common/http_proxy.txt
+++ b/coin/provisioning/common/unix/http_proxy.txt
diff --git a/coin/provisioning/common/libclang.sh b/coin/provisioning/common/unix/libclang.sh
index ea33d62d..69d9ff96 100755
--- a/coin/provisioning/common/libclang.sh
+++ b/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 b/coin/provisioning/common/unix/try_catch.sh
index 560d040d..560d040d 100755
--- a/coin/provisioning/common/try_catch.sh
+++ b/coin/provisioning/common/unix/try_catch.sh
diff --git a/coin/provisioning/common/03-conan.ps1 b/coin/provisioning/common/windows/03-conan.ps1
index 2c9d9f8d..2c9d9f8d 100644
--- a/coin/provisioning/common/03-conan.ps1
+++ b/coin/provisioning/common/windows/03-conan.ps1
diff --git a/coin/provisioning/common/3dstudio_3rdparty.ps1 b/coin/provisioning/common/windows/3dstudio_3rdparty.ps1
index f9c8faa7..f9c8faa7 100644
--- a/coin/provisioning/common/3dstudio_3rdparty.ps1
+++ b/coin/provisioning/common/windows/3dstudio_3rdparty.ps1
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 d7e26556..d7e26556 100644
--- a/coin/provisioning/common/cmake.ps1
+++ b/coin/provisioning/common/windows/cmake.ps1
diff --git a/coin/provisioning/common/conan_manifests/icu/57.1/annulen/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/57.1/annulen/stable/export/conanmanifest.txt
index c61454b9..c61454b9 100644
--- a/coin/provisioning/common/conan_manifests/icu/57.1/annulen/stable/export/conanmanifest.txt
+++ b/coin/provisioning/common/windows/conan_manifests/icu/57.1/annulen/stable/export/conanmanifest.txt
diff --git a/coin/provisioning/common/conan_manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt
index ada3d009..ada3d009 100644
--- a/coin/provisioning/common/conan_manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt
+++ b/coin/provisioning/common/windows/conan_manifests/icu/57.1/annulen/stable/package/df887949b128f2725c575258bd175fe4d30ba476/conanmanifest.txt
diff --git a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/export/conanmanifest.txt
index b7d5c80b..b7d5c80b 100644
--- a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/export/conanmanifest.txt
+++ b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/export/conanmanifest.txt
diff --git a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/970e773c5651dc2560f86200a4ea56c23f568ff9/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/970e773c5651dc2560f86200a4ea56c23f568ff9/conanmanifest.txt
index 888563eb..888563eb 100644
--- a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/970e773c5651dc2560f86200a4ea56c23f568ff9/conanmanifest.txt
+++ b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/970e773c5651dc2560f86200a4ea56c23f568ff9/conanmanifest.txt
diff --git a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt
index 948bc2f1..948bc2f1 100644
--- a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt
+++ b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/c85f9b402dd4d46acdf074e1c63b768a41181d7a/conanmanifest.txt
diff --git a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/c97b9e1abccf18d0aefcbcdef01d2c4689917df6/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/c97b9e1abccf18d0aefcbcdef01d2c4689917df6/conanmanifest.txt
index e9b0ee71..e9b0ee71 100644
--- a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/c97b9e1abccf18d0aefcbcdef01d2c4689917df6/conanmanifest.txt
+++ b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/c97b9e1abccf18d0aefcbcdef01d2c4689917df6/conanmanifest.txt
diff --git a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt
index 905c0750..905c0750 100644
--- a/coin/provisioning/common/conan_manifests/icu/59.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt
+++ b/coin/provisioning/common/windows/conan_manifests/icu/59.1/vitallium/stable/package/ca0c09cfa678fd91b04c82824988c42e9ac40ddf/conanmanifest.txt
diff --git a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt
index c5714a18..c5714a18 100644
--- a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt
+++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/annulen/stable/export/conanmanifest.txt
diff --git a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt
index b68bca2b..b68bca2b 100644
--- a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt
+++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/annulen/stable/package/357fb491ae867cbbfe369d54132f4f21c3f13f7d/conanmanifest.txt
diff --git a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt
index 54a81a2e..54a81a2e 100644
--- a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt
+++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/export/conanmanifest.txt
diff --git a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/3c9b592a3dd15507b8a6d90a8fcc34d2b4de2260/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/3c9b592a3dd15507b8a6d90a8fcc34d2b4de2260/conanmanifest.txt
index 46e106f7..46e106f7 100644
--- a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/3c9b592a3dd15507b8a6d90a8fcc34d2b4de2260/conanmanifest.txt
+++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/3c9b592a3dd15507b8a6d90a8fcc34d2b4de2260/conanmanifest.txt
diff --git a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/61c4f21bb72fcb92afb46571ac7caaa967c09c5d/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/61c4f21bb72fcb92afb46571ac7caaa967c09c5d/conanmanifest.txt
index 5aded80c..5aded80c 100644
--- a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/61c4f21bb72fcb92afb46571ac7caaa967c09c5d/conanmanifest.txt
+++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/61c4f21bb72fcb92afb46571ac7caaa967c09c5d/conanmanifest.txt
diff --git a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/8ec39b27fb5828ba512b3f2dafe88cc0962c29b9/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/8ec39b27fb5828ba512b3f2dafe88cc0962c29b9/conanmanifest.txt
index e07078e6..e07078e6 100644
--- a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/8ec39b27fb5828ba512b3f2dafe88cc0962c29b9/conanmanifest.txt
+++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/8ec39b27fb5828ba512b3f2dafe88cc0962c29b9/conanmanifest.txt
diff --git a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/e08083f0910e4ba3ae89c4298d94b672829af1fe/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/e08083f0910e4ba3ae89c4298d94b672829af1fe/conanmanifest.txt
index 75b0084f..75b0084f 100644
--- a/coin/provisioning/common/conan_manifests/libxml2/2.9.4/vitallium/stable/package/e08083f0910e4ba3ae89c4298d94b672829af1fe/conanmanifest.txt
+++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.4/vitallium/stable/package/e08083f0910e4ba3ae89c4298d94b672829af1fe/conanmanifest.txt
diff --git a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt
index 73d392f3..73d392f3 100644
--- a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt
+++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/annulen/stable/export/conanmanifest.txt
diff --git a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt
index ead7f1ca..ead7f1ca 100644
--- a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt
+++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/annulen/stable/package/30620cba1eaf28add40f441a20f7d1be9a5c636c/conanmanifest.txt
diff --git a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt
index de2aa3a0..de2aa3a0 100644
--- a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt
+++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/export/conanmanifest.txt
diff --git a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt
index 0820b583..0820b583 100644
--- a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt
+++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/19663639a14063d996b277c7fac0e00264689c20/conanmanifest.txt
diff --git a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt
index 22a7c428..22a7c428 100644
--- a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt
+++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/466fc39fa8b7a19ee2095aa945fff98630acdd12/conanmanifest.txt
diff --git a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt
index 0501df3e..0501df3e 100644
--- a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt
+++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/8c83c725f7fefe466a2c6c18ff17d3b0b91202c6/conanmanifest.txt
diff --git a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt
index db328396..db328396 100644
--- a/coin/provisioning/common/conan_manifests/libxslt/1.1.29/vitallium/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt
+++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.29/vitallium/stable/package/f8cbe39e2f6584ea05b56c1f3dd9b0a99f522727/conanmanifest.txt
diff --git a/coin/provisioning/common/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt
index d7806e94..d7806e94 100644
--- a/coin/provisioning/common/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt
+++ b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt
diff --git a/coin/provisioning/common/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt
index 88b5c152..88b5c152 100644
--- a/coin/provisioning/common/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt
+++ b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/package/a990f14748d35a55b067140a0973ea7204f67350/conanmanifest.txt
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/fbx_windows.ps1 b/coin/provisioning/common/windows/fbx_windows.ps1
index 00de579d..00de579d 100644
--- a/coin/provisioning/common/fbx_windows.ps1
+++ b/coin/provisioning/common/windows/fbx_windows.ps1
diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1
index f6a9fd90..f6a9fd90 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 c08748d8..c08748d8 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-jdk.ps1 b/coin/provisioning/common/windows/install-jdk.ps1
index e4260deb..f6cf6a66 100644
--- a/coin/provisioning/common/install-jdk.ps1
+++ b/coin/provisioning/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 b/coin/provisioning/common/windows/install-mingw.ps1
index f835059a..9609336e 100644
--- a/coin/provisioning/common/install-mingw.ps1
+++ b/coin/provisioning/common/windows/install-mingw.ps1
@@ -31,7 +31,7 @@
##
############################################################################
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
function InstallMinGW
{
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 94e32b74..3a9aa0d2 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 5f19543f..e7e73e9c 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/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1
index a4a9c870..9d857051 100644
--- a/coin/provisioning/common/libclang.ps1
+++ b/coin/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 b/coin/provisioning/common/windows/libusb.ps1
index 38d8b8e6..38d8b8e6 100644
--- a/coin/provisioning/common/libusb.ps1
+++ b/coin/provisioning/common/windows/libusb.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 82333034..4a468e10 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 63088861..63088861 100644
--- a/coin/provisioning/common/mysql.ps1
+++ b/coin/provisioning/common/windows/mysql.ps1
diff --git a/coin/provisioning/common/ninja.ps1 b/coin/provisioning/common/windows/ninja.ps1
index 08bf2579..08bf2579 100644
--- a/coin/provisioning/common/ninja.ps1
+++ b/coin/provisioning/common/windows/ninja.ps1
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/patch_qnx.ps1 b/coin/provisioning/common/windows/patch_qnx.ps1
index 632859a0..632859a0 100644
--- a/coin/provisioning/common/patch_qnx.ps1
+++ b/coin/provisioning/common/windows/patch_qnx.ps1
diff --git a/coin/provisioning/common/postgresql.ps1 b/coin/provisioning/common/windows/postgresql.ps1
index ca47f078..ca47f078 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 316b567a..316b567a 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..69059a2a 100644
--- a/coin/provisioning/common/set-network-test-server.ps1
+++ b/coin/provisioning/common/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 b/coin/provisioning/common/windows/vc_redist.ps1
index 4a8376b6..4a8376b6 100644
--- a/coin/provisioning/common/vc_redist.ps1
+++ b/coin/provisioning/common/windows/vc_redist.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/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh
index 945d2e99..90b32d0d 100755
--- 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
index 5248f86f..b418ed8b 100755
--- 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
index 00b57918..572ad7ad 100755
--- 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
index fb3e9642..739d06b6 100755
--- 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
index 52ac3d6c..f8847e51 100755
--- 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
index bb97d390..d95f4f21 100755
--- 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
index bf2e1ce9..fa8d3a44 100755
--- 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
index 7ce3d514..9800229d 100755
--- 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
index c415db3a..970d80b1 100755
--- 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
index 4f3f4205..1710b878 100755
--- 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
index d5fe88c7..20e82868 100755
--- 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
index b3cca8f9..e4d2dc15 100755
--- 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
index 7ecc470d..b685362e 100755
--- 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
index 7e39935b..ca24a70e 100755
--- 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
index 19e41d46..ffe96d30 100755
--- 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
index f245c90c..60e637b7 100755
--- 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
index acf92779..ef2b14d0 100755
--- 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
index b3fea7df..ddb1d3dc 100755
--- 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
index 9937765a..0f89e72c 100755
--- 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
index 7e39935b..ca24a70e 100755
--- 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
index 5808a45c..6784335a 100755
--- 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"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh
index ddfc88a6..8f81a7dd 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh
@@ -1,5 +1,5 @@
#!/bin/bash
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/cmake_linux.sh
+$BASEDIR/../common/linux/cmake_linux.sh
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh
index eeb98b70..f419b7c1 100755
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh
@@ -4,7 +4,7 @@ set -ex
BASEDIR=$(dirname "$0")
source $BASEDIR/../common/network_test_server_ip.txt
-source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh"
+source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh
index f0e0f19c..65d3ad4b 100755
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-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-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-openSUSE-42.3-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh
index f1f2d5bd..2044310c 100755
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh
@@ -2,4 +2,4 @@
set -ex
-$(dirname $0)/../common/cmake_linux.sh
+$(dirname $0)/../common/linux/cmake_linux.sh
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh
index b5f370ab..e5a4208b 100755
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh
@@ -35,7 +35,7 @@
# This script install Intel Parallel Studio XE Composer Edition for C++ Linux
-source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
+source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
set -ex
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh
index dceb3bcc..20430d6a 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh
@@ -37,8 +37,8 @@ set -ex
# This script modified system settings for automated use
-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/try_catch.sh"
+# shellcheck source=../common/unix/try_catch.sh
+source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
VNCPassword=qt
NTS_IP=10.212.2.216
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh
index 6f5faee0..34202209 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh
@@ -39,8 +39,8 @@
set -ex
-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/InstallPKGFromURL.sh"
+# shellcheck source=../common/unix/try_catch.sh
+source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/XZ.pkg"
AltUrl="http://sourceforge.net/projects/macpkg/files/XZ/5.0.7/XZ.pkg"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh
index 39719bb8..66e4dfde 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh
@@ -39,8 +39,8 @@ set -ex
echo "Installing Java Development Kit"
-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/try_catch.sh"
+# shellcheck source=../common/unix/try_catch.sh
+source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
ExceptionDownloadPrimaryUrl=100
ExceptionDownloadAltUrl=101
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh
index f879d756..a0611154 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh
@@ -44,10 +44,10 @@
set -ex
-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/try_catch.sh"
+# shellcheck source=../common/unix/try_catch.sh
+source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
-# shellcheck source=../common/install_xcode.sh
-source "${BASH_SOURCE%/*}/../common/install_xcode.sh"
+# shellcheck source=../common/macos/install_xcode.sh
+source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"
InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_8.3.3.xz 8.3.3
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh
index 9801e99c..d534e74d 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh
@@ -35,7 +35,7 @@
set -ex
-source "${BASH_SOURCE%/*}/../common/install-commandlinetools.sh"
+source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
version="8.3.2"
packageName="CommandLineToolsforXcode$version.dmg"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh
index 3cdbd463..e5dd1910 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh
@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/cmake.sh
+$BASEDIR/../common/macos/cmake.sh
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh
index 9fb5d672..0ead5a58 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh
@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/homebrew.sh
+$BASEDIR/../common/macos/homebrew.sh
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh
index b37bb02d..b47f9705 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh
@@ -39,8 +39,8 @@
set -ex
-# shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh"
+# shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh
+source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/mysql-5.7.15-osx10.11-x86_64.tar.gz"
AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh
index 9e1df19a..69c6b318 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh
@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/pip.sh
+$BASEDIR/../common/macos/pip.sh
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh
index c9e9c842..8f3f85ec 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh
@@ -39,8 +39,8 @@
set -ex
-# shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh"
+# shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh
+source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh"
psqlVersion="9.6.0"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh
index b18e4923..92b05bf3 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
set -ex
-source "${BASH_SOURCE%/*}/../common/python3.sh"
+source "${BASH_SOURCE%/*}/../common/macos/python3.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh
index 8cdb7108..a35d26ca 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh
@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/virtualenv.sh
+$BASEDIR/../common/macos/virtualenv.sh
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh b/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh
index 2a8a90c3..fea11e01 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh
@@ -4,4 +4,4 @@ set -ex
BASEDIR=$(dirname "$0")
# There is only one mac package and common script uses it as a default
-$BASEDIR/../common/libclang.sh
+$BASEDIR/../common/unix/libclang.sh
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh
index 9c754dbf..b6e731f2 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh
@@ -39,8 +39,8 @@
set -ex
-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/try_catch.sh"
+# shellcheck source=../common/unix/try_catch.sh
+source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
targetFolder="/opt/android"
sdkTargetFolder="$targetFolder/sdk"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh b/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh
index acefd8b7..9ce5d9ff 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh
@@ -3,5 +3,5 @@
set -ex
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/fbx_macos.sh
+$BASEDIR/../common/macos/fbx_macos.sh
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh
index 503a4c07..ccff42c3 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh
@@ -37,10 +37,10 @@
set -ex
-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/try_catch.sh"
-# shellcheck source=../common/InstallFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
+# shellcheck source=../common/unix/try_catch.sh
+source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
+# shellcheck source=../common/unix/InstallFromCompressedFileFromURL.sh
+source "${BASH_SOURCE%/*}/../common/unix/InstallFromCompressedFileFromURL.sh"
opensslVersion="1.0.2k"
opensslFile="openssl-$opensslVersion.tar.gz"
diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh b/coin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh
index a1ab3a92..94b53309 100755
--- a/coin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh
@@ -3,4 +3,4 @@
set -ex
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/04-cmake.sh b/coin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh
index 3cdbd463..e5dd1910 100755
--- a/coin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh
@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/cmake.sh
+$BASEDIR/../common/macos/cmake.sh
diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh b/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh
index 2a8a90c3..fea11e01 100755
--- a/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh
@@ -4,4 +4,4 @@ set -ex
BASEDIR=$(dirname "$0")
# There is only one mac package and common script uses it as a default
-$BASEDIR/../common/libclang.sh
+$BASEDIR/../common/unix/libclang.sh
diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh b/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh
index b18e4923..92b05bf3 100755
--- a/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
set -ex
-source "${BASH_SOURCE%/*}/../common/python3.sh"
+source "${BASH_SOURCE%/*}/../common/macos/python3.sh"
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/01-system_updates.sh b/coin/provisioning/qtci-osx-10.11-x86_64/01-system_updates.sh
index a1ab3a92..94b53309 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/01-system_updates.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/01-system_updates.sh
@@ -3,4 +3,4 @@
set -ex
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/05-systemsetup.sh b/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh
index 0e39a958..5cb067a7 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh
@@ -37,8 +37,8 @@
set -ex
-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/try_catch.sh"
+# shellcheck source=../common/unix/try_catch.sh
+source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
VNCPassword=qt
NTS_IP=10.212.2.216
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh b/coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh
index 314a0d24..9f66cc66 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh
@@ -39,8 +39,8 @@
set -ex
-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/InstallPKGFromURL.sh"
+# shellcheck source=../common/unix/try_catch.sh
+source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/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/20-xcode.sh b/coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh
index 779a525e..b1e1d657 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh
@@ -44,10 +44,10 @@
set -ex
-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/try_catch.sh"
+# shellcheck source=../common/unix/try_catch.sh
+source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
-# shellcheck source=../common/install_xcode.sh
-source "${BASH_SOURCE%/*}/../common/install_xcode.sh"
+# shellcheck source=../common/macos/install_xcode.sh
+source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"
InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_8.2.xz 8.2
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh
index a8f7cca1..cb7dcfc6 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh
@@ -35,7 +35,7 @@
set -ex
-source "${BASH_SOURCE%/*}/../common/install-commandlinetools.sh"
+source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
version="8.2"
packageName="Command_Line_Tools_macOS_10.11_for_Xcode_$version.dmg"
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/25-cmake.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-cmake.sh
index 3cdbd463..e5dd1910 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/25-cmake.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-cmake.sh
@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/cmake.sh
+$BASEDIR/../common/macos/cmake.sh
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/25-homebrew.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-homebrew.sh
index 9fb5d672..0ead5a58 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/25-homebrew.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-homebrew.sh
@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/homebrew.sh
+$BASEDIR/../common/macos/homebrew.sh
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh
index 17bb0df3..89534baf 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh
@@ -39,8 +39,8 @@
set -ex
-# shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh"
+# shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh
+source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/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/25-postgresql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh
index f71225f5..8d88630b 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh
@@ -39,8 +39,8 @@
set -ex
-# shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh"
+# shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh
+source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/Postgres-9.6.0.zip"
AltUrl="https://github.com/PostgresApp/PostgresApp/releases/download/9.6.0/Postgres-9.6.0.zip"
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh
index b18e4923..92b05bf3 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
set -ex
-source "${BASH_SOURCE%/*}/../common/python3.sh"
+source "${BASH_SOURCE%/*}/../common/macos/python3.sh"
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh b/coin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh
index 2a8a90c3..fea11e01 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh
@@ -4,4 +4,4 @@ set -ex
BASEDIR=$(dirname "$0")
# There is only one mac package and common script uses it as a default
-$BASEDIR/../common/libclang.sh
+$BASEDIR/../common/unix/libclang.sh
diff --git a/coin/provisioning/qtci-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/02-python.ps1 b/coin/provisioning/qtci-windows-10-x86/02-python.ps1
index 27c618e1..19e64a94 100644
--- a/coin/provisioning/qtci-windows-10-x86/02-python.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/02-python.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\python.ps1" 32
+. "$PSScriptRoot\..\common\windows\python.ps1" 32
diff --git a/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86/03-conan.ps1
index 2fc36311..75c6a232 100644
--- a/coin/provisioning/qtci-windows-10-x86/03-conan.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/03-conan.ps1
@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\common\03-conan.ps1"
+. "$PSScriptRoot\..\common\windows\03-conan.ps1"
Run-Conan-Install `
-ConanfilesDir "$PSScriptRoot\conanfiles" `
diff --git a/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1
index f92acd91..8f94b3d5 100644
--- a/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1
+++ b/coin/provisioning/qtci-windows-10-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-10-x86/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1
index 167cfd35..eed6b734 100644
--- a/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1
+++ b/coin/provisioning/qtci-windows-10-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-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/06-ninja.ps1 b/coin/provisioning/qtci-windows-10-x86/06-ninja.ps1
index e46361a0..ba571a1e 100644
--- a/coin/provisioning/qtci-windows-10-x86/06-ninja.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/06-ninja.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\ninja.ps1"
+. "$PSScriptRoot\..\common\windows\ninja.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1
index cc8be923..3ad5b9fd 100644
--- a/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\libclang.ps1" 32
+. "$PSScriptRoot\..\common\windows\libclang.ps1" 32
diff --git a/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 b/coin/provisioning/qtci-windows-10-x86/08-python3.ps1
index 164fbe43..28299307 100644
--- a/coin/provisioning/qtci-windows-10-x86/08-python3.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/08-python3.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\python3.ps1" 32
+. "$PSScriptRoot\..\common\windows\python3.ps1" 32
diff --git a/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1
index 0d28ea1e..875b426f 100644
--- a/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1
+++ b/coin/provisioning/qtci-windows-10-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-10-x86/10-icu.ps1 b/coin/provisioning/qtci-windows-10-x86/10-icu.ps1
index 325be36a..074a7a6d 100644
--- a/coin/provisioning/qtci-windows-10-x86/10-icu.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/10-icu.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\icu.ps1"
+. "$PSScriptRoot\..\common\windows\icu.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1
index 37af7119..fe1aec7d 100644
--- a/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/10-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/60-jom.ps1 b/coin/provisioning/qtci-windows-10-x86/60-jom.ps1
index 842c65dd..b246ce25 100644
--- a/coin/provisioning/qtci-windows-10-x86/60-jom.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/60-jom.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\jom.ps1"
+. "$PSScriptRoot\..\common\windows\jom.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 b/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1
index 8dbe0372..73dc7bc2 100644
--- a/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\cmake.ps1"
+. "$PSScriptRoot\..\common\windows\cmake.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 b/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1
index a853ffef..29a1cfa4 100644
--- a/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\libusb.ps1"
+. "$PSScriptRoot\..\common\windows\libusb.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-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1
index f92acd91..8f94b3d5 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/01-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/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-disable-sleep.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-sleep.ps1
index ae3f327d..5bf811ef 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/02-disable-sleep.ps1
+++ b/coin/provisioning/qtci-windows-10-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-10-x86_64/02-python.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-python.ps1
index 44c1c5ff..e2e9be9c 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/02-python.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/02-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/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1
index 65aee221..c2068666 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1
@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\common\03-conan.ps1"
+. "$PSScriptRoot\..\common\windows\03-conan.ps1"
Run-Conan-Install `
-ConanfilesDir "$PSScriptRoot\conanfiles" `
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/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1
index c19bf6cd..57428310 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/04-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/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
index 3ffe1a06..18ce0581 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
@@ -31,7 +31,7 @@
##
#############################################################################
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
# This script installs QNX SDP 7.0
diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1
index 167cfd35..eed6b734 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1
+++ b/coin/provisioning/qtci-windows-10-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-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/06-ninja.ps1 b/coin/provisioning/qtci-windows-10-x86_64/06-ninja.ps1
index e46361a0..ba571a1e 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/06-ninja.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/06-ninja.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\ninja.ps1"
+. "$PSScriptRoot\..\common\windows\ninja.ps1"
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-jdk.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps1
index 3b64ffec..15065b55 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-jdk.ps1"
+. "$PSScriptRoot\..\common\windows\install-jdk.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1
index 7eeb0a37..b6e3582c 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\libclang.ps1" 64
+. "$PSScriptRoot\..\common\windows\libclang.ps1" 64
diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1
index b0c21996..3201032d 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\python3.ps1" 64
+. "$PSScriptRoot\..\common\windows\python3.ps1" 64
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 7c4cd8ac..684816f0 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 e11f2310..27612c49 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-openssl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-openssl.ps1
index f3906f78..d57ad1cd 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/09-openssl.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-openssl.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\openssl.ps1"
+. "$PSScriptRoot\..\common\windows\openssl.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/10-icu.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-icu.ps1
index 325be36a..074a7a6d 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/10-icu.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/10-icu.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\icu.ps1"
+. "$PSScriptRoot\..\common\windows\icu.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1
index 37af7119..fe1aec7d 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/10-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/30-fbx.ps1 b/coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps1
index 82cee080..468b0433 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\fbx_windows.ps1"
+. "$PSScriptRoot\..\common\windows\fbx_windows.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/30-qnx660.ps1 b/coin/provisioning/qtci-windows-10-x86_64/30-qnx660.ps1
index 39627626..2a71fd55 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/30-qnx660.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/30-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/50-patch_qnx.ps1 b/coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1
index 41210dcb..de486c97 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\patch_qnx.ps1"
+. "$PSScriptRoot\..\common\windows\patch_qnx.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/60-jom.ps1 b/coin/provisioning/qtci-windows-10-x86_64/60-jom.ps1
index 842c65dd..b246ce25 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/60-jom.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/60-jom.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\jom.ps1"
+. "$PSScriptRoot\..\common\windows\jom.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps1 b/coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps1
index 8dbe0372..73dc7bc2 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\cmake.ps1"
+. "$PSScriptRoot\..\common\windows\cmake.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-3dstudio_3rdparty.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-3dstudio_3rdparty.ps1
index 3bc58072..114f52f9 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/90-3dstudio_3rdparty.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-3dstudio_3rdparty.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\3dstudio_3rdparty.ps1"
+. "$PSScriptRoot\..\common\windows\3dstudio_3rdparty.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-install-notepad++.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-notepad++.ps1
index 1f26c731..455d92bf 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/90-install-notepad++.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-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/90-install-virtualbox.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1
index 4d09becf..298375a3 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1
@@ -31,7 +31,7 @@
##
#############################################################################
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
# This script will install VirtualBox
diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1
index a853ffef..29a1cfa4 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\libusb.ps1"
+. "$PSScriptRoot\..\common\windows\libusb.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-mysql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-mysql.ps1
index f6902153..864a79a5 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/90-mysql.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-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/90-postgresql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-postgresql.ps1
index c1d8e13e..0e0d87be 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/90-postgresql.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-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/90-signing-tools.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1
index 882bd1de..7d01edac 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1
@@ -32,7 +32,7 @@
##
#############################################################################
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
# Signing tools are needed to sign offline installers when releasing
diff --git a/coin/provisioning/qtci-windows-7-x86/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-7-x86/01-allow-remote-desktop-access.ps1
index e8e24995..af05e838 100644
--- a/coin/provisioning/qtci-windows-7-x86/01-allow-remote-desktop-access.ps1
+++ b/coin/provisioning/qtci-windows-7-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-7-x86/01-disable-uac.ps1 b/coin/provisioning/qtci-windows-7-x86/01-disable-uac.ps1
index 2303699c..51eb0b2b 100644
--- a/coin/provisioning/qtci-windows-7-x86/01-disable-uac.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/01-disable-uac.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\disable-uac.ps1"
+. "$PSScriptRoot\..\common\windows\disable-uac.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-disable-sleep.ps1 b/coin/provisioning/qtci-windows-7-x86/02-disable-sleep.ps1
index ae3f327d..5bf811ef 100644
--- a/coin/provisioning/qtci-windows-7-x86/02-disable-sleep.ps1
+++ b/coin/provisioning/qtci-windows-7-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-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/02-python.ps1 b/coin/provisioning/qtci-windows-7-x86/02-python.ps1
index 27c618e1..19e64a94 100644
--- a/coin/provisioning/qtci-windows-7-x86/02-python.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/02-python.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\python.ps1" 32
+. "$PSScriptRoot\..\common\windows\python.ps1" 32
diff --git a/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 b/coin/provisioning/qtci-windows-7-x86/03-conan.ps1
index 163739fa..807e5480 100644
--- a/coin/provisioning/qtci-windows-7-x86/03-conan.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/03-conan.ps1
@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\common\03-conan.ps1"
+. "$PSScriptRoot\..\common\windows\03-conan.ps1"
Run-Conan-Install `
-ConanfilesDir "$PSScriptRoot\conanfiles" `
diff --git a/coin/provisioning/qtci-windows-7-x86/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-7-x86/03-install-sevenzip.ps1
index ee3f36a9..a9044256 100644
--- a/coin/provisioning/qtci-windows-7-x86/03-install-sevenzip.ps1
+++ b/coin/provisioning/qtci-windows-7-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-7-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1
index f92acd91..8f94b3d5 100644
--- a/coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1
+++ b/coin/provisioning/qtci-windows-7-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-7-x86/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-7-x86/04-disable-windows-updates.ps1
index c19bf6cd..57428310 100644
--- a/coin/provisioning/qtci-windows-7-x86/04-disable-windows-updates.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/04-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-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/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1
index 167cfd35..eed6b734 100644
--- a/coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1
+++ b/coin/provisioning/qtci-windows-7-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-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-install-git.ps1 b/coin/provisioning/qtci-windows-7-x86/08-install-git.ps1
index f9129cff..38106de7 100644
--- a/coin/provisioning/qtci-windows-7-x86/08-install-git.ps1
+++ b/coin/provisioning/qtci-windows-7-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-7-x86/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-7-x86/08-install-jdk.ps1
index 3b64ffec..15065b55 100644
--- a/coin/provisioning/qtci-windows-7-x86/08-install-jdk.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/08-install-jdk.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-jdk.ps1"
+. "$PSScriptRoot\..\common\windows\install-jdk.ps1"
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/08-ninja.ps1 b/coin/provisioning/qtci-windows-7-x86/08-ninja.ps1
index e46361a0..ba571a1e 100644
--- a/coin/provisioning/qtci-windows-7-x86/08-ninja.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/08-ninja.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\ninja.ps1"
+. "$PSScriptRoot\..\common\windows\ninja.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/08-python3.ps1 b/coin/provisioning/qtci-windows-7-x86/08-python3.ps1
index 164fbe43..28299307 100644
--- a/coin/provisioning/qtci-windows-7-x86/08-python3.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/08-python3.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\python3.ps1" 32
+. "$PSScriptRoot\..\common\windows\python3.ps1" 32
diff --git a/coin/provisioning/qtci-windows-7-x86/09-cmake.ps1 b/coin/provisioning/qtci-windows-7-x86/09-cmake.ps1
index 8dbe0372..73dc7bc2 100644
--- a/coin/provisioning/qtci-windows-7-x86/09-cmake.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/09-cmake.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\cmake.ps1"
+. "$PSScriptRoot\..\common\windows\cmake.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-7-x86/09-install-dependencywalker.ps1
index 8d549455..331de489 100644
--- a/coin/provisioning/qtci-windows-7-x86/09-install-dependencywalker.ps1
+++ b/coin/provisioning/qtci-windows-7-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-7-x86/09-install-mingw530.ps1 b/coin/provisioning/qtci-windows-7-x86/09-install-mingw530.ps1
index 7c4cd8ac..684816f0 100644
--- a/coin/provisioning/qtci-windows-7-x86/09-install-mingw530.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/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-7-x86/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-7-x86/09-install-ruby.ps1
index 0d28ea1e..875b426f 100644
--- a/coin/provisioning/qtci-windows-7-x86/09-install-ruby.ps1
+++ b/coin/provisioning/qtci-windows-7-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-7-x86/09-install-strawberry-perl.ps1 b/coin/provisioning/qtci-windows-7-x86/09-install-strawberry-perl.ps1
index 18109622..2b5756be 100644
--- a/coin/provisioning/qtci-windows-7-x86/09-install-strawberry-perl.ps1
+++ b/coin/provisioning/qtci-windows-7-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-7-x86/09-jom.ps1 b/coin/provisioning/qtci-windows-7-x86/09-jom.ps1
index 842c65dd..b246ce25 100644
--- a/coin/provisioning/qtci-windows-7-x86/09-jom.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/09-jom.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\jom.ps1"
+. "$PSScriptRoot\..\common\windows\jom.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/09-mysql.ps1 b/coin/provisioning/qtci-windows-7-x86/09-mysql.ps1
index a41035da..eca19011 100644
--- a/coin/provisioning/qtci-windows-7-x86/09-mysql.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/09-mysql.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\mysql.ps1"
+. "$PSScriptRoot\..\common\windows\mysql.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1
index f3906f78..d57ad1cd 100644
--- a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\openssl.ps1"
+. "$PSScriptRoot\..\common\windows\openssl.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/09-postgresql.ps1 b/coin/provisioning/qtci-windows-7-x86/09-postgresql.ps1
index 92339a45..451d2452 100644
--- a/coin/provisioning/qtci-windows-7-x86/09-postgresql.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/09-postgresql.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\postgresql.ps1"
+. "$PSScriptRoot\..\common\windows\postgresql.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/09-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-7-x86/09-set-network-test-server.ps1
index 16d2e180..7918fabf 100644
--- a/coin/provisioning/qtci-windows-7-x86/09-set-network-test-server.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/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-7-x86/10-dxsdk.ps1 b/coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1
index ba194de6..6fea9693 100644
--- a/coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1
@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
# This script installs DirectX SDK
diff --git a/coin/provisioning/qtci-windows-7-x86/10-icu.ps1 b/coin/provisioning/qtci-windows-7-x86/10-icu.ps1
index 325be36a..074a7a6d 100644
--- a/coin/provisioning/qtci-windows-7-x86/10-icu.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/10-icu.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\icu.ps1"
+. "$PSScriptRoot\..\common\windows\icu.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/30-android.ps1 b/coin/provisioning/qtci-windows-7-x86/30-android.ps1
index f355a5de..3568c681 100644
--- a/coin/provisioning/qtci-windows-7-x86/30-android.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/30-android.ps1
@@ -31,7 +31,7 @@
##
#############################################################################
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
# This script installs Android sdk and ndk
# It also runs update for SDK API level 21, latest SDK tools, latest platform-tools and build-tools version $sdkBuildToolsVersion
diff --git a/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1
index 4f2b74eb..a38272a6 100644
--- a/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1
@@ -33,7 +33,7 @@
# Requires: 7z, perl and msys
-. "$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/50-patch_qnx.ps1 b/coin/provisioning/qtci-windows-7-x86/50-patch_qnx.ps1
index 41210dcb..de486c97 100644
--- a/coin/provisioning/qtci-windows-7-x86/50-patch_qnx.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/50-patch_qnx.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\patch_qnx.ps1"
+. "$PSScriptRoot\..\common\windows\patch_qnx.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/90-install-notepad++.ps1 b/coin/provisioning/qtci-windows-7-x86/90-install-notepad++.ps1
index 1f26c731..455d92bf 100644
--- a/coin/provisioning/qtci-windows-7-x86/90-install-notepad++.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/90-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/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/01-disable-uac.ps1 b/coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1
index 2303699c..51eb0b2b 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/01-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/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-python.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-python.ps1
index 44c1c5ff..e2e9be9c 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/02-python.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/02-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/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/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1
index c19bf6cd..57428310 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/04-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/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/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-jdk.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1
index 3b64ffec..15065b55 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-jdk.ps1"
+. "$PSScriptRoot\..\common\windows\install-jdk.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps1
index cc8be923..3ad5b9fd 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\libclang.ps1" 32
+. "$PSScriptRoot\..\common\windows\libclang.ps1" 32
diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1
index 164fbe43..28299307 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/08-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/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-msvc-2013-update5.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1
index 8540c67d..202d072d 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/09-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/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-openssl.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1
index f3906f78..d57ad1cd 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\openssl.ps1"
+. "$PSScriptRoot\..\common\windows\openssl.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/09-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1
index 16d2e180..7918fabf 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/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-8.1-x86/10-icu.ps1 b/coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1
index 325be36a..074a7a6d 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\icu.ps1"
+. "$PSScriptRoot\..\common\windows\icu.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1 b/coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1
index 8dbe0372..73dc7bc2 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\cmake.ps1"
+. "$PSScriptRoot\..\common\windows\cmake.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1
index 842c65dd..b246ce25 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\jom.ps1"
+. "$PSScriptRoot\..\common\windows\jom.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1 b/coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1
index 1f26c731..455d92bf 100644
--- a/coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/90-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/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/01-disable-uac.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/01-disable-uac.ps1
index 2303699c..51eb0b2b 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/01-disable-uac.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/01-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/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-python.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/02-python.ps1
index 44c1c5ff..e2e9be9c 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/02-python.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/02-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/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/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windows-updates.ps1
index c19bf6cd..57428310 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windows-updates.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/04-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/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/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-jdk.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps1
index 3b64ffec..15065b55 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-jdk.ps1"
+. "$PSScriptRoot\..\common\windows\install-jdk.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-libclang.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-libclang.ps1
index 7eeb0a37..b6e3582c 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/08-libclang.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-libclang.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\libclang.ps1" 64
+. "$PSScriptRoot\..\common\windows\libclang.ps1" 64
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1
index 8540c67d..202d072d 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-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/08-python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1
index b0c21996..3201032d 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\python3.ps1" 64
+. "$PSScriptRoot\..\common\windows\python3.ps1" 64
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-openssl.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-openssl.ps1
index f3906f78..d57ad1cd 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/09-openssl.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/09-openssl.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\openssl.ps1"
+. "$PSScriptRoot\..\common\windows\openssl.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/09-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-set-network-test-server.ps1
index 16d2e180..7918fabf 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/09-set-network-test-server.ps1
+++ b/coin/provisioning/qtci-windows-8.1-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-8.1-x86_64/10-icu.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/10-icu.ps1
index 325be36a..074a7a6d 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/10-icu.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/10-icu.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\icu.ps1"
+. "$PSScriptRoot\..\common\windows\icu.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/60-cmake.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/60-cmake.ps1
index 8dbe0372..73dc7bc2 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/60-cmake.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/60-cmake.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\cmake.ps1"
+. "$PSScriptRoot\..\common\windows\cmake.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/70-jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/70-jom.ps1
index 842c65dd..b246ce25 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/70-jom.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/70-jom.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\jom.ps1"
+. "$PSScriptRoot\..\common\windows\jom.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/90-install-notepad++.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/90-install-notepad++.ps1
index 1f26c731..455d92bf 100644
--- a/coin/provisioning/qtci-windows-8.1-x86_64/90-install-notepad++.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/90-install-notepad++.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-notepad++.ps1"
+. "$PSScriptRoot\..\common\windows\install-notepad++.ps1"