summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-01-12 12:51:53 +0100
committerLiang Qi <liang.qi@qt.io>2018-01-12 21:13:56 +0100
commitc2d188f225a96ccf409f4dbebd19f6e59caf7da6 (patch)
tree35d0320171ad60a4e25c41f0718d02016dfd4242
parentab25cb7af6602a558c84e3d30e8ce1c6e7ca6e73 (diff)
parent19872ea84352182ee974ff84d2e3872a21427117 (diff)
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt Task-number: QTBUG-65688 Change-Id: I17a303731dab4b967c9ef8a852ee0c1097b88f10
-rw-r--r--coin/platform_configs/default.txt20
-rw-r--r--coin/platform_configs/qt5.txt2
-rw-r--r--coin/platform_configs/qtbase.txt4
-rw-r--r--coin/platform_configs/qtdeclarative.txt4
-rw-r--r--coin/platform_configs/qtwebkit.txt2
-rw-r--r--coin/provisioning/common/icu.ps189
-rwxr-xr-x[-rw-r--r--]coin/provisioning/common/linux/android_linux.sh (renamed from coin/provisioning/common/android_linux.sh)21
-rwxr-xr-xcoin/provisioning/common/linux/cmake_linux.sh (renamed from coin/provisioning/common/cmake_linux.sh)10
-rwxr-xr-x[-rw-r--r--]coin/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)4
-rwxr-xr-xcoin/provisioning/common/linux/integrity.sh (renamed from coin/provisioning/common/integrity.sh)4
-rwxr-xr-x[-rw-r--r--]coin/provisioning/common/linux/openssl_for_android_linux.sh (renamed from coin/provisioning/common/openssl_for_android_linux.sh)6
-rwxr-xr-x[-rw-r--r--]coin/provisioning/common/linux/qnx_700.sh (renamed from coin/provisioning/common/qnx_700.sh)2
-rwxr-xr-xcoin/provisioning/common/linux/version.sh (renamed from coin/provisioning/common/version.sh)2
-rwxr-xr-x[-rw-r--r--]coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh (renamed from coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh)6
-rwxr-xr-x[-rw-r--r--]coin/provisioning/common/macos/InstallPKGFromURL.sh (renamed from coin/provisioning/common/InstallPKGFromURL.sh)4
-rwxr-xr-xcoin/provisioning/common/macos/cmake.sh (renamed from coin/provisioning/common/cmake.sh)2
-rwxr-xr-xcoin/provisioning/common/macos/fbx_macos.sh (renamed from coin/provisioning/common/fbx_macos.sh)6
-rwxr-xr-xcoin/provisioning/common/macos/homebrew.sh (renamed from coin/provisioning/common/homebrew.sh)0
-rwxr-xr-x[-rw-r--r--]coin/provisioning/common/macos/install-commandlinetools.sh (renamed from coin/provisioning/common/install-commandlinetools.sh)6
-rwxr-xr-xcoin/provisioning/common/macos/install_xcode.sh (renamed from coin/provisioning/common/install_xcode.sh)6
-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)2
-rwxr-xr-xcoin/provisioning/common/macos/system_updates.sh (renamed from coin/provisioning/common/system_updates.sh)2
-rwxr-xr-xcoin/provisioning/common/macos/virtualenv.sh (renamed from coin/provisioning/common/virtualenv.sh)0
-rw-r--r--coin/provisioning/common/ruby.ps17
-rwxr-xr-x[-rw-r--r--]coin/provisioning/common/unix/DownloadURL.sh (renamed from coin/provisioning/common/DownloadURL.sh)2
-rwxr-xr-x[-rw-r--r--]coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh (renamed from coin/provisioning/common/InstallFromCompressedFileFromURL.sh)2
-rwxr-xr-xcoin/provisioning/common/unix/check_and_set_proxy.sh50
-rw-r--r--coin/provisioning/common/unix/http_proxy.txt2
-rwxr-xr-xcoin/provisioning/common/unix/libclang.sh (renamed from coin/provisioning/common/libclang.sh)4
-rw-r--r--coin/provisioning/common/unix/mqtt_broker.sh (renamed from coin/provisioning/common/mqtt_broker.sh)4
-rwxr-xr-x[-rw-r--r--]coin/provisioning/common/unix/try_catch.sh (renamed from coin/provisioning/common/try_catch.sh)2
-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.ps145
-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-ruby.ps1 (renamed from coin/provisioning/common/install-ruby.ps1)16
-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/mqtt_broker.ps1 (renamed from coin/provisioning/common/mqtt_broker.ps1)0
-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/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/vulkansdk.ps1 (renamed from coin/provisioning/common/vulkansdk.ps1)2
-rw-r--r--coin/provisioning/common/windows/winrtrunner.ps1 (renamed from coin/provisioning/common/winrtrunner.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.sh42
-rwxr-xr-x[-rw-r--r--]coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh4
-rwxr-xr-x[-rw-r--r--]coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh4
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh4
-rwxr-xr-x[-rw-r--r--]coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh4
-rwxr-xr-x[-rw-r--r--]coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh5
-rwxr-xr-x[-rw-r--r--]coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh (renamed from coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh)5
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/mqtt_broker.sh)4
-rwxr-xr-x[-rw-r--r--]coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh (renamed from coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh)2
-rwxr-xr-x[-rw-r--r--]coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh (renamed from coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh)7
-rw-r--r--coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh120
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh)4
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-systemsetup.sh)9
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh38
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh)4
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh)7
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh)7
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/040-android_linux.sh36
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-libclang.sh)3
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/006-cmake.sh)6
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh38
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh38
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh6
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh38
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh)7
-rwxr-xr-x[-rw-r--r--]coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/mqtt_broker.sh)4
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh6
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-install_icu.sh)2
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh38
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh)25
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh)110
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh)0
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/030-fbx.sh4
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/005-libclang.sh)2
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh)6
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/008-integrity.sh)4
-rwxr-xr-x[-rw-r--r--]coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/mqtt_broker.sh)4
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh6
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh (renamed from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-disable_selinux.sh)4
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh5
-rwxr-xr-x[-rw-r--r--]coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh)3
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh2
-rw-r--r--coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/mqtt_broker.sh36
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh8
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh (renamed from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh)11
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh (renamed from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh)26
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh4
-rwxr-xr-x[-rw-r--r--]coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh4
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh5
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh (renamed from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh)6
-rwxr-xr-x[-rw-r--r--]coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh (renamed from coin/provisioning/qtci-linux-RHEL-6.6-x86_64/mqtt_broker.sh)4
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh39
-rw-r--r--coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/mqtt_broker.sh36
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh4
-rw-r--r--coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh1
-rwxr-xr-x[-rw-r--r--]coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh (renamed from coin/provisioning/qtci-osx-10.10-x86_64/003-bashprofile.sh)4
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh)9
-rwxr-xr-x[-rw-r--r--]coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh (renamed from coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh)5
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh)5
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh)8
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/20-java.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh)9
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh)12
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh)7
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh)4
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh6
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh)8
-rwxr-xr-x[-rw-r--r--]coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/030-fbx.sh)5
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh)8
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh4
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh)3
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh6
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh (renamed from coin/provisioning/qtci-osx-10.9-x86_64/08-libclang.sh)4
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/30-android.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh)8
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh7
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh)12
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/555-signtools.sh)2
-rwxr-xr-xcoin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh4
-rwxr-xr-xcoin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh4
-rwxr-xr-x[-rw-r--r--]coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh)5
-rwxr-xr-xcoin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh6
-rwxr-xr-x[-rw-r--r--]coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh (renamed from coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh)4
-rw-r--r--coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh1
-rwxr-xr-x[-rw-r--r--]coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/003-bashprofile.sh)4
-rwxr-xr-xcoin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh)4
-rwxr-xr-xcoin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh4
-rwxr-xr-xcoin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh4
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh4
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh)5
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/01-system_updates.sh6
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh4
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh4
-rw-r--r--coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh1
-rwxr-xr-x[-rw-r--r--]coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh)4
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh)9
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh)5
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh5
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh)8
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh)12
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh)7
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/25-cmake.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh)4
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/25-homebrew.sh6
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh)8
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh (renamed from coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh)8
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh4
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/26-p7zip.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh)3
-rwxr-xr-xcoin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh (renamed from coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh)4
-rwxr-xr-xcoin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh4
-rw-r--r--coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh1
-rwxr-xr-xcoin/provisioning/qtci-osx-10.9-x86_64/001-system_updates.sh4
-rw-r--r--coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh1
-rw-r--r--coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps11
-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.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86/05-msvc.ps1 (renamed from coin/provisioning/qtci-windows-10-x86/msvc.ps1)0
-rw-r--r--coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps11
-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.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86/09-vulkansdk.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86/10-icu.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 (renamed from coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1)2
-rw-r--r--coin/provisioning/qtci-windows-10-x86/22-mqtt_broker.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86/23-winrtrunner.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86/60-jom.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86/70-cmake.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86/90-libusb.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86/cmake.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86/icu.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86/jom.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86/libusb.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86/mqtt_broker.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86/python3.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86/ruby.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86/winrtrunner.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/004-disable-windefender.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/005-wsearch-off.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps11
-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.ps11
-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.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps11
-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/030-fbx.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/msvc.ps1)0
-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.ps11
-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.ps11
-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.ps11
-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/09-vulkansdk.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/10-icu.ps11
-rw-r--r--[-rwxr-xr-x]coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 (renamed from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh)4
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/22-mqtt_broker.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/23-winrtrunner.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/60-jom.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/90-3dstudio_3rdparty.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/90-install-notepad++.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps151
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps11
-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.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/signing-tools.ps1)2
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/cmake.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/icu.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/jom.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/libusb.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/mqtt_broker.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps134
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/mysql.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/postgresql.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/python3.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/ruby.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/winrtrunner.ps11
-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-install-notepad++.ps11
-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.ps11
-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.ps11
-rw-r--r--coin/provisioning/qtci-windows-7-x86/12-icu.ps11
-rw-r--r--coin/provisioning/qtci-windows-7-x86/22-mqtt_broker.ps11
-rw-r--r--coin/provisioning/qtci-windows-7-x86/25-python.ps11
-rw-r--r--coin/provisioning/qtci-windows-7-x86/25-python3.ps11
-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/33-ruby.ps11
-rw-r--r--coin/provisioning/qtci-windows-7-x86/90-install-notepad++.ps11
-rw-r--r--coin/provisioning/qtci-windows-7-x86/mqtt_broker.ps11
-rw-r--r--coin/provisioning/qtci-windows-7-x86/ruby.ps11
-rw-r--r--coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/06-python.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/cmake.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/icu.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/jom.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/mqtt_broker.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/openssl.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86/python3.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/001-disable-uac.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/004-disable-windows-updates.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/009-set-network-test-server.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/02-install-notepad++.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/06-python.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/07-mesa_llvmpipe.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/08-install-git.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/08-libclang.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/09-install-ruby.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/09-install-strawberry-perl.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/09-mysql.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/09-postgresql.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/cmake.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/icu.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/jom.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/mqtt_broker.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/openssl.ps11
-rw-r--r--coin/provisioning/qtci-windows-8.1-x86_64/python3.ps11
389 files changed, 1055 insertions, 793 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index ded7b8b3..e746c641 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -6,18 +6,20 @@ qtci-windows-10-x86_64-10 x86 MSVC2015
qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-linux-Ubuntu-16.04-x86_64-1 GCC NoWidgets ForceDebugInfo
-qtci-linux-Ubuntu-16.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation
+qtci-linux-Ubuntu-16.04-x86_64-2 GCC NoWidgets ForceDebugInfo
+qtci-linux-Ubuntu-16.04-x86_64-2 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation
qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch
-qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests
+qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite
qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo
-qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker
+qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo
qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release
qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch
qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests
-qtci-macos-10.12-x86_64-8 IOS_ANY x86_64 Clang Release DisableTests Static
+qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Release DisableTests Static
+qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang Release DisableTests
+qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang Release DisableTests
qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC Release
-qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC Release
-qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck
-qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC Release
+qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC Release
+qtci-linux-Ubuntu-16.04-x86_64-2 GCC TestOnly LicenseCheck
+qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt
index 0c07960c..95b13977 100644
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -1,7 +1,7 @@
Template Target OS Target arch Compiler Features
--------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86-6 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
diff --git a/coin/platform_configs/qtbase.txt b/coin/platform_configs/qtbase.txt
index 3292cc6e..ee4f4e66 100644
--- a/coin/platform_configs/qtbase.txt
+++ b/coin/platform_configs/qtbase.txt
@@ -1,4 +1,4 @@
Template Target OS Target arch Compiler Features
--------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC DeveloperBuild DisableTests
-qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC DeveloperBuild DisableTests
+qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC DeveloperBuild DisableTests
+qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC DeveloperBuild DisableTests
diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt
index 3139af8b..9d321d40 100644
--- a/coin/platform_configs/qtdeclarative.txt
+++ b/coin/platform_configs/qtdeclarative.txt
@@ -1,4 +1,4 @@
Template Target OS Target arch Compiler Features
--------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC DeveloperBuild
-qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC DeveloperBuild
+qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC DeveloperBuild
+qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC DeveloperBuild
diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt
index b3dc74f7..75fa9c20 100644
--- a/coin/platform_configs/qtwebkit.txt
+++ b/coin/platform_configs/qtwebkit.txt
@@ -1,5 +1,5 @@
Template Target OS Target arch Compiler Features
--------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
+qtci-windows-10-x86_64-10 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
diff --git a/coin/provisioning/common/icu.ps1 b/coin/provisioning/common/icu.ps1
deleted file mode 100644
index 196ca5bc..00000000
--- a/coin/provisioning/common/icu.ps1
+++ /dev/null
@@ -1,89 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-
-. "$PSScriptRoot\helpers.ps1"
-
-# This script installs ICU.
-
-$version = "53_1"
-
-if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -eq "AMD64")) {
-
- $url_official_2012 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2012/icu_" + $version + "_msvc_2012_64_devel.7z"
- $url_cache_2012 = "\\ci-files01-hki.intra.qt.io\provisioning\windows\icu_" + $version + "_msvc_2012_64_devel.7z"
- $sha1_2012 = "8A8C371F3ED58E81BBCF58CF5F8388CEF51FA9AC"
-
- $icuPackage_msvc2012_64 = "C:\Windows\Temp\icu-$version-msvc2012_64.7z"
-
- if (!(Test-Path C:\Utils\icu_"$version"_msvc_2012_64_devel\)) {
- echo "Fetching from URL ..."
- Download $url_official_2012 $url_cache_2012 $icuPackage_msvc2012_64
- Verify-Checksum $icuPackage_msvc2012_64 $sha1_2012
- Get-ChildItem $icuPackage_msvc2012_64 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2012_64_devel\""}
-
- echo "Cleaning $icuPackage_msvc2012_64..."
- Remove-Item -Recurse -Force $icuPackage_msvc2012_64
-
- echo "ICU MSVC2012 = $version" >> ~\versions.txt
- }
-
-# FIXME: do we really want to have it per MSVC version? What about MSVC2015?
-[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2012", "C:\\Utils\\icu_53_1_msvc_2012_64_devel\\icu53_1", "Machine")
-
-# FIXME: do we really want to use the 4.8.2 ICU build?
-[Environment]::SetEnvironmentVariable("CI_ICU_PATH_Mingw49", "C:\Utils\icu_53_1_Mingw_builds_4_8_2_posix_seh_64_devel\icu53_1", "Machine")
-
-} else {
-
- $url_official_2012_32 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2012/icu_" + $version + "_msvc_2012_32_devel.7z"
- $url_cache_2012_32 = "\\ci-files01-hki.intra.qt.io\provisioning\windows\icu_" + $version + "_msvc_2012_32_devel.7z"
- $sha1_2012_32 = "F2FF287EEB0163B015D37AE08871165FBA87BCF0"
-
- $icuPackage_msvc2012_32 = "C:\Windows\Temp\icu-$version-msvc2012_32.7z"
-
- if (!(Test-Path C:\Utils\icu_"$version"_msvc_2012_32_devel\)) {
- echo "Fetching from URL ..."
- Download $url_official_2012_32 $url_cache_2012_32 $icuPackage_msvc2012_32
- Verify-Checksum $icuPackage_msvc2012_32 $sha1_2012_32
- Get-ChildItem $icuPackage_msvc2012_32 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2012_32_devel\""}
-
- echo "Cleaning $icuPackage_msvc2012_32..."
- Remove-Item -Recurse -Force $icuPackage_msvc2012_32
-
- echo "ICU MSVC2012 = $version" >> ~\versions.txt
- }
-
-# FIXME: do we really want to have it per MSVC version? What about MSVC2015?
-[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2012", "C:\\Utils\\icu_53_1_msvc_2012_32_devel\\icu53_1", "Machine")
-
-}
diff --git a/coin/provisioning/common/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh
index ee3008c1..b4a412c8 100644..100755
--- a/coin/provisioning/common/android_linux.sh
+++ b/coin/provisioning/common/linux/android_linux.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -37,8 +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%/*}/../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"
@@ -79,10 +80,20 @@ try
rm "$toolsTargetFile" || throw $ExceptionRmTools
echo "Changing ownership of Android files."
- sudo chown -R qt:wheel "$targetFolder"
+ if uname -a |grep -q "el6\|el7"; then
+ sudo chown -R qt:wheel "$targetFolder"
+ else
+ sudo chown -R qt:users "$targetFolder"
+ fi
echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion."
- echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager
+ if [ "$proxy" != "" ]; then
+ proxy_host=$(echo $proxy | cut -d'/' -f3 | cut -d':' -f1)
+ proxy_port=$(echo $proxy | cut -d':' -f3)
+ echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host=$proxy_host --proxy_port=$proxy_port "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager
+ else
+ echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager
+ fi
echo "export ANDROID_SDK_HOME=$sdkTargetFolder" >> ~/.bashrc
echo "export ANDROID_NDK_HOME=$targetFolder/android-ndk-$ndkVersion" >> ~/.bashrc
diff --git a/coin/provisioning/common/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh
index 701d9081..27358a20 100755
--- a/coin/provisioning/common/cmake_linux.sh
+++ b/coin/provisioning/common/linux/cmake_linux.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -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"
@@ -50,4 +50,8 @@ appPrefix="cmake-$version-Linux-x86_64"
InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
echo "Adding $targetFolder/bin to PATH"
-echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc
+if uname -a |grep -q "Ubuntu"; then
+ echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.profile
+else
+ echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc
+fi
diff --git a/coin/provisioning/common/disable_selinux.sh b/coin/provisioning/common/linux/disable_selinux.sh
index 30162166..30162166 100644..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 66d4793b..0b587aed 100755
--- a/coin/provisioning/common/fbx_linux.sh
+++ b/coin/provisioning/common/linux/fbx_linux.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -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 6998866a..0c7234b3 100755
--- a/coin/provisioning/common/integrity.sh
+++ b/coin/provisioning/common/linux/integrity.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -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 70684eaf..cda41d72 100644..100755
--- a/coin/provisioning/common/openssl_for_android_linux.sh
+++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh
@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -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 74ce2948..4f7c4fb1 100644..100755
--- a/coin/provisioning/common/qnx_700.sh
+++ b/coin/provisioning/common/linux/qnx_700.sh
@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
#############################################################################
##
diff --git a/coin/provisioning/common/version.sh b/coin/provisioning/common/linux/version.sh
index e7662e1e..ed24d805 100755
--- a/coin/provisioning/common/version.sh
+++ b/coin/provisioning/common/linux/version.sh
@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
#############################################################################
##
diff --git a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh b/coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh
index 2af2db10..4d2ba1f8 100644..100755
--- a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh
+++ b/coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -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 c00b646c..881086ba 100644..100755
--- a/coin/provisioning/common/InstallPKGFromURL.sh
+++ b/coin/provisioning/common/macos/InstallPKGFromURL.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -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 e10dd41d..c727c8ff 100755
--- a/coin/provisioning/common/cmake.sh
+++ b/coin/provisioning/common/macos/cmake.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
diff --git a/coin/provisioning/common/fbx_macos.sh b/coin/provisioning/common/macos/fbx_macos.sh
index 66a2d998..9dc97814 100755
--- a/coin/provisioning/common/fbx_macos.sh
+++ b/coin/provisioning/common/macos/fbx_macos.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
@@ -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 f224d31d..d57e1d2f 100644..100755
--- a/coin/provisioning/common/install-commandlinetools.sh
+++ b/coin/provisioning/common/macos/install-commandlinetools.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -32,8 +32,8 @@
## $QT_END_LICENSE$
##
#############################################################################
-source "${BASH_SOURCE%/*}/DownloadURL.sh"
-source "${BASH_SOURCE%/*}/try_catch.sh"
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
set -ex
# Command line tools is need by homebrew
diff --git a/coin/provisioning/common/install_xcode.sh b/coin/provisioning/common/macos/install_xcode.sh
index c6f00ee7..1fe611b3 100755
--- a/coin/provisioning/common/install_xcode.sh
+++ b/coin/provisioning/common/macos/install_xcode.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -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 31591339..fc20aa2d 100755
--- a/coin/provisioning/common/python3.sh
+++ b/coin/provisioning/common/macos/python3.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
diff --git a/coin/provisioning/common/system_updates.sh b/coin/provisioning/common/macos/system_updates.sh
index 2dee2708..0736d740 100755
--- a/coin/provisioning/common/system_updates.sh
+++ b/coin/provisioning/common/macos/system_updates.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
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/ruby.ps1 b/coin/provisioning/common/ruby.ps1
deleted file mode 100644
index f7813c20..00000000
--- a/coin/provisioning/common/ruby.ps1
+++ /dev/null
@@ -1,7 +0,0 @@
-. "$PSScriptRoot\helpers.ps1"
-
-$installer = "c:\users\qt\downloads\rubyinstaller-2.3.1.exe"
-
-Download https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.3.1.exe http://ci-files01-hki.intra.qt.io/input/ruby/rubyinstaller-2.3.1.exe $installer
-Verify-Checksum $installer "FF377F6F313849C3B0CD72EEC1EFFA436F0E4A36"
-& $installer /DIR=C:\ruby /VERYSILENT
diff --git a/coin/provisioning/common/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh
index c60fae21..cb890e8a 100644..100755
--- a/coin/provisioning/common/DownloadURL.sh
+++ b/coin/provisioning/common/unix/DownloadURL.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
diff --git a/coin/provisioning/common/InstallFromCompressedFileFromURL.sh b/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh
index df84431a..fb77b714 100644..100755
--- a/coin/provisioning/common/InstallFromCompressedFileFromURL.sh
+++ b/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
diff --git a/coin/provisioning/common/unix/check_and_set_proxy.sh b/coin/provisioning/common/unix/check_and_set_proxy.sh
new file mode 100755
index 00000000..8dad878c
--- /dev/null
+++ b/coin/provisioning/common/unix/check_and_set_proxy.sh
@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the test suite of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+source "${BASH_SOURCE%/*}/try_catch.sh"
+source "${BASH_SOURCE%/*}/http_proxy.txt"
+
+try
+(
+ wget -q -e "http_proxy=$proxy" --spider proxy.intra.qt.io
+)
+
+if [ $? -eq 0 ]; then
+ echo "Setting http_proxy to $proxy"
+ export http_proxy=$proxy
+
+else
+ echo "Proxy not detected at $proxy"
+fi
+
diff --git a/coin/provisioning/common/unix/http_proxy.txt b/coin/provisioning/common/unix/http_proxy.txt
new file mode 100644
index 00000000..3aa6ceba
--- /dev/null
+++ b/coin/provisioning/common/unix/http_proxy.txt
@@ -0,0 +1,2 @@
+proxy="http://proxy.intra.qt.io:3128"
+
diff --git a/coin/provisioning/common/libclang.sh b/coin/provisioning/common/unix/libclang.sh
index 381127b1..69d9ff96 100755
--- a/coin/provisioning/common/libclang.sh
+++ b/coin/provisioning/common/unix/libclang.sh
@@ -40,8 +40,10 @@
# In case of Linux, we expect to get the values as args
set -e
+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/mqtt_broker.sh b/coin/provisioning/common/unix/mqtt_broker.sh
index b52b78b1..c2fb2e30 100644
--- a/coin/provisioning/common/mqtt_broker.sh
+++ b/coin/provisioning/common/unix/mqtt_broker.sh
@@ -35,8 +35,8 @@
# This script installs paho testing broker
-# shellcheck source=../common/InstallFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
+# shellcheck source=./InstallFromCompressedFileFromURL.sh
+source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh"
CommitSHA="c342c09dadc7a664d0a8befad1ca031f5a0b0bc0"
PrimaryUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip"
diff --git a/coin/provisioning/common/try_catch.sh b/coin/provisioning/common/unix/try_catch.sh
index b21861e3..560d040d 100644..100755
--- a/coin/provisioning/common/try_catch.sh
+++ b/coin/provisioning/common/unix/try_catch.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
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 ff781b6c..ff781b6c 100644
--- a/coin/provisioning/common/helpers.ps1
+++ b/coin/provisioning/common/windows/helpers.ps1
diff --git a/coin/provisioning/common/windows/icu.ps1 b/coin/provisioning/common/windows/icu.ps1
new file mode 100644
index 00000000..be0f7277
--- /dev/null
+++ b/coin/provisioning/common/windows/icu.ps1
@@ -0,0 +1,45 @@
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+. "$PSScriptRoot\helpers.ps1"
+
+# This script installs ICU.
+
+$version = "53_1"
+
+if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -eq "AMD64")) {
+
+# FIXME: do we really want to use the 4.8.2 ICU build?
+[Environment]::SetEnvironmentVariable("CI_ICU_PATH_Mingw49", "C:\Utils\icu_53_1_Mingw_builds_4_8_2_posix_seh_64_devel\icu53_1", "Machine")
+
+}
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 cabc906c..f3e96318 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-ruby.ps1 b/coin/provisioning/common/windows/install-ruby.ps1
index 57cf227f..3a9aa0d2 100644
--- a/coin/provisioning/common/install-ruby.ps1
+++ b/coin/provisioning/common/windows/install-ruby.ps1
@@ -31,30 +31,28 @@
##
#############################################################################
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
# This script will install Ruby
-$version = "2.2.6"
+$version = "2.4.2-2"
if( (is64bitWinHost) -eq 1 ) {
$arch = "-x64"
- $sha1 = "4D0E366F0264CDED174E5842B2435E22B81FB57A"
+ $sha1 = "c961c2752a183487bc42ed24beb7e931230fa7d5"
}
else {
- $arch = ""
- $sha1 = "8649309fffe9c746ad5549d3f7b70490806e95df"
+ $arch = "-x86"
+ $sha1 = "2639a481c3b5ad11f57d5523cc41ca884286089e"
}
$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\rubyinstaller-" + $version + $arch + ".exe"
-$url_official = "https://bintray.com/oneclick/rubyinstaller/download_file?file_path=rubyinstaller-" + $version + $arch + ".exe"
+$url_official = "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-" + $version + "/rubyinstaller-" + $version + $arch + ".exe"
$rubyPackage = "C:\Windows\Temp\rubyinstaller-$version.exe"
Download $url_official $url_cache $rubyPackage
Verify-Checksum $rubyPackage $sha1
-cmd /c "$rubyPackage /silent"
+Start-Process -FilePath $rubyPackage -ArgumentList "/dir=C:\Ruby-$version$arch /tasks=modpath /verysilent" -Wait
echo "Cleaning $rubyPackage.."
Remove-Item -Recurse -Force "$rubyPackage"
-Add-Path "C:\Ruby22-x64\bin"
-
echo "Ruby = $version" >> ~\versions.txt
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 02a3974a..af041916 100644
--- a/coin/provisioning/common/libclang.ps1
+++ b/coin/provisioning/common/windows/libclang.ps1
@@ -1,12 +1,12 @@
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.
# Starting from Qt 5.11 QDoc requires Clang to parse C++
-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/mqtt_broker.ps1 b/coin/provisioning/common/windows/mqtt_broker.ps1
index 610f22d8..610f22d8 100644
--- a/coin/provisioning/common/mqtt_broker.ps1
+++ b/coin/provisioning/common/windows/mqtt_broker.ps1
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/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/vulkansdk.ps1 b/coin/provisioning/common/windows/vulkansdk.ps1
index c572fa47..bade33ef 100644
--- a/coin/provisioning/common/vulkansdk.ps1
+++ b/coin/provisioning/common/windows/vulkansdk.ps1
@@ -31,7 +31,7 @@
##
#############################################################################
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"
# This script will install Vulkan SDK
diff --git a/coin/provisioning/common/winrtrunner.ps1 b/coin/provisioning/common/windows/winrtrunner.ps1
index f433ac7a..f433ac7a 100644
--- a/coin/provisioning/common/winrtrunner.ps1
+++ b/coin/provisioning/common/windows/winrtrunner.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
new file mode 100755
index 00000000..90b32d0d
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+set -ex
+
+source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
+
+if [ "$proxy" != "" ]; then
+ echo "proxy=$proxy" | sudo tee -a /etc/yum.conf
+fi
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh
index 852c1100..d3072b37 100644..100755
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh
@@ -1,6 +1,10 @@
+#!/usr/bin/env bash
# provides: fix for possible bug in the subscription manager
# version: provided by RedHat
# needed for yum to work properly in case there is incorrect data in
# the sslclientkey repository parameter value
+
+set -ex
+
sudo rm -f /etc/pki/entitlement/*
sudo subscription-manager refresh
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh
index f6c90a75..c8edc2a2 100644..100755
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh
@@ -1,4 +1,8 @@
+#!/usr/bin/env bash
# provides: odbc devel packages on RHEL
# version: provided by default Linux distribution repository
# needed for configure -plugin-sql-odbc in qtbase
+
+set -ex
+
sudo yum install -y unixODBC-devel
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 aa64a892..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
@@ -1,9 +1,11 @@
#!/usr/bin/env bash
+set -ex
+
BASEDIR=$(dirname "$0")
. $BASEDIR/../common/sw_versions.txt
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/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh
index 0003127a..552e7586 100644..100755
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh
@@ -1,6 +1,10 @@
+#!/usr/bin/env bash
# provides: python development libraries
# version: provided by default Linux distribution repository
# needed to build pyside
+
+set -ex
+
sudo yum install -y python-devel python-virtualenv
# install the EPEL repository which provides python3
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh
index d7abd285..572ad7ad 100644..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 +1,4 @@
-$(dirname $0)/../common/cmake_linux.sh
+#!/usr/bin/env bash
+set -ex
+
+$(dirname $0)/../common/linux/cmake_linux.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh
index 229e259f..b156e8f9 100644..100755
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh
@@ -1,3 +1,6 @@
-#!/bin/env bash
+#!/usr/bin/env bash
# Required for tqtc-boot2qt/qdb
+
+set -ex
+
sudo yum install -y libusb1-devel
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh
index e367c20b..04c09770 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/mqtt_broker.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh
@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -33,4 +33,4 @@
##
#############################################################################
-source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh"
+source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh
index 03a69edb..e4492eb0 100644..100755
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh
@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
#############################################################################
##
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh
index 5ef5f0e9..739d06b6 100644..100755
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh
@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -36,9 +36,12 @@
# This script needs to be called last during provisioning so that the software information will show up last in provision log.
# Storage installed RPM packages information
+
+set -ex
+
echo "*********************************************" >> ~/versions.txt
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-6.6-x86_64/android_linux.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh
deleted file mode 100644
index 69b3c10e..00000000
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the test suite of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# This script install Android sdk and ndk.
-
-# It also runs update for SDK API level 21, latest SDK tools, latest platform-tools and build-tools version 23.0.3
-
-# Build-tools version 23.0.3 is the latest usable version for Red Hat 6. Newer version of build-tools, version 24.x.x, requires GLIBC_2.14, which is not available in Red Hat 6.
-
-# Android 16 is the minimum requirement for Qt 5.7 applications, but we need something more recent than that for building Qt itself.
-# E.g The Bluetooth features that require Android 21 will disable themselves dynamically when running on an Android 16 device.
-# That's why we need to use Andoid-21 API version in Qt 5.9.
-
-set -ex
-targetFolder="/opt/android"
-baseUrl="http://ci-files01-hki.intra.qt.io/input/android"
-
-# SDK
-sdkPackage="android-sdk_r24.4.1-linux.tgz"
-sdkBuildToolsVersion="23.0.3"
-sdkApiLevel="android-21"
-sdkUrl="$baseUrl/$sdkPackage"
-sdkSha1="725bb360f0f7d04eaccff5a2d57abdd49061326d"
-sdkTargetFile="$targetFolder/$sdkPackage"
-sdkExtract="tar -C $targetFolder -zxf $sdkTargetFile"
-sdkFolderName="android-sdk-linux"
-sdkName="sdk"
-
-# NDK
-ndkVersion="r10e"
-ndkPackage="android-ndk-$ndkVersion-linux-x86_64.zip"
-ndkUrl="$baseUrl/$ndkPackage"
-ndkSha1="f692681b007071103277f6edc6f91cb5c5494a32"
-ndkTargetFile="$targetFolder/$ndkPackage"
-ndkExtract="unzip $ndkTargetFile -d $targetFolder"
-ndkFolderName="android-ndk-$ndkVersion"
-ndkName="ndk"
-
-function InstallAndroidPackage {
- targetFolder=$1
- version=$2
- url=$3
- sha1=$4
- targetFile=$5
- extract=$6
- folderName=$7
- name=$8
-
- sudo wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url"
- echo "$sha1 $targetFile" | sha1sum --check
- sudo chmod 755 "$targetFile"
- sudo $extract || echo "Failed to extract $url"
- sudo chown -R qt:users "$targetFolder"/"$folderName"
- sudo mv "$targetFolder"/"$folderName" "$targetFolder"/"$name" || echo "Failed to rename $name"
- sudo rm -fr "$targetFolder"/"$version"
-}
-
-if [ -d "$targetFolder" ]; then
- echo "Removing old Android installation"
- sudo rm -fr "$targetFolder"
-fi
-
-sudo mkdir "$targetFolder"
-
-# Install Android SDK
-echo "Installing Android SDK version $sdkPackage..."
-InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName
-
-# Install Android NDK
-echo "Installing Android NDK version $ndkPackage..."
-InstallAndroidPackage "$targetFolder" $ndkPackage $ndkUrl $ndkSha1 $ndkTargetFile "$ndkExtract" $ndkFolderName $ndkName
-
-# run update for Android SDK and install SDK API version 21, latest SDK tools, platform-tools and build-tools
-echo "Running Android SDK update for API version 21, SDK-tools, platform-tools and build-tools-$sdkBuildToolsVersion..."
-echo "y" |"$targetFolder"/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion
-
-echo 'export ANDROID_API_VERSION=android-21' >> ~/.bashrc
-
-# Storage version information to ~/versions.txt, which is used to print version information to provision log.
-echo "***** Android SDK *****" >> ~/versions.txt
-echo "Android SDK Api Level = $sdkApiLevel" >> ~/versions.txt
-echo "Android SDK Build Tools Version = $sdkBuildToolsVersion" >> ~/versions.txt
-platformTools="$(grep Pkg.Revision "$targetFolder"/sdk/platform-tools/source.properties | cut -c14-)"
-echo "Android Platform Tools = $platformTools" >> ~/versions.txt
-sdkTools="$(grep Pkg.Revision "$targetFolder"/sdk/tools/source.properties | cut -c14-)"
-echo "Android SDK Tools = $sdkTools" >> ~/versions.txt
-echo "***** Android NDK *****" >> ~/versions.txt
-echo "Android NDK Version = $ndkVersion" >> ~/versions.txt
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh
deleted file mode 100755
index 2697de04..00000000
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-sudo subscription-manager repos --enable rhel-workstation-rhscl-7-rpms
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh
index a76a8638..8b10ffd1 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -33,6 +33,8 @@
##
#############################################################################
+set -ex
+
# refresh local certificates
sudo subscription-manager refresh
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh
index 22bf19a3..f8847e51 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -33,9 +33,10 @@
##
#############################################################################
-set -e
+set -ex
BASEDIR=$(dirname "$0")
+source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
source $BASEDIR/../common/network_test_server_ip.txt
echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
@@ -49,3 +50,7 @@ export DISPLAY=:0
gsettings set org.gnome.desktop.screensaver lock-enabled false
# disable blank screen power saving
gsettings set org.gnome.desktop.session idle-delay 0
+
+if [ "$proxy" != "" ]; then
+ echo "proxy=$proxy" | sudo tee -a /etc/yum.conf
+fi
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh
new file mode 100755
index 00000000..8f080992
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+set -ex
+
+sudo subscription-manager repos --enable rhel-workstation-rhscl-7-rpms
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh
index 439e2db5..f3b90756 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -33,6 +33,8 @@
##
#############################################################################
+set -ex
+
sudo yum-config-manager --enable rhel-server-rhscl7-rpms
sudo yum -y install devtoolset-4
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
index a8e812bd..23b80d89 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -33,7 +33,7 @@
##
#############################################################################
-set -e
+set -ex
installPackages=()
installPackages+=(git)
@@ -83,6 +83,9 @@ installPackages+=(perl-Digest-SHA)
installPackages+=(glibc.i686)
# Enable Qt Bluetooth
installPackages+=(bluez-libs-devel)
+# QtWebKit
+installPackages+=(libxml2-devel)
+installPackages+=(libxslt-devel)
sudo yum -y update
sudo yum -y install "${installPackages[@]}"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh
index 966f3045..d95f4f21 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -32,7 +32,10 @@
## $QT_END_LICENSE$
##
#############################################################################
-source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
+
+set -ex
+
+source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
name="p7zip"
version="7-11"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/040-android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/040-android_linux.sh
deleted file mode 100755
index 637c4224..00000000
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/040-android_linux.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-source "${BASH_SOURCE%/*}/../common/android_linux.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-libclang.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh
index abbda212..fa8d3a44 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-libclang.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh
@@ -1,4 +1,5 @@
#!/usr/bin/env bash
+set -ex
BASEDIR=$(dirname "$0")
. $BASEDIR/../common/sw_versions.txt
@@ -6,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/006-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh
index 46976e9a..9800229d 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/006-cmake.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -35,6 +35,8 @@
# This script installs CMake 3.6.2
+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
new file mode 100755
index 00000000..970d80b1
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+set -ex
+
+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
new file mode 100755
index 00000000..1710b878
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+set -ex
+
+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 6ae0f820..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
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -33,10 +33,10 @@
##
#############################################################################
-source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
-
set -ex
+source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
+
packageEpel="epel-release-latest-7.noarch.rpm"
OfficialUrl="https://dl.fedoraproject.org/pub/epel/$packageEpel"
CachedUrl="http://ci-files01-hki.intra.qt.io/input/redhat/$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
new file mode 100755
index 00000000..e4d2dc15
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+set -ex
+
+source "${BASH_SOURCE%/*}/../common/linux/disable_selinux.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh
index b69295fc..b685362e 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -34,4 +34,7 @@
#############################################################################
source /opt/rh/devtoolset-4/enable
-source "${BASH_SOURCE%/*}/../common/openssl_for_android_linux.sh"
+
+set -ex
+
+source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh
index e367c20b..04c09770 100644..100755
--- a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/mqtt_broker.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh
@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -33,4 +33,4 @@
##
#############################################################################
-source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh"
+source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.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
new file mode 100755
index 00000000..ca24a70e
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/linux/fbx_linux.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh
index 9447c43f..ed9d6679 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-install_icu.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
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
new file mode 100755
index 00000000..ffe96d30
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+set -ex
+
+source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh
index 2498e441..60e637b7 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -35,8 +35,12 @@
# This script modifies system settings for automated use
-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/try_catch.sh"
+set -ex
+
+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
@@ -44,9 +48,12 @@ ExceptionGsettings1=100
ExceptionGsettings2=101
ExceptionGsettings3=102
ExceptionNTS=103
+ExceptionProxy=104
try
(
+ echo "Set timezone to UTC" || throw $ExceptionTimezone
+ sudo timedatectl set-timezone Etc/UTC
echo "Timeout for blanking the screen (0 = never)"
gsettings set org.gnome.desktop.session idle-delay 0 || throw $ExceptionGsettings1
echo "Prevents screen lock when screesaver goes active."
@@ -56,9 +63,17 @@ try
echo "Set Network Test Server address to $NTS_IP in /etc/hosts"
echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts || throw $ExceptionNTS
+
+ if [ "$proxy" != "" ]; then
+ echo "Acquire::http::Proxy \"$proxy\";" | sudo tee -a /etc/apt/apt.conf || throw $ExceptionProxy
+ fi
)
catch || {
case $ex_code in
+ $ExceptionTimezone)
+ echo "Failed to set timezone to UTC"
+ exit 1;
+ ;;
$ExceptionGsettings1)
echo "Failed to disable black screen."
exit 1;
@@ -75,6 +90,10 @@ catch || {
echo "Failed to set network teset server address into /etc/hosts."
exit 1;
;;
+ $ExceptionProxy)
+ echo "Failed to set proxy /etc/apt/apt.conf."
+ exit 1;
+ ;;
esac
}
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
index 9b71f935..ef2b14d0 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -35,7 +35,9 @@
# Install required packages with APT
-source "${BASH_SOURCE%/*}/../common/try_catch.sh"
+set -ex
+
+source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
ExceptionAPTUpdate=100
ExceptionAPT=101
@@ -45,47 +47,107 @@ try
(
echo "Disabling auto update"
sudo sed -i 's/APT::Periodic::Update-Package-Lists "1";/APT::Periodic::Update-Package-Lists "0";/' /etc/apt/apt.conf.d/10periodic || throw $ExceptionSED
- echo "Running update for apt"
- sudo apt-get update
- echo "Installing packages"
+ for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; do
+ sudo systemctl stop $service
+ sudo systemctl disable $service
+ done
# Git is not needed by builds themselves, but is nice to have
# immediately as one starts debugging
- yes | sudo aptdcon --hide-terminal --install git || throw $ExceptionAPT
+ installPackages+=(git)
# 7zip is a needed decompressing tool
- yes | sudo aptdcon --hide-terminal --install p7zip || throw $ExceptionAPT
+ installPackages+=(p7zip)
# libssl-dev provides headers for OpenSSL
- yes | sudo aptdcon --hide-terminal --install libssl-dev || throw $ExceptionAPT
+ installPackages+=(libssl-dev)
# Needed libraries for X11 support accordingly to https://wiki.qt.io/Building_Qt_5_from_Git
- yes | sudo aptdcon --hide-terminal --install "^libxcb.*" libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev || throw $ExceptionAPT
+ installPackages+=("^libxcb.*")
+ installPackages+=(libxkbcommon-dev)
+ installPackages+=(libxkbcommon-x11-dev)
+ installPackages+=(libx11-xcb-dev)
+ installPackages+=(libglu1-mesa-dev)
+ installPackages+=(libxrender-dev)
+ installPackages+=(libxi-dev)
# Enable linking to system dbus
- yes | sudo aptdcon --hide-terminal --install libdbus-1-dev || throw $ExceptionAPT
+ installPackages+=(libdbus-1-dev)
# Needed libraries for WebEngine
- yes | sudo aptdcon --hide-terminal --install libudev-dev libegl1-mesa-dev libfontconfig1-dev libxss-dev || throw $ExceptionAPT
+ installPackages+=(libudev-dev)
+ installPackages+=(libegl1-mesa-dev)
+ installPackages+=(libfontconfig1-dev)
+ installPackages+=(libxss-dev)
# Common event loop handling
- yes | sudo aptdcon --hide-terminal --install libglib2.0-dev || throw $ExceptionAPT
+ installPackages+=(libglib2.0-dev)
# MySQL support
- yes | sudo aptdcon --hide-terminal --install libmysqlclient-dev || throw $ExceptionAPT
+ installPackages+=(libmysqlclient-dev)
# PostgreSQL support
- yes | sudo aptdcon --hide-terminal --install libpq-dev || throw $ExceptionAPT
+ installPackages+=(libpq-dev)
# SQLite support
- yes | sudo aptdcon --hide-terminal --install libsqlite3-dev || throw $ExceptionAPT
+ installPackages+=(libsqlite3-dev)
# ODBC support
- yes | sudo aptdcon --hide-terminal --install unixodbc-dev || throw $ExceptionAPT
+ installPackages+=(unixodbc-dev)
# Support for FreeType font engine
- yes | sudo aptdcon --hide-terminal --install libfreetype6-dev || throw $ExceptionAPT
+ installPackages+=(libfreetype6-dev)
# Enable the usage of system jpeg libraries
- yes | sudo aptdcon --hide-terminal --install libjpeg-dev || throw $ExceptionAPT
+ installPackages+=(libjpeg-dev)
# Enable support for printer driver
- yes | sudo aptdcon --hide-terminal --install libcups2-dev || throw $ExceptionAPT
+ installPackages+=(libcups2-dev)
# Install libraries needed for QtMultimedia to be able to support all plugins
- yes | sudo aptdcon --hide-terminal --install libasound2-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev || throw $ExceptionAPT
- yes | sudo aptdcon --hide-terminal --install libgstreamer-plugins-good1.0-dev libgstreamer-plugins-bad1.0-dev || throw $ExceptionAPT
+ installPackages+=(libasound2-dev)
+ installPackages+=(libgstreamer1.0-dev)
+ installPackages+=(libgstreamer-plugins-base1.0-dev)
+ installPackages+=(libgstreamer-plugins-good1.0-dev)
+ installPackages+=(libgstreamer-plugins-bad1.0-dev)
# Support for cross-building to x86 (needed by WebEngine boot2qt builds)
- yes | sudo aptdcon --hide-terminal --install g++-multilib || throw $ExceptionAPT
+ installPackages+=(g++-multilib)
# python3 development package
- yes | sudo aptdcon --hide-terminal --install python3-dev python3-pip python3-virtualenv || throw $ExceptionAPT
+ installPackages+=(python3-dev)
+ installPackages+=(python3-pip)
+ installPackages+=(python3-virtualenv)
# Automates interactive applications (Needed by RTA to automate configure testing)
- yes | sudo aptdcon --hide-terminal --install expect || throw $ExceptionAPT
+ installPackages+=(expect)
+ installPackages+=(mesa-common-dev)
+ installPackages+=(libgl1-mesa-glx)
+ installPackages+=(libgl1-mesa-dev)
+ installPackages+=(libegl1-mesa-dev)
+ installPackages+=(curl)
+ installPackages+=(libicu-dev)
+ installPackages+=(zlib1g-dev)
+ installPackages+=(zlib1g)
+ installPackages+=(openjdk-8-jdk)
+ installPackages+=(libgtk-3-dev)
+ installPackages+=(ninja-build)
+ installPackages+=(libssl-dev)
+ installPackages+=(libxcursor-dev)
+ installPackages+=(libxcomposite-dev)
+ installPackages+=(libxdamage-dev)
+ installPackages+=(libxrandr-dev)
+ installPackages+=(libfontconfig1-dev)
+ installPackages+=(libxss-dev)
+ installPackages+=(libsrtp0-dev)
+ installPackages+=(libwebp-dev)
+ installPackages+=(libjsoncpp-dev)
+ installPackages+=(libopus-dev)
+ installPackages+=(libminizip-dev)
+ installPackages+=(libavutil-dev)
+ installPackages+=(libavformat-dev)
+ installPackages+=(libavcodec-dev)
+ installPackages+=(libevent-dev)
+ installPackages+=(bison)
+ installPackages+=(flex)
+ installPackages+=(gperf)
+ installPackages+=(libasound2-dev)
+ installPackages+=(libpulse-dev)
+ installPackages+=(libxtst-dev)
+ installPackages+=(libnspr4-dev)
+ installPackages+=(libnss3-dev)
+ installPackages+=(libopenal-dev)
+ installPackages+=(libbluetooth-dev)
+ #VirtualBox for RTA
+ installPackages+=(virtualbox)
+ installPackages+=(dkms)
+
+ echo "Running update for apt"
+ sudo apt-get update
+ echo "Installing packages"
+ sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" || throw $ExceptionAPT
)
catch || {
case $ex_code in
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh
index 74ef2b4e..74ef2b4e 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/030-fbx.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/030-fbx.sh
deleted file mode 100755
index 7c5fadcb..00000000
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/030-fbx.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-BASEDIR=$(dirname "$0")
-$BASEDIR/../common/fbx_linux.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/005-libclang.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh
index abbda212..3d294fef 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/005-libclang.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh
@@ -6,4 +6,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-Ubuntu-16.04-x86_64/004-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh
index ad4e25a9..fbd75f22 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -35,9 +35,9 @@
# This script installs the Yocto toolchain
-set -e
+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-RHEL-7.4-x86_64/008-integrity.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh
index 56b1556d..0f89e72c 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/008-integrity.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh
@@ -33,4 +33,6 @@
##
#############################################################################
-source "${BASH_SOURCE%/*}/../common/integrity.sh"
+set -ex
+
+source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh
index e367c20b..04c09770 100644..100755
--- a/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/mqtt_broker.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh
@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -33,4 +33,4 @@
##
#############################################################################
-source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh"
+source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.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
new file mode 100755
index 00000000..ca24a70e
--- /dev/null
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/linux/fbx_linux.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-disable_selinux.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh
index 3eced1a4..6784335a 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-disable_selinux.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh
@@ -33,4 +33,6 @@
##
#############################################################################
-source "${BASH_SOURCE%/*}/../common/disable_selinux.sh"
+set -ex
+
+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
new file mode 100755
index 00000000..8f81a7dd
--- /dev/null
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/linux/cmake_linux.sh
+
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh
index a757767f..6570e107 100644..100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh
@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -44,6 +44,7 @@ cd freeopcua
git checkout 955cc5b924cf310fc15b376a11f4b7b9db28980b
mkdir build
cd build
+source ~/.profile
cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local ..
make
sudo make install
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh
index 6f0f3797..7f24d224 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.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-Ubuntu-16.04-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/mqtt_broker.sh
deleted file mode 100644
index e367c20b..00000000
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/mqtt_broker.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the test suite of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh"
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh
deleted file mode 100755
index d8874561..00000000
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-# provides: python development libraries
-# version: provided by default Linux distribution repository
-# needed to build pyside
-sudo zypper -nq install python-devel python-virtualenv
-
-# install python3
-sudo zypper -nq install python3 python3-pip python3-virtualenv
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh
deleted file mode 100755
index d10bc06d..00000000
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-$(dirname $0)/../common/cmake_linux.sh
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh
index 4b2f2546..f419b7c1 100755
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh
@@ -1,8 +1,10 @@
-#!/bin/bash
-set -e
+#!/usr/bin/env bash
+
+set -ex
BASEDIR=$(dirname "$0")
source $BASEDIR/../common/network_test_server_ip.txt
+source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc
@@ -11,3 +13,8 @@ echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | su
echo "Set DISPLAY"
echo 'export DISPLAY=":0"' >> ~/.bashrc
+if [ "$proxy" != "" ]; then
+ sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy
+ sudo sed -i "s|HTTP_PROXY=\".*\"|HTTP_PROXY=\"$proxy\"|" /etc/sysconfig/proxy
+fi
+
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh
index fb2b81dd..cbdcbf64 100755
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh
@@ -1,10 +1,14 @@
-#!/bin/bash
-set -e
+#!/usr/bin/env bash
+
+set -ex
sudo zypper -nq install git
-# default compiler, gcc 4.8.5
-sudo zypper -nq install gcc
-sudo zypper -nq install gcc-c++
+sudo zypper -nq install gcc7
+sudo zypper -nq install gcc7-c++
+sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 1 \
+ --slave /usr/bin/g++ g++ /usr/bin/g++-7 \
+ --slave /usr/bin/cc cc /usr/bin/gcc-7 \
+ --slave /usr/bin/c++ c++ /usr/bin/g++-7
sudo zypper -nq install bison
sudo zypper -nq install flex
@@ -16,6 +20,7 @@ sudo zypper -nq install glib2-devel
sudo zypper -nq install libopenssl-devel
sudo zypper -nq install freetype2-devel
sudo zypper -nq install fontconfig-devel
+sudo zypper -nq install sqlite3-devel
# EGL support
sudo zypper -nq install Mesa-libEGL-devel
@@ -46,3 +51,14 @@ sudo zypper -nq install libXrandr-devel
sudo zypper -nq install libXtst-devel
sudo zypper -nq install mozilla-nspr-devel
sudo zypper -nq install mozilla-nss-devel
+
+# qtwebkit
+sudo zypper -nq install libxml2-devel
+sudo zypper -nq install libxslt-devel
+
+# GStreamer (qtwebkit and qtmultimedia)
+sudo zypper -nq install gstreamer-devel
+sudo zypper -nq install gstreamer-plugins-base-devel
+
+# cups
+sudo zypper -nq install cups-devel
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 abbda212..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
@@ -1,9 +1,11 @@
#!/usr/bin/env bash
+set -ex
+
BASEDIR=$(dirname "$0")
. $BASEDIR/../common/sw_versions.txt
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/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh
index a30a3fb4..e7cdd4a7 100644..100755
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh
@@ -1,6 +1,10 @@
+#!/usr/bin/env bash
# provides: python development libraries
# version: provided by default Linux distribution repository
# needed to build pyside
+
+set -ex
+
sudo pkcon -y refresh
sudo pkcon -y install python-devel python-virtualenv
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
new file mode 100755
index 00000000..2044310c
--- /dev/null
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -ex
+
+$(dirname $0)/../common/linux/cmake_linux.sh
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh
index 15b46aef..e5a4208b 100755
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -35,9 +35,9 @@
# 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 -e
+set -ex
mainStorage="ci-files01-hki.intra.qt.io:/hdd/www/input"
localMount="/mnt/storage/"
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh
index e367c20b..04c09770 100644..100755
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/mqtt_broker.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh
@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -33,4 +33,4 @@
##
#############################################################################
-source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh"
+source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh"
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh
new file mode 100755
index 00000000..5ff78055
--- /dev/null
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+set -ex
+
+# Having proxy set while running autotests makes them fail
+sudo sed -i 's/PROXY_ENABLED=\"yes\"/PROXY_ENABLED=\"no\"/' /etc/sysconfig/proxy
+
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/mqtt_broker.sh
deleted file mode 100644
index e367c20b..00000000
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/mqtt_broker.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the test suite of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh
deleted file mode 100755
index ddb01d64..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-BASEDIR=$(dirname "$0")
-$BASEDIR/../common/cmake.sh
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh
deleted file mode 100644
index cd4e3fd9..00000000
--- a/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh
+++ /dev/null
@@ -1 +0,0 @@
-source "${BASH_SOURCE%/*}/../common/python3.sh"
diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/003-bashprofile.sh b/coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh
index 0fbe7628..2c3e45f3 100644..100755
--- a/coin/provisioning/qtci-osx-10.10-x86_64/003-bashprofile.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh
@@ -1,4 +1,6 @@
-#!/bin/sh
+#!/usr/bin/env sh
+
+set -ex
# Read .bashrc if exist
printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n . ~/.bashrc\nfi\n" >> ~/.bash_profile
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh
index 4a07bbbe..20430d6a 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -33,10 +33,12 @@
##
#############################################################################
+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
@@ -126,4 +128,3 @@ catch || {
;;
esac
}
-
diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh b/coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh
index ba8dbdd3..8461c656 100644..100755
--- a/coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh
@@ -1,2 +1,5 @@
-#!/bin/sh
+#!/usr/bin/env sh
+
+set -ex
+
defaults write com.apple.CrashReporter DialogType server
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh b/coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh
index 61406203..b68d62f8 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh
@@ -1,3 +1,6 @@
-#!/bin/sh
+#!/usr/bin/env sh
+
+set -ex
+
# Enables the usage of temporary keychains for SSL autotests
echo "export QT_SSL_USE_TEMPORARY_KEYCHAIN=1" >> ~/.bashrc
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh
index ef676ab3..34202209 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -37,8 +37,10 @@
# XZ-Utils are needed for uncompressing xz-compressed files
-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/InstallPKGFromURL.sh"
+set -ex
+
+# 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/020-java.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh
index 743cc9da..66e4dfde 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -34,10 +34,13 @@
#############################################################################
# This script installs JDK
+
+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/020-xcode.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh
index 6d57bfaa..a0611154 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -42,10 +42,12 @@
# This will give you a file called "Content.part00.cpio.xz" that
# can be renamed to Xcode_8.xz for this script.
-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/try_catch.sh"
+set -ex
-# shellcheck source=../common/install_xcode.sh
-source "${BASH_SOURCE%/*}/../common/install_xcode.sh"
+# shellcheck source=../common/unix/try_catch.sh
+source "${BASH_SOURCE%/*}/../common/unix/try_catch.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/021-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh
index b460cc02..d534e74d 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -32,7 +32,10 @@
## $QT_END_LICENSE$
##
#############################################################################
-source "${BASH_SOURCE%/*}/../common/install-commandlinetools.sh"
+
+set -ex
+
+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/025-homebrew.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh
index 63ec9b69..e5dd1910 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh
@@ -1,4 +1,6 @@
#!/usr/bin/env bash
+set -ex
+
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/homebrew.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
new file mode 100755
index 00000000..0ead5a58
--- /dev/null
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/macos/homebrew.sh
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh
index ca21f481..b47f9705 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -37,8 +37,10 @@
# MySQL is needed for Qt to be able to support MySQL
-# shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh"
+set -ex
+
+# 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/030-fbx.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh
index 50c6796b..69c6b318 100644..100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/030-fbx.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh
@@ -1,5 +1,6 @@
#!/usr/bin/env bash
-BASEDIR=$(dirname "$0")
-$BASEDIR/../common/fbx_macos.sh
+set -ex
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/macos/pip.sh
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh
index cb5c1852..8f3f85ec 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -37,8 +37,10 @@
# PostgreSQL is needed for Qt to be able to support PostgreSQL
-# shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh"
+set -ex
+
+# 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
new file mode 100755
index 00000000..92b05bf3
--- /dev/null
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -ex
+
+source "${BASH_SOURCE%/*}/../common/macos/python3.sh"
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh
index 4fb9ddbc..15511332 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh
@@ -1,4 +1,7 @@
#!/usr/bin/env bash
# Install 7z to be used from command line
+
+set -ex
+
brew update
brew install p7zip
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
new file mode 100755
index 00000000..a35d26ca
--- /dev/null
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/macos/virtualenv.sh
diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/08-libclang.sh b/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh
index d257ffa1..fea11e01 100755
--- a/coin/provisioning/qtci-osx-10.9-x86_64/08-libclang.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh
@@ -1,5 +1,7 @@
#!/usr/bin/env bash
+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/030-android.sh b/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh
index bc8a95e6..b6e731f2 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -37,8 +37,10 @@
# It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version
-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/try_catch.sh"
+set -ex
+
+# 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
new file mode 100755
index 00000000..9ce5d9ff
--- /dev/null
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/macos/fbx_macos.sh
+
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh
index d109051d..ccff42c3 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -35,10 +35,12 @@
# This script install OpenSSL
-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/try_catch.sh"
-# shellcheck source=../common/InstallFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
+set -ex
+
+# 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-macos-10.12-x86_64/555-signtools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh
index 49e087a8..e1a41835 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/555-signtools.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
#############################################################################
##
diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh
deleted file mode 100755
index b05dcf1c..00000000
--- a/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-BASEDIR=$(dirname "$0")
-$BASEDIR/../common/system_updates.sh
diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh b/coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh
deleted file mode 100755
index ddb01d64..00000000
--- a/coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-BASEDIR=$(dirname "$0")
-$BASEDIR/../common/cmake.sh
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh b/coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh
index ba8dbdd3..8461c656 100644..100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh
@@ -1,2 +1,5 @@
-#!/bin/sh
+#!/usr/bin/env sh
+
+set -ex
+
defaults write com.apple.CrashReporter DialogType server
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
new file mode 100755
index 00000000..94b53309
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/macos/system_updates.sh
diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh
index 44df94e7..e799344a 100644..100755
--- a/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh
@@ -1,4 +1,6 @@
-#!/bin/sh
+#!/usr/bin/env sh
+
+set -ex
mkdir -p $HOME/Library/LaunchAgents
cat >$HOME/Library/LaunchAgents/no-screensaver.plist <<EOT
diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh
deleted file mode 100644
index cd4e3fd9..00000000
--- a/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh
+++ /dev/null
@@ -1 +0,0 @@
-source "${BASH_SOURCE%/*}/../common/python3.sh"
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/003-bashprofile.sh b/coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh
index 0fbe7628..2c3e45f3 100644..100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/003-bashprofile.sh
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh
@@ -1,4 +1,6 @@
-#!/bin/sh
+#!/usr/bin/env sh
+
+set -ex
# Read .bashrc if exist
printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n . ~/.bashrc\nfi\n" >> ~/.bash_profile
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh b/coin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh
index 07c9a617..e5dd1910 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh
@@ -1,4 +1,6 @@
#!/usr/bin/env bash
+set -ex
+
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/pip.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 d257ffa1..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
@@ -1,5 +1,7 @@
#!/usr/bin/env bash
+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
new file mode 100755
index 00000000..92b05bf3
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -ex
+
+source "${BASH_SOURCE%/*}/../common/macos/python3.sh"
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh
deleted file mode 100755
index b05dcf1c..00000000
--- a/coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-BASEDIR=$(dirname "$0")
-$BASEDIR/../common/system_updates.sh
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh b/coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh
index ba8dbdd3..8461c656 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh
@@ -1,2 +1,5 @@
-#!/bin/sh
+#!/usr/bin/env sh
+
+set -ex
+
defaults write com.apple.CrashReporter DialogType server
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
new file mode 100755
index 00000000..94b53309
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/01-system_updates.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/macos/system_updates.sh
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh
deleted file mode 100755
index ddb01d64..00000000
--- a/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-BASEDIR=$(dirname "$0")
-$BASEDIR/../common/cmake.sh
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh
deleted file mode 100755
index 63ec9b69..00000000
--- a/coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-BASEDIR=$(dirname "$0")
-$BASEDIR/../common/homebrew.sh
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh
deleted file mode 100644
index cd4e3fd9..00000000
--- a/coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh
+++ /dev/null
@@ -1 +0,0 @@
-source "${BASH_SOURCE%/*}/../common/python3.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh b/coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh
index 0fbe7628..2c3e45f3 100644..100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh
@@ -1,4 +1,6 @@
-#!/bin/sh
+#!/usr/bin/env sh
+
+set -ex
# Read .bashrc if exist
printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n . ~/.bashrc\nfi\n" >> ~/.bash_profile
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh b/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh
index 5819e9de..5cb067a7 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -35,8 +35,10 @@
# This script modified system settings for automated use
-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/try_catch.sh"
+set -ex
+
+# shellcheck source=../common/unix/try_catch.sh
+source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
VNCPassword=qt
NTS_IP=10.212.2.216
@@ -126,3 +128,4 @@ catch || {
;;
esac
}
+
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh b/coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh
index 61406203..b68d62f8 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh
@@ -1,3 +1,6 @@
-#!/bin/sh
+#!/usr/bin/env sh
+
+set -ex
+
# Enables the usage of temporary keychains for SSL autotests
echo "export QT_SSL_USE_TEMPORARY_KEYCHAIN=1" >> ~/.bashrc
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh b/coin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh
deleted file mode 100755
index d257ffa1..00000000
--- a/coin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-BASEDIR=$(dirname "$0")
-# There is only one mac package and common script uses it as a default
-$BASEDIR/../common/libclang.sh
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh b/coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh
index 8a3999b9..9f66cc66 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -37,8 +37,10 @@
# XZ-Utils are needed for uncompressing xz-compressed files
-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/InstallPKGFromURL.sh"
+set -ex
+
+# 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/020-xcode.sh b/coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh
index 37acc2ee..b1e1d657 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -42,12 +42,12 @@
# This will give you a file called "Content.part00.cpio.xz" that
# can be renamed to Xcode_8.xz for this script.
+set -ex
+# shellcheck source=../common/unix/try_catch.sh
+source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/try_catch.sh"
-
-# shellcheck source=../common/install_xcode.sh
-source "${BASH_SOURCE%/*}/../common/install_xcode.sh"
+# shellcheck source=../common/macos/install_xcode.sh
+source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"
InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_8.2.xz 8.2
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh b/coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh
index 9145c12a..cb7dcfc6 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -32,7 +32,10 @@
## $QT_END_LICENSE$
##
#############################################################################
-source "${BASH_SOURCE%/*}/../common/install-commandlinetools.sh"
+
+set -ex
+
+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-macos-10.12-x86_64/026-virtualenv.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-cmake.sh
index 9e4f1d3e..e5dd1910 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-cmake.sh
@@ -1,4 +1,6 @@
#!/usr/bin/env bash
+set -ex
+
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/virtualenv.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
new file mode 100755
index 00000000..0ead5a58
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-homebrew.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/macos/homebrew.sh
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh
index 1e4de16a..89534baf 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -37,8 +37,10 @@
# MySQL is needed for Qt to be able to support MySQL
-# shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh"
+set -ex
+
+# shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh
+source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/mysql-5.7.15-osx10.11-x86_64.tar.gz"
AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz"
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh
index a990829e..8d88630b 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#############################################################################
##
@@ -37,8 +37,10 @@
# PostgreSQL is needed for Qt to be able to support PostgreSQL
-# shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh"
+set -ex
+
+# 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
new file mode 100755
index 00000000..92b05bf3
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -ex
+
+source "${BASH_SOURCE%/*}/../common/macos/python3.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh b/coin/provisioning/qtci-osx-10.11-x86_64/26-p7zip.sh
index 4fb9ddbc..15511332 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/26-p7zip.sh
@@ -1,4 +1,7 @@
#!/usr/bin/env bash
# Install 7z to be used from command line
+
+set -ex
+
brew update
brew install p7zip
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh b/coin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh
index d257ffa1..fea11e01 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh
@@ -1,5 +1,7 @@
#!/usr/bin/env bash
+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.8-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh
deleted file mode 100755
index b05dcf1c..00000000
--- a/coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-BASEDIR=$(dirname "$0")
-$BASEDIR/../common/system_updates.sh
diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh
deleted file mode 100644
index cd4e3fd9..00000000
--- a/coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh
+++ /dev/null
@@ -1 +0,0 @@
-source "${BASH_SOURCE%/*}/../common/python3.sh"
diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.9-x86_64/001-system_updates.sh
deleted file mode 100755
index b05dcf1c..00000000
--- a/coin/provisioning/qtci-osx-10.9-x86_64/001-system_updates.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-BASEDIR=$(dirname "$0")
-$BASEDIR/../common/system_updates.sh
diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh
deleted file mode 100644
index cd4e3fd9..00000000
--- a/coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh
+++ /dev/null
@@ -1 +0,0 @@
-source "${BASH_SOURCE%/*}/../common/python3.sh"
diff --git a/coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1
deleted file mode 100644
index f92acd91..00000000
--- a/coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\disable-windefender.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1
deleted file mode 100644
index 167cfd35..00000000
--- a/coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\wsearch-off.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1
index 1042c846..ee3b3b7d 100644
--- a/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\disable-ntp.ps1"
+. "$PSScriptRoot\..\common\windows\disable-ntp.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/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
new file mode 100644
index 00000000..8f94b3d5
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\disable-windefender.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/msvc.ps1 b/coin/provisioning/qtci-windows-10-x86/05-msvc.ps1
index 1de57a66..1de57a66 100644
--- a/coin/provisioning/qtci-windows-10-x86/msvc.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/05-msvc.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
new file mode 100644
index 00000000..eed6b734
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1
@@ -0,0 +1 @@
+. "$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
new file mode 100644
index 00000000..28299307
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/08-python3.ps1
@@ -0,0 +1 @@
+. "$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
new file mode 100644
index 00000000..875b426f
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\install-ruby.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/09-vulkansdk.ps1 b/coin/provisioning/qtci-windows-10-x86/09-vulkansdk.ps1
index 38185051..54a3d563 100644
--- a/coin/provisioning/qtci-windows-10-x86/09-vulkansdk.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/09-vulkansdk.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\vulkansdk.ps1"
+. "$PSScriptRoot\..\common\windows\vulkansdk.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/10-icu.ps1 b/coin/provisioning/qtci-windows-10-x86/10-icu.ps1
new file mode 100644
index 00000000..074a7a6d
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/10-icu.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\icu.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/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/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/22-mqtt_broker.ps1 b/coin/provisioning/qtci-windows-10-x86/22-mqtt_broker.ps1
new file mode 100644
index 00000000..71deb0d4
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/22-mqtt_broker.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\mqtt_broker.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/23-winrtrunner.ps1 b/coin/provisioning/qtci-windows-10-x86/23-winrtrunner.ps1
new file mode 100644
index 00000000..078f862e
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/23-winrtrunner.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\winrtrunner.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/60-jom.ps1 b/coin/provisioning/qtci-windows-10-x86/60-jom.ps1
new file mode 100644
index 00000000..b246ce25
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/60-jom.ps1
@@ -0,0 +1 @@
+. "$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
new file mode 100644
index 00000000..73dc7bc2
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1
@@ -0,0 +1 @@
+. "$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
new file mode 100644
index 00000000..29a1cfa4
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\libusb.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/cmake.ps1 b/coin/provisioning/qtci-windows-10-x86/cmake.ps1
deleted file mode 100644
index 8dbe0372..00000000
--- a/coin/provisioning/qtci-windows-10-x86/cmake.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\cmake.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/icu.ps1 b/coin/provisioning/qtci-windows-10-x86/icu.ps1
deleted file mode 100644
index 325be36a..00000000
--- a/coin/provisioning/qtci-windows-10-x86/icu.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\icu.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/jom.ps1 b/coin/provisioning/qtci-windows-10-x86/jom.ps1
deleted file mode 100644
index 842c65dd..00000000
--- a/coin/provisioning/qtci-windows-10-x86/jom.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\jom.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/libusb.ps1 b/coin/provisioning/qtci-windows-10-x86/libusb.ps1
deleted file mode 100644
index a853ffef..00000000
--- a/coin/provisioning/qtci-windows-10-x86/libusb.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\libusb.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-10-x86/mqtt_broker.ps1
deleted file mode 100644
index df466d52..00000000
--- a/coin/provisioning/qtci-windows-10-x86/mqtt_broker.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\mqtt_broker.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/python3.ps1 b/coin/provisioning/qtci-windows-10-x86/python3.ps1
deleted file mode 100644
index 164fbe43..00000000
--- a/coin/provisioning/qtci-windows-10-x86/python3.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\python3.ps1" 32
diff --git a/coin/provisioning/qtci-windows-10-x86/ruby.ps1 b/coin/provisioning/qtci-windows-10-x86/ruby.ps1
deleted file mode 100644
index 587a4c10..00000000
--- a/coin/provisioning/qtci-windows-10-x86/ruby.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\ruby.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/winrtrunner.ps1 b/coin/provisioning/qtci-windows-10-x86/winrtrunner.ps1
deleted file mode 100644
index 4de520b2..00000000
--- a/coin/provisioning/qtci-windows-10-x86/winrtrunner.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\winrtrunner.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1 b/coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1
deleted file mode 100644
index ae3f327d..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\disable-sleep.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86_64/004-disable-windefender.ps1
deleted file mode 100644
index f92acd91..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windefender.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\disable-windefender.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1
deleted file mode 100644
index c19bf6cd..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\disable-windows-updates.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/005-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86_64/005-wsearch-off.ps1
deleted file mode 100644
index 167cfd35..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/005-wsearch-off.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\wsearch-off.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1
deleted file mode 100644
index f3906f78..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\openssl.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1
index e8e24995..af05e838 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\allow-remote-desktop-access.ps1"
+. "$PSScriptRoot\..\common\windows\allow-remote-desktop-access.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1
new file mode 100644
index 00000000..8f94b3d5
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1
@@ -0,0 +1 @@
+. "$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
new file mode 100644
index 00000000..5bf811ef
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/02-disable-sleep.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\disable-sleep.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1
deleted file mode 100644
index 1f26c731..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\install-notepad++.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/030-fbx.ps1 b/coin/provisioning/qtci-windows-10-x86_64/030-fbx.ps1
deleted file mode 100644
index 82cee080..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/030-fbx.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\fbx_windows.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
new file mode 100644
index 00000000..57428310
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/msvc.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1
index 1de57a66..1de57a66 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/msvc.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.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
new file mode 100644
index 00000000..eed6b734
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1
@@ -0,0 +1 @@
+. "$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
new file mode 100644
index 00000000..3201032d
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1
@@ -0,0 +1 @@
+. "$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 18f67d66..00392e4c 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 64-bit 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 490d1f10..2986db90 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 64-bit 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
new file mode 100644
index 00000000..d57ad1cd
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-openssl.ps1
@@ -0,0 +1 @@
+. "$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/09-vulkansdk.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-vulkansdk.ps1
index 38185051..54a3d563 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/09-vulkansdk.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-vulkansdk.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\vulkansdk.ps1"
+. "$PSScriptRoot\..\common\windows\vulkansdk.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
new file mode 100644
index 00000000..074a7a6d
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/10-icu.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\icu.ps1"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh b/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1
index 4a4031cc..fe1aec7d 100755..100644
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh
+++ b/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1
@@ -1,5 +1,3 @@
-#!/bin/bash
-
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
@@ -32,5 +30,5 @@
## $QT_END_LICENSE$
##
#############################################################################
+. "$PSScriptRoot\..\common\windows\msvc_2015_update3_patch.ps1"
-source "${BASH_SOURCE%/*}/../common/qnx_700.sh"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/22-mqtt_broker.ps1 b/coin/provisioning/qtci-windows-10-x86_64/22-mqtt_broker.ps1
new file mode 100644
index 00000000..71deb0d4
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/22-mqtt_broker.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\mqtt_broker.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/23-winrtrunner.ps1 b/coin/provisioning/qtci-windows-10-x86_64/23-winrtrunner.ps1
new file mode 100644
index 00000000..078f862e
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/23-winrtrunner.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\winrtrunner.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
new file mode 100644
index 00000000..468b0433
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\fbx_windows.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1 b/coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1
deleted file mode 100644
index 3bc58072..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\3dstudio_3rdparty.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
new file mode 100644
index 00000000..b246ce25
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/60-jom.ps1
@@ -0,0 +1 @@
+. "$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
new file mode 100644
index 00000000..73dc7bc2
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps1
@@ -0,0 +1 @@
+. "$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
new file mode 100644
index 00000000..114f52f9
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-3dstudio_3rdparty.ps1
@@ -0,0 +1 @@
+. "$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
new file mode 100644
index 00000000..455d92bf
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-notepad++.ps1
@@ -0,0 +1 @@
+. "$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
new file mode 100644
index 00000000..298375a3
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1
@@ -0,0 +1,51 @@
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
+
+# This script will install VirtualBox
+
+$version = "5.2.4"
+$sha1 = "71df4474a5e94918728b62d1f6bc036674ef0e96"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VirtualBox-" + $version + "-119785-Win.exe"
+$url_official = "http://download.virtualbox.org/virtualbox/" + $version + "/VirtualBox-" + $version + "-119785-Win.exe"
+$virtualboxPackage = "C:\Windows\Temp\virtualbox-$version.exe"
+
+Download $url_official $url_cache $virtualboxPackage
+Verify-Checksum $virtualboxPackage $sha1
+Start-Process $virtualboxPackage -ArgumentList "--silent" -Wait
+
+echo "Cleaning $virtualboxPackage.."
+Remove-Item -Recurse -Force "$virtualboxPackage"
+
+echo "VirtualBox = $version" >> ~\versions.txt
diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1
new file mode 100644
index 00000000..29a1cfa4
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1
@@ -0,0 +1 @@
+. "$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
new file mode 100644
index 00000000..864a79a5
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-mysql.ps1
@@ -0,0 +1,2 @@
+. "$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
new file mode 100644
index 00000000..0e0d87be
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-postgresql.ps1
@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\postgresql.ps1"
+
diff --git a/coin/provisioning/qtci-windows-10-x86_64/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/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-10-x86_64/cmake.ps1 b/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1
deleted file mode 100644
index 8dbe0372..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\cmake.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-10-x86_64/icu.ps1
deleted file mode 100644
index 325be36a..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/icu.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\icu.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-10-x86_64/jom.ps1
deleted file mode 100644
index 842c65dd..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/jom.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\jom.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/libusb.ps1 b/coin/provisioning/qtci-windows-10-x86_64/libusb.ps1
deleted file mode 100644
index a853ffef..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/libusb.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\libusb.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-10-x86_64/mqtt_broker.ps1
deleted file mode 100644
index df466d52..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/mqtt_broker.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\mqtt_broker.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1
deleted file mode 100644
index 37af7119..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1
+++ /dev/null
@@ -1,34 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-. "$PSScriptRoot\..\common\msvc_2015_update3_patch.ps1"
-
diff --git a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
deleted file mode 100644
index f6902153..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
+++ /dev/null
@@ -1,2 +0,0 @@
-. "$PSScriptRoot\..\common\mysql.ps1"
-
diff --git a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1
deleted file mode 100644
index c1d8e13e..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1
+++ /dev/null
@@ -1,2 +0,0 @@
-. "$PSScriptRoot\..\common\postgresql.ps1"
-
diff --git a/coin/provisioning/qtci-windows-10-x86_64/python3.ps1 b/coin/provisioning/qtci-windows-10-x86_64/python3.ps1
deleted file mode 100644
index b0c21996..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/python3.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\python3.ps1" 64
diff --git a/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 b/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1
deleted file mode 100644
index 587a4c10..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\ruby.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/winrtrunner.ps1 b/coin/provisioning/qtci-windows-10-x86_64/winrtrunner.ps1
deleted file mode 100644
index 4de520b2..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/winrtrunner.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\winrtrunner.ps1"
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-install-notepad++.ps1 b/coin/provisioning/qtci-windows-7-x86/02-install-notepad++.ps1
deleted file mode 100644
index 1f26c731..00000000
--- a/coin/provisioning/qtci-windows-7-x86/02-install-notepad++.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\install-notepad++.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
new file mode 100644
index 00000000..28299307
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/08-python3.ps1
@@ -0,0 +1 @@
+. "$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
new file mode 100644
index 00000000..074a7a6d
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/10-icu.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\icu.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/12-icu.ps1 b/coin/provisioning/qtci-windows-7-x86/12-icu.ps1
deleted file mode 100644
index 325be36a..00000000
--- a/coin/provisioning/qtci-windows-7-x86/12-icu.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\icu.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/22-mqtt_broker.ps1 b/coin/provisioning/qtci-windows-7-x86/22-mqtt_broker.ps1
new file mode 100644
index 00000000..71deb0d4
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/22-mqtt_broker.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\mqtt_broker.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/25-python.ps1 b/coin/provisioning/qtci-windows-7-x86/25-python.ps1
deleted file mode 100644
index 5f8aa2f8..00000000
--- a/coin/provisioning/qtci-windows-7-x86/25-python.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\python.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/25-python3.ps1 b/coin/provisioning/qtci-windows-7-x86/25-python3.ps1
deleted file mode 100644
index 164fbe43..00000000
--- a/coin/provisioning/qtci-windows-7-x86/25-python3.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\python3.ps1" 32
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/33-ruby.ps1 b/coin/provisioning/qtci-windows-7-x86/33-ruby.ps1
deleted file mode 100644
index 587a4c10..00000000
--- a/coin/provisioning/qtci-windows-7-x86/33-ruby.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\ruby.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
new file mode 100644
index 00000000..455d92bf
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/90-install-notepad++.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\install-notepad++.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-7-x86/mqtt_broker.ps1
deleted file mode 100644
index df466d52..00000000
--- a/coin/provisioning/qtci-windows-7-x86/mqtt_broker.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\mqtt_broker.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/ruby.ps1 b/coin/provisioning/qtci-windows-7-x86/ruby.ps1
deleted file mode 100644
index 587a4c10..00000000
--- a/coin/provisioning/qtci-windows-7-x86/ruby.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\ruby.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 b/coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1
deleted file mode 100644
index 587a4c10..00000000
--- a/coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\ruby.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1 b/coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1
deleted file mode 100644
index 2303699c..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\disable-uac.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1
deleted file mode 100644
index c19bf6cd..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\disable-windows-updates.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1
deleted file mode 100644
index 16d2e180..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\set-network-test-server.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1
deleted file mode 100644
index e8e24995..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\allow-remote-desktop-access.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1
deleted file mode 100644
index 1042c846..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\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
deleted file mode 100644
index ae3f327d..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\disable-sleep.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1
deleted file mode 100644
index 1f26c731..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\install-notepad++.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1
deleted file mode 100644
index ee3f36a9..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\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
deleted file mode 100644
index f92acd91..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\disable-windefender.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1
deleted file mode 100644
index 167cfd35..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\wsearch-off.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/06-python.ps1 b/coin/provisioning/qtci-windows-8.1-x86/06-python.ps1
deleted file mode 100644
index 44c1c5ff..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/06-python.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\python.ps1" 64
diff --git a/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1
deleted file mode 100644
index b405191e..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\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
deleted file mode 100644
index ad3d5950..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\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
deleted file mode 100644
index f9129cff..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\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
deleted file mode 100644
index 3b64ffec..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\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
deleted file mode 100644
index cc8be923..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\libclang.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
deleted file mode 100644
index 8d549455..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\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
deleted file mode 100644
index 0d28ea1e..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\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
deleted file mode 100644
index 18109622..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\install-strawberry-perl.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1
deleted file mode 100644
index a41035da..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\mysql.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1
deleted file mode 100644
index 92339a45..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\postgresql.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/cmake.ps1 b/coin/provisioning/qtci-windows-8.1-x86/cmake.ps1
deleted file mode 100644
index 8dbe0372..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/cmake.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\cmake.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/icu.ps1 b/coin/provisioning/qtci-windows-8.1-x86/icu.ps1
deleted file mode 100644
index 325be36a..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/icu.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\icu.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86/jom.ps1
deleted file mode 100644
index 842c65dd..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/jom.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\jom.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-8.1-x86/mqtt_broker.ps1
deleted file mode 100644
index df466d52..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/mqtt_broker.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\mqtt_broker.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/openssl.ps1 b/coin/provisioning/qtci-windows-8.1-x86/openssl.ps1
deleted file mode 100644
index f3906f78..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/openssl.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\openssl.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86/python3.ps1
deleted file mode 100644
index 164fbe43..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86/python3.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\python3.ps1" 32
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/001-disable-uac.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/001-disable-uac.ps1
deleted file mode 100644
index 2303699c..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86_64/001-disable-uac.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\disable-uac.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/004-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/004-disable-windows-updates.ps1
deleted file mode 100644
index c19bf6cd..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86_64/004-disable-windows-updates.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\disable-windows-updates.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/009-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/009-set-network-test-server.ps1
deleted file mode 100644
index 16d2e180..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86_64/009-set-network-test-server.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\set-network-test-server.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1
deleted file mode 100644
index e8e24995..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\allow-remote-desktop-access.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps1
deleted file mode 100644
index 1042c846..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\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
deleted file mode 100644
index ae3f327d..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\disable-sleep.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/02-install-notepad++.ps1
deleted file mode 100644
index 1f26c731..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86_64/02-install-notepad++.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\install-notepad++.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1
deleted file mode 100644
index ee3f36a9..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\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
deleted file mode 100644
index f92acd91..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\disable-windefender.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1
deleted file mode 100644
index 167cfd35..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\wsearch-off.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/06-python.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/06-python.ps1
deleted file mode 100644
index 44c1c5ff..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86_64/06-python.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\python.ps1" 64
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/07-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/07-mesa_llvmpipe.ps1
deleted file mode 100644
index b405191e..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86_64/07-mesa_llvmpipe.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\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
deleted file mode 100644
index 6070c80b..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\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
deleted file mode 100644
index f9129cff..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-git.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\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
deleted file mode 100644
index 3b64ffec..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\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
deleted file mode 100644
index 7eeb0a37..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86_64/08-libclang.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\libclang.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
deleted file mode 100644
index 8d549455..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\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
deleted file mode 100644
index 0d28ea1e..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-ruby.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\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
deleted file mode 100644
index 18109622..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-strawberry-perl.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\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
deleted file mode 100644
index a41035da..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86_64/09-mysql.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\mysql.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-postgresql.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-postgresql.ps1
deleted file mode 100644
index 92339a45..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86_64/09-postgresql.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\postgresql.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/cmake.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/cmake.ps1
deleted file mode 100644
index 8dbe0372..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86_64/cmake.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\cmake.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/icu.ps1
deleted file mode 100644
index 325be36a..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86_64/icu.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\icu.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/jom.ps1
deleted file mode 100644
index 842c65dd..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86_64/jom.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\jom.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/mqtt_broker.ps1
deleted file mode 100644
index df466d52..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86_64/mqtt_broker.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\mqtt_broker.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/openssl.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/openssl.ps1
deleted file mode 100644
index f3906f78..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86_64/openssl.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\openssl.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1
deleted file mode 100644
index b0c21996..00000000
--- a/coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\python3.ps1" 64