diff options
author | Heikki Halmet <heikki.halmet@qt.io> | 2017-11-02 16:09:11 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-10 07:58:26 +0000 |
commit | 2a28ce864bed677e4ac2477eedf6bee498075d94 (patch) | |
tree | 8fe52c45bc62fd7185fccaa7f4b66baa544fa779 /coin/provisioning/qtci-windows-10-x86_64 | |
parent | 52da24b78eaac04b490b1d4a1750515284521423 (diff) | |
download | qt5-2a28ce864bed677e4ac2477eedf6bee498075d94.tar.gz |
Split Common folder based on operating system families
This change will split common folder to four different folders:
Linux, Unix, Windows and MacOS. Each of these folders includes scripts
which are common for their operating system familes
Task-number: QTQAINFRA-1451
Change-Id: Ic93b2183052335dee875d1452b21e38d268b6474
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64')
37 files changed, 37 insertions, 37 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1 index e8e24995..af05e838 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\allow-remote-desktop-access.ps1" +. "$PSScriptRoot\..\common\windows\allow-remote-desktop-access.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1 index f92acd91..8f94b3d5 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-windefender.ps1" +. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1 index 1042c846..ee3b3b7d 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-ntp.ps1" +. "$PSScriptRoot\..\common\windows\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-disable-sleep.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-sleep.ps1 index ae3f327d..5bf811ef 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/02-disable-sleep.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/02-disable-sleep.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-sleep.ps1" +. "$PSScriptRoot\..\common\windows\disable-sleep.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-python.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-python.ps1 index 44c1c5ff..e2e9be9c 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/02-python.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/02-python.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\python.ps1" 64 +. "$PSScriptRoot\..\common\windows\python.ps1" 64 diff --git a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 index 65aee221..c2068666 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\03-conan.ps1" +. "$PSScriptRoot\..\common\windows\03-conan.ps1" Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` diff --git a/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1 index ee3f36a9..a9044256 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-sevenzip.ps1" +. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1 index c19bf6cd..57428310 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-windows-updates.ps1" +. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 index 3ffe1a06..18ce0581 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 @@ -31,7 +31,7 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\..\common\windows\helpers.ps1" # This script installs QNX SDP 7.0 diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1 index 167cfd35..eed6b734 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\wsearch-off.ps1" +. "$PSScriptRoot\..\common\windows\wsearch-off.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1 index b405191e..1b1a07e9 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1" +. "$PSScriptRoot\..\common\windows\mesa_llvmpipe.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/06-ninja.ps1 b/coin/provisioning/qtci-windows-10-x86_64/06-ninja.ps1 index e46361a0..ba571a1e 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/06-ninja.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/06-ninja.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\ninja.ps1" +. "$PSScriptRoot\..\common\windows\ninja.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1 index f9129cff..38106de7 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-git.ps1" +. "$PSScriptRoot\..\common\windows\install-git.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps1 index 3b64ffec..15065b55 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-jdk.ps1" +. "$PSScriptRoot\..\common\windows\install-jdk.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1 index 7eeb0a37..b6e3582c 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\libclang.ps1" 64 +. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 index b0c21996..3201032d 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\python3.ps1" 64 +. "$PSScriptRoot\..\common\windows\python3.ps1" 64 diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps1 index 8d549455..331de489 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-dependencywalker.ps1" +. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 index 7c4cd8ac..684816f0 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\install-mingw.ps1" +. "$PSScriptRoot\..\common\windows\install-mingw.ps1" # This script will install MinGW 5.3.0 diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 index e11f2310..27612c49 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\install-mingw.ps1" +. "$PSScriptRoot\..\common\windows\install-mingw.ps1" # This script will install MinGW 6.3.0 diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1 index 0d28ea1e..875b426f 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-ruby.ps1" +. "$PSScriptRoot\..\common\windows\install-ruby.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps1 index 18109622..2b5756be 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-strawberry-perl.ps1" +. "$PSScriptRoot\..\common\windows\install-strawberry-perl.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-openssl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-openssl.ps1 index f3906f78..d57ad1cd 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-openssl.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-openssl.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\openssl.ps1" +. "$PSScriptRoot\..\common\windows\openssl.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps1 index 16d2e180..7918fabf 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\set-network-test-server.ps1" +. "$PSScriptRoot\..\common\windows\set-network-test-server.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/10-icu.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-icu.ps1 index 325be36a..074a7a6d 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/10-icu.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/10-icu.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\icu.ps1" +. "$PSScriptRoot\..\common\windows\icu.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 index 37af7119..fe1aec7d 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 @@ -30,5 +30,5 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\common\msvc_2015_update3_patch.ps1" +. "$PSScriptRoot\..\common\windows\msvc_2015_update3_patch.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps1 b/coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps1 index 82cee080..468b0433 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\fbx_windows.ps1" +. "$PSScriptRoot\..\common\windows\fbx_windows.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/30-qnx660.ps1 b/coin/provisioning/qtci-windows-10-x86_64/30-qnx660.ps1 index 39627626..2a71fd55 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/30-qnx660.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/30-qnx660.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-qnx660.ps1" +. "$PSScriptRoot\..\common\windows\install-qnx660.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1 b/coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1 index 41210dcb..de486c97 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\patch_qnx.ps1" +. "$PSScriptRoot\..\common\windows\patch_qnx.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/60-jom.ps1 b/coin/provisioning/qtci-windows-10-x86_64/60-jom.ps1 index 842c65dd..b246ce25 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/60-jom.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/60-jom.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\jom.ps1" +. "$PSScriptRoot\..\common\windows\jom.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps1 b/coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps1 index 8dbe0372..73dc7bc2 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\cmake.ps1" +. "$PSScriptRoot\..\common\windows\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-3dstudio_3rdparty.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-3dstudio_3rdparty.ps1 index 3bc58072..114f52f9 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/90-3dstudio_3rdparty.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/90-3dstudio_3rdparty.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\3dstudio_3rdparty.ps1" +. "$PSScriptRoot\..\common\windows\3dstudio_3rdparty.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-install-notepad++.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-notepad++.ps1 index 1f26c731..455d92bf 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/90-install-notepad++.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-notepad++.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-notepad++.ps1" +. "$PSScriptRoot\..\common\windows\install-notepad++.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1 index 4d09becf..298375a3 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1 @@ -31,7 +31,7 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\..\common\windows\helpers.ps1" # This script will install VirtualBox diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1 index a853ffef..29a1cfa4 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\libusb.ps1" +. "$PSScriptRoot\..\common\windows\libusb.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-mysql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-mysql.ps1 index f6902153..864a79a5 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/90-mysql.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/90-mysql.ps1 @@ -1,2 +1,2 @@ -. "$PSScriptRoot\..\common\mysql.ps1" +. "$PSScriptRoot\..\common\windows\mysql.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-postgresql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-postgresql.ps1 index c1d8e13e..0e0d87be 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/90-postgresql.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/90-postgresql.ps1 @@ -1,2 +1,2 @@ -. "$PSScriptRoot\..\common\postgresql.ps1" +. "$PSScriptRoot\..\common\windows\postgresql.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1 index 882bd1de..7d01edac 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1 @@ -32,7 +32,7 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\..\common\windows\helpers.ps1" # Signing tools are needed to sign offline installers when releasing |