lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-17 17:56:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.11' into 5.11.1

Browse Source 
Change-Id: I0bfda3a8816684275bd7f63372684cdf3e8b9ac3
This commit is contained in:
Liang Qi
2018-06-08 13:19:30 +02:00
parent 4ab6c1dace eb1ca70def
commit 7b7e0410fd
12 changed files with 76 additions and 20 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

28
coin/provisioning/common/windows/python.ps1
View File

@@ -30,13 +30,17 @@
## $QT_END_LICENSE$
##
#############################################################################
. "$PSScriptRoot\helpers.ps1"
# This script installs Python $version.
# Python is required for building Qt 5 from source.
param(
[Int32]$archVer=32,
[string]$targetDir="C:\Python27"
)
. "$PSScriptRoot\helpers.ps1"
$version = "2.7.13"
if (Is64BitWinHost) {
if ( $archVer -eq 64 ) {
$arch = ".amd64"
$sha1 = "d9113142bae8829365c595735e1ad1f9f5e2894c"
} else {
@@ -51,17 +55,25 @@ Write-Host "Fetching from URL..."
Download $externalUrl $internalUrl $package
Verify-Checksum $package $sha1
Write-Host "Installing $package..."
Run-Executable "msiexec" "/passive /i $package ALLUSERS=1"
Run-Executable "msiexec" "/passive /i $package TARGETDIR=$targetDir ALLUSERS=1"
# We need to change allowZip64 from 'False' to 'True' to be able to create ZIP files that use the ZIP64 extensions when the zipfile is larger than 2 GB
Write-Host "Changing allowZip64 value to 'True'..."
(Get-Content C:\Python27\lib\zipfile.py) | ForEach-Object { $_ -replace "allowZip64=False", "allowZip64=True" } | Set-Content C:\Python27\lib\zipfile.py
(Get-Content $targetDir\lib\zipfile.py) | ForEach-Object { $_ -replace "allowZip64=False", "allowZip64=True" } | Set-Content $targetDir\lib\zipfile.py
Write-Host "Remove $package..."
Remove-Item -Path $package
Add-Path "C:\Python27;C:\Python27\Scripts"
# When installing 32 bit python to 64 bit host, we want to keep only default python in path
# For cross-compilation we export some helper env variable
if (($archVer -eq 32) -And (Is64BitWinHost)) {
Set-EnvironmentVariable "PYTHON2_32_PATH" "$targetDir"
Set-EnvironmentVariable "PIP2_32_PATH" "$targetDir\Scripts"
} else {
Add-Path "$targetDir;$targetDir\Scripts"
}
Run-Executable "C:\Python27\python.exe" "-m ensurepip"
Run-Executable "$targetDir\python.exe" "-m ensurepip"
# Install python virtual env
if (IsProxyEnabled) {
@@ -69,6 +81,6 @@ if (IsProxyEnabled) {
Write-Host "Using proxy ($proxy) with pip"
$pip_args = "--proxy=$proxy"
}
Run-Executable "C:\Python27\Scripts\pip.exe" "$pip_args install virtualenv"
Run-Executable "$targetDir\Scripts\pip.exe" "$pip_args install virtualenv"
Write-Output "Python = $version" >> ~/versions.txt
Write-Output "Python-$archVer = $version" >> ~/versions.txt

25
coin/provisioning/common/windows/python3.ps1
View File

@@ -32,18 +32,20 @@
##
#############################################################################
. "$PSScriptRoot\helpers.ps1"
# This script installs Python $version.
# Python3 is required for building some qt modules.
param(
[Int32]$archVer=32,
[string]$install_path = "C:\Python36"
)
. "$PSScriptRoot\helpers.ps1"
$version = "3.6.1"
$package = "C:\Windows\temp\python-$version.exe"
$install_path = "C:\Python36"
# check bit version
if (Is64BitWinHost) {
Write-Host "Running in 64 bit system"
if ( $archVer -eq 64 ) {
Write-Host "Installing 64 bit Python"
$externalUrl = "https://www.python.org/ftp/python/$version/python-$version-amd64.exe"
$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/python-$version-amd64.exe"
$sha1 = "bf54252c4065b20f4a111cc39cf5215fb1edccff"
@@ -61,8 +63,15 @@ Run-Executable "$package" "/q TargetDir=$install_path"
Write-Host "Remove $package..."
Remove-Item -Path $package
Set-EnvironmentVariable "PYTHON3_PATH" "$install_path"
Set-EnvironmentVariable "PIP3_PATH" "$install_path\Scripts"
# For cross-compilation we export some helper env variable
if (($archVer -eq 32) -And (Is64BitWinHost)) {
Set-EnvironmentVariable "PYTHON3_32_PATH" "$install_path"
Set-EnvironmentVariable "PIP3_32_PATH" "$install_path\Scripts"
} else {
Set-EnvironmentVariable "PYTHON3_PATH" "$install_path"
Set-EnvironmentVariable "PIP3_PATH" "$install_path\Scripts"
}
# Install python virtual env
if (IsProxyEnabled) {
@@ -72,5 +81,5 @@ if (IsProxyEnabled) {
}
Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install virtualenv"
Write-Output "Python3 = $version" >> ~/versions.txt
Write-Output "Python3-$archVer = $version" >> ~/versions.txt

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
}

1
coin/provisioning/qtci-windows-10-x86_64/02-python-32bit.ps1 Normal file
View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\python.ps1" 32 "C:\Python27_32"

1
coin/provisioning/qtci-windows-10-x86_64/08-python3-32.ps1 Normal file
View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "C:\Python36_32"

2
coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1
View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\windows\python3.ps1"
. "$PSScriptRoot\..\common\windows\python3.ps1" 64

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"

2
coin/provisioning/qtci-windows-7-x86_64/25-python.ps1
View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\windows\python.ps1"
. "$PSScriptRoot\..\common\windows\python.ps1" 64

2
coin/provisioning/qtci-windows-7-x86_64/25-python3.ps1
View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\windows\python3.ps1"
. "$PSScriptRoot\..\common\windows\python3.ps1" 64

2
coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1
View File

@@ -1 +1 @@
. "$PSScriptRoot\..\common\windows\python3.ps1"
. "$PSScriptRoot\..\common\windows\python3.ps1" 64