summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-windows-10-x86_64
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-07-02 13:12:35 +0200
committerLiang Qi <liang.qi@qt.io>2018-07-02 13:12:35 +0200
commitc6d9e433dfa899890b4279c773779659f8cb2626 (patch)
tree1335a5742b5c6eed239f26e616fdad30e1af6271 /coin/provisioning/qtci-windows-10-x86_64
parent7784f89036afca51292ab0cc3aadff59b3004f5f (diff)
parent3e044c71b92617eb8eb794edd30d94f57d9524ac (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts: coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh Change-Id: I00d0ccd138eb8d89e30e7e57632c6fc8f83e0001
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64')
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps122
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/02-python-32bit.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/08-python3-32.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/08-python3.ps12
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730_64.ps19
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/10-dxsdk.ps11
6 files changed, 35 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1
new file mode 100644
index 00000000..e7f4c248
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1
@@ -0,0 +1,22 @@
+# The DirectX SDK installer requires .Net framework 3.5 which isn't installed
+# by default
+
+$netFeature = "NetFx3"
+try {
+ $netFeatureState = (Get-WindowsOptionalFeature -Online -FeatureName "$netFeature").State
+ if ($netFeatureState -eq "Enabled") {
+ Write-Host ".Net Framework is already installed"
+ exit 0
+ }
+} catch {
+ Write-Host "Could not find .Net Framework Windows feature."
+ exit 1
+}
+
+Write-Host "Installing .Net Framework client"
+try {
+ Enable-WindowsOptionalFeature -Online -FeatureName "$netFeature" -All -NoRestart
+} catch {
+ Write-Host "Could not install .Net framework"
+ exit 1
+}
diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-python-32bit.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-python-32bit.ps1
new file mode 100644
index 00000000..bd2d52c3
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/02-python-32bit.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\python.ps1" 32 "C:\Python27_32"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-python3-32.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-python3-32.ps1
new file mode 100644
index 00000000..5ffeab3b
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/08-python3-32.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "C:\Python36_32"
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 998e6bae..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\windows\python3.ps1"
+. "$PSScriptRoot\..\common\windows\python3.ps1" 64
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730_64.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730_64.ps1
new file mode 100644
index 00000000..c928e270
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730_64.ps1
@@ -0,0 +1,9 @@
+. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
+
+# This script will install 64-bit MinGW 7.3.0
+
+$release = "x86_64-7.3.0-release-posix-seh-rt_v5-rev0"
+$sha1 = "0fce15036400568babd10d65b247e9576515da2c"
+
+InstallMinGW $release $sha1
+
diff --git a/coin/provisioning/qtci-windows-10-x86_64/10-dxsdk.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-dxsdk.ps1
new file mode 100644
index 00000000..155df6b8
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/10-dxsdk.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\dxsdk.ps1"