lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-24 16:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Provisioning: Add 64 bit Mingw to coin as packaging target

Browse Source 
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 <oliver.wolff@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
This commit is contained in:
Simo Fält
2018-05-08 15:05:54 +03:00
parent e28ed4a3a4
commit eb1ca70def
4 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coin/platform_configs/qt5.txt
View File

@@ -4,6 +4,7 @@ qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packagin
qtci-windows-10-x86_64-10 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker

22
coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1 Normal file
View File

@@ -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
}

9
coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730_64.ps1 Normal file
View File

@@ -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

1
coin/provisioning/qtci-windows-10-x86_64/10-dxsdk.ps1 Normal file
View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\dxsdk.ps1"