diff options
author | Liang Qi <liang.qi@qt.io> | 2018-06-08 13:19:30 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-06-08 13:19:30 +0200 |
commit | 7b7e0410fd612714e8cb6b5e821f68632a59ca46 (patch) | |
tree | 3159b090b189e4a8c96318220c55a35286905b84 | |
parent | 4ab6c1dace20df2a08e7939c3e32dc6a2ea0e2d3 (diff) | |
parent | eb1ca70defc74e6a81888940e2a35d70d3116d0b (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.11.1
Change-Id: I0bfda3a8816684275bd7f63372684cdf3e8b9ac3
12 files changed, 76 insertions, 20 deletions
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index ae1f98ae..72ec9b61 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -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 diff --git a/coin/provisioning/common/windows/python.ps1 b/coin/provisioning/common/windows/python.ps1 index 05811c58..e2855c75 100644 --- a/coin/provisioning/common/windows/python.ps1 +++ b/coin/provisioning/common/windows/python.ps1 @@ -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 diff --git a/coin/provisioning/common/windows/python3.ps1 b/coin/provisioning/common/windows/python3.ps1 index d5d5998a..473fe65c 100644 --- a/coin/provisioning/common/windows/python3.ps1 +++ b/coin/provisioning/common/windows/python3.ps1 @@ -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 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" diff --git a/coin/provisioning/qtci-windows-7-x86_64/25-python.ps1 b/coin/provisioning/qtci-windows-7-x86_64/25-python.ps1 index 3e825ab8..e2e9be9c 100644 --- a/coin/provisioning/qtci-windows-7-x86_64/25-python.ps1 +++ b/coin/provisioning/qtci-windows-7-x86_64/25-python.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\windows\python.ps1" +. "$PSScriptRoot\..\common\windows\python.ps1" 64 diff --git a/coin/provisioning/qtci-windows-7-x86_64/25-python3.ps1 b/coin/provisioning/qtci-windows-7-x86_64/25-python3.ps1 index 998e6bae..3201032d 100644 --- a/coin/provisioning/qtci-windows-7-x86_64/25-python3.ps1 +++ b/coin/provisioning/qtci-windows-7-x86_64/25-python3.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\windows\python3.ps1" +. "$PSScriptRoot\..\common\windows\python3.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 index 998e6bae..3201032d 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\windows\python3.ps1" +. "$PSScriptRoot\..\common\windows\python3.ps1" 64 |