aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/common
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 /coin/provisioning/common
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>
Diffstat (limited to 'coin/provisioning/common')
-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
85 files changed, 34 insertions, 34 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