summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-windows-10-x86_64
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-11-27 09:23:05 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-11-28 19:44:30 +0100
commit63c515a6cbb002e96eea0134a77c380e5ef7b7c9 (patch)
tree2322b3189c4ae04e1ac0c7fc21354e1fd59a8749 /coin/provisioning/qtci-windows-10-x86_64
parent3ba8bdeda0fd23bec9de10cb4cf962b50a535af6 (diff)
parent0d6ae070f44236fdceda6241e9564dba93c91d0b (diff)
Merge remote-tracking branch 'origin/dev' into wip/cmake
Also update the Windows config to use MSVC2019 instead of 2017 to circumvent the issue that vcpkg is building libraries with the latest compiler it finds (MSVC 2019), but Qt is building with 2017. Conflicts: coin/platform_configs/default.yaml coin/platform_configs/qt5.yaml coin/platform_configs/qtsaferenderer.yaml Change-Id: I88deb114e171046b50fc617ab6bc18b707d61486
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64')
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/00-disable-windefender.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/02-disable-defragment.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/90-python-modules.ps13
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/98-disable-file-protector.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/98-disable-schedule-tasks.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/98-disable-update-orchestrator.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-update-medic.ps12
9 files changed, 3 insertions, 9 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/00-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86_64/00-disable-windefender.ps1
deleted file mode 100644
index 8f94b3d5..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/00-disable-windefender.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows\disable-windefender.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-disable-defragment.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-defragment.ps1
deleted file mode 100644
index 10518401..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/02-disable-defragment.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows\disable-defragment.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
deleted file mode 100644
index ee3b3b7d..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows\disable-ntp.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1
deleted file mode 100644
index 57428310..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-python-modules.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-python-modules.ps1
new file mode 100644
index 00000000..3646d826
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-python-modules.ps1
@@ -0,0 +1,3 @@
+# Needed by packaging scripts
+C:\Python36\Scripts\pip3 install bs4
+C:\Python36\Scripts\pip3 install sh
diff --git a/coin/provisioning/qtci-windows-10-x86_64/98-disable-file-protector.ps1 b/coin/provisioning/qtci-windows-10-x86_64/98-disable-file-protector.ps1
deleted file mode 100644
index 79802f24..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/98-disable-file-protector.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows\disable-windows-file-protector.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/98-disable-schedule-tasks.ps1 b/coin/provisioning/qtci-windows-10-x86_64/98-disable-schedule-tasks.ps1
deleted file mode 100644
index 9134a735..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/98-disable-schedule-tasks.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows\disable-schedule-tasks.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/98-disable-update-orchestrator.ps1 b/coin/provisioning/qtci-windows-10-x86_64/98-disable-update-orchestrator.ps1
deleted file mode 100644
index 67dcce60..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/98-disable-update-orchestrator.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows\disable-update-orchestrator.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-update-medic.ps1 b/coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-update-medic.ps1
deleted file mode 100644
index 7a6ab935..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-update-medic.ps1
+++ /dev/null
@@ -1,2 +0,0 @@
-. "$PSScriptRoot\..\common\windows\disable-windows-update-medic.ps1"
-