From 6c295ac7f00f3352a3242b21c90bf3ad1a9fc86a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 15 May 2018 12:35:39 +0300 Subject: Provisioning: Install 32 bit python to 64 bit windows In order to create 32 bit Pyside wheels we have to be able to link Pyside against 32 bit python. While 32 Qt build is done in 64 bit Windows Pyside must follow. Task-number: PYSIDE-646 Change-Id: I30855d4cecd6bc6219021216e9c296d28c56b405 Reviewed-by: Alexandru Croitor Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-windows-10-x86_64/02-python-32bit.ps1 | 1 + coin/provisioning/qtci-windows-10-x86_64/08-python3-32.ps1 | 1 + coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/02-python-32bit.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/08-python3-32.ps1 (limited to 'coin/provisioning/qtci-windows-10-x86_64') 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 -- cgit v1.2.3 From eb1ca70defc74e6a81888940e2a35d70d3116d0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 8 May 2018 15:05:54 +0300 Subject: Provisioning: Add 64 bit Mingw to coin as packaging target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change will provision DirectX SDK with enabler DotNetFramework also, so that configure for MinGW will detect ANGLE correctly. The DirectX headers and libs will be in two location, while those are installed with MSVC also. Task-number: QTBUG-35288 Change-Id: I04ca71a73b22cd4eb27987a368cd9ede03b0e437 Reviewed-by: Oliver Wolff Reviewed-by: Tony Sarajärvi --- .../02-enable-dotnet-framework.ps1 | 22 ++++++++++++++++++++++ .../09-install-mingw730_64.ps1 | 9 +++++++++ .../qtci-windows-10-x86_64/10-dxsdk.ps1 | 1 + 3 files changed, 32 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730_64.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/10-dxsdk.ps1 (limited to 'coin/provisioning/qtci-windows-10-x86_64') 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/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" -- cgit v1.2.3