From 2a28ce864bed677e4ac2477eedf6bee498075d94 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 2 Nov 2017 16:09:11 +0200 Subject: Split Common folder based on operating system families MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .../qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/02-python.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 | 2 +- coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1 | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) (limited to 'coin/provisioning/qtci-windows-8.1-x86') diff --git a/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1 index e8e24995..af05e838 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\allow-remote-desktop-access.ps1" +. "$PSScriptRoot\..\common\windows\allow-remote-desktop-access.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1 b/coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1 index 2303699c..51eb0b2b 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-uac.ps1" +. "$PSScriptRoot\..\common\windows\disable-uac.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1 index 1042c846..ee3b3b7d 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-ntp.ps1" +. "$PSScriptRoot\..\common\windows\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1 index ae3f327d..5bf811ef 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-sleep.ps1" +. "$PSScriptRoot\..\common\windows\disable-sleep.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-python.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-python.ps1 index 44c1c5ff..e2e9be9c 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/02-python.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/02-python.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\python.ps1" 64 +. "$PSScriptRoot\..\common\windows\python.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 index ee3f36a9..a9044256 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-sevenzip.ps1" +. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 index f92acd91..8f94b3d5 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-windefender.ps1" +. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1 index c19bf6cd..57428310 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-windows-updates.ps1" +. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1 index 167cfd35..eed6b734 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\wsearch-off.ps1" +. "$PSScriptRoot\..\common\windows\wsearch-off.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1 index b405191e..1b1a07e9 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1" +. "$PSScriptRoot\..\common\windows\mesa_llvmpipe.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 index ad3d5950..b9d8153e 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\vc_redist.ps1" 32 +. "$PSScriptRoot\..\common\windows\vc_redist.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1 index f9129cff..38106de7 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-git.ps1" +. "$PSScriptRoot\..\common\windows\install-git.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1 index 3b64ffec..15065b55 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-jdk.ps1" +. "$PSScriptRoot\..\common\windows\install-jdk.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps1 index cc8be923..3ad5b9fd 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\libclang.ps1" 32 +. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1 index 164fbe43..28299307 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\python3.ps1" 32 +. "$PSScriptRoot\..\common\windows\python3.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1 index 8d549455..331de489 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-dependencywalker.ps1" +. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1 index 0d28ea1e..875b426f 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-ruby.ps1" +. "$PSScriptRoot\..\common\windows\install-ruby.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1 index 18109622..2b5756be 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-strawberry-perl.ps1" +. "$PSScriptRoot\..\common\windows\install-strawberry-perl.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1 index 8540c67d..202d072d 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1 @@ -30,7 +30,7 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\..\common\windows\helpers.ps1" # Install Visual Studio 2013 update 5 diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1 index a41035da..eca19011 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\mysql.ps1" +. "$PSScriptRoot\..\common\windows\mysql.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1 index f3906f78..d57ad1cd 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\openssl.ps1" +. "$PSScriptRoot\..\common\windows\openssl.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1 index 92339a45..451d2452 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\postgresql.ps1" +. "$PSScriptRoot\..\common\windows\postgresql.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1 index 16d2e180..7918fabf 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\set-network-test-server.ps1" +. "$PSScriptRoot\..\common\windows\set-network-test-server.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1 b/coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1 index 325be36a..074a7a6d 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\icu.ps1" +. "$PSScriptRoot\..\common\windows\icu.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1 b/coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1 index 8dbe0372..73dc7bc2 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\cmake.ps1" +. "$PSScriptRoot\..\common\windows\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 index 842c65dd..b246ce25 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\jom.ps1" +. "$PSScriptRoot\..\common\windows\jom.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1 b/coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1 index 1f26c731..455d92bf 100644 --- a/coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-notepad++.ps1" +. "$PSScriptRoot\..\common\windows\install-notepad++.ps1" -- cgit v1.2.3