aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-windows-7-x86
diff options
context:
space:
mode:
authorJoni Jäntti <joni.jantti@qt.io>2017-06-29 13:46:35 +0300
committerSimon Hausmann <simon.hausmann@qt.io>2017-08-11 16:49:10 +0000
commitbd3ddeddd256557a8b0820f0958b630347344c25 (patch)
tree8cde468970f09f6e3dfd432057a83be5ea3fbcb1 /coin/provisioning/qtci-windows-7-x86
parent043e54c7c6de5ae262731ab48e8960c66d4cc89f (diff)
Make CI use a new win 8.1 provisioning instead of win 8
Added all the provisioning scripts that install required programs and make changes to certain settings. These are needed to build qt5. This replaces the old Windows 8 template. Made all the Windows platforms use the scripts under provisioning/common/ instead of duplicate files. Task-number: QTQAINFRA-1357 Change-Id: Ic3f0b50079b212437fff711379f243753ab84872 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'coin/provisioning/qtci-windows-7-x86')
-rw-r--r--coin/provisioning/qtci-windows-7-x86/004-disable-windefender.ps11
-rw-r--r--coin/provisioning/qtci-windows-7-x86/005-wsearch-off.ps11
-rw-r--r--coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps15
-rw-r--r--coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps13
4 files changed, 2 insertions, 8 deletions
diff --git a/coin/provisioning/qtci-windows-7-x86/004-disable-windefender.ps1 b/coin/provisioning/qtci-windows-7-x86/004-disable-windefender.ps1
new file mode 100644
index 00000000..f92acd91
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/004-disable-windefender.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\disable-windefender.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/005-wsearch-off.ps1 b/coin/provisioning/qtci-windows-7-x86/005-wsearch-off.ps1
new file mode 100644
index 00000000..167cfd35
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/005-wsearch-off.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\wsearch-off.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
deleted file mode 100644
index 2d1f0783..00000000
--- a/coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1
+++ /dev/null
@@ -1,5 +0,0 @@
-# Turning off win defender.
-#
-# If disabled manually, windows will automatically enable it after
-# some period of time. Disabling it speeds up the builds.
-REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender" /V DisableAntiSpyware /T REG_dWORD /D 1 /F
diff --git a/coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1
deleted file mode 100644
index 09c45bbd..00000000
--- a/coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# Disable the windows search indexing service
-sc.exe config WSearch start= disabled