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 | |
parent | 52da24b78eaac04b490b1d4a1750515284521423 (diff) |
Split Common folder based on operating system families
This change will split common folder to four different folders:
Linux, Unix, Windows and MacOS. Each of these folders includes scripts
which are common for their operating system familes
Task-number: QTQAINFRA-1451
Change-Id: Ic93b2183052335dee875d1452b21e38d268b6474
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86')
15 files changed, 15 insertions, 15 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 index 1042c846..ee3b3b7d 100644 --- a/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-ntp.ps1" +. "$PSScriptRoot\..\common\windows\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/02-python.ps1 b/coin/provisioning/qtci-windows-10-x86/02-python.ps1 index 27c618e1..19e64a94 100644 --- a/coin/provisioning/qtci-windows-10-x86/02-python.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/02-python.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\python.ps1" 32 +. "$PSScriptRoot\..\common\windows\python.ps1" 32 diff --git a/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 index 2fc36311..75c6a232 100644 --- a/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/03-conan.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\03-conan.ps1" +. "$PSScriptRoot\..\common\windows\03-conan.ps1" Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` diff --git a/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 index f92acd91..8f94b3d5 100644 --- a/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\disable-windefender.ps1" +. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 index 167cfd35..eed6b734 100644 --- a/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\wsearch-off.ps1" +. "$PSScriptRoot\..\common\windows\wsearch-off.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1 index b405191e..1b1a07e9 100644 --- a/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1" +. "$PSScriptRoot\..\common\windows\mesa_llvmpipe.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/06-ninja.ps1 b/coin/provisioning/qtci-windows-10-x86/06-ninja.ps1 index e46361a0..ba571a1e 100644 --- a/coin/provisioning/qtci-windows-10-x86/06-ninja.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/06-ninja.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\ninja.ps1" +. "$PSScriptRoot\..\common\windows\ninja.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 index cc8be923..3ad5b9fd 100644 --- a/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\libclang.ps1" 32 +. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 diff --git a/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 b/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 index 164fbe43..28299307 100644 --- a/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\python3.ps1" 32 +. "$PSScriptRoot\..\common\windows\python3.ps1" 32 diff --git a/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 index 0d28ea1e..875b426f 100644 --- a/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\install-ruby.ps1" +. "$PSScriptRoot\..\common\windows\install-ruby.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/10-icu.ps1 b/coin/provisioning/qtci-windows-10-x86/10-icu.ps1 index 325be36a..074a7a6d 100644 --- a/coin/provisioning/qtci-windows-10-x86/10-icu.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/10-icu.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\icu.ps1" +. "$PSScriptRoot\..\common\windows\icu.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 index 37af7119..fe1aec7d 100644 --- a/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 @@ -30,5 +30,5 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\common\msvc_2015_update3_patch.ps1" +. "$PSScriptRoot\..\common\windows\msvc_2015_update3_patch.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/60-jom.ps1 b/coin/provisioning/qtci-windows-10-x86/60-jom.ps1 index 842c65dd..b246ce25 100644 --- a/coin/provisioning/qtci-windows-10-x86/60-jom.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/60-jom.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\jom.ps1" +. "$PSScriptRoot\..\common\windows\jom.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 b/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 index 8dbe0372..73dc7bc2 100644 --- a/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\cmake.ps1" +. "$PSScriptRoot\..\common\windows\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 b/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 index a853ffef..29a1cfa4 100644 --- a/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\libusb.ps1" +. "$PSScriptRoot\..\common\windows\libusb.ps1" |