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

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

Browse Source 
Change-Id: Ia167d4f873ed500e3bae798eade6720db6b21750
This commit is contained in:
Liang Qi
2018-05-10 12:38:49 +02:00
parent af8eab0993 f5ef436426
commit 1e5cf1852a
19 changed files with 53 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coin/provisioning/common/linux/openssl_for_android_linux.sh
View File

@@ -41,12 +41,12 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="1.0.2g"
version="1.0.2o"
officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
targetFile="/tmp/openssl-$version.tar.gz"
installFolder="/home/qt/"
sha="36af23887402a5ea4ebef91df8e61654906f58f2"
sha="a47faaca57b47a0d9d5fb085545857cc92062691"
# Until every VM doing Linux Android builds have provisioned the env variable
# OPENSSL_ANDROID_HOME, we can't change the hard coded path that's currently in Coin.
# QTQAINFRA-1436
@@ -56,7 +56,7 @@ DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
tar -xzf "$targetFile" -C "$installFolder"
# This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436)
mv "${opensslHome}g" "${opensslHome}"
mv "${opensslHome}o" "${opensslHome}"
pushd "$opensslHome"
echo "Running configure"

2
coin/provisioning/common/shared/http_proxy.txt
View File

@@ -1,2 +1,2 @@
proxy="http://proxy.intra.qt.io:3128"
proxy=http://proxy.intra.qt.io:3128

2
coin/provisioning/common/shared/sw_versions.txt
View File

@@ -1 +1 @@
libclang_version="4.0"
libclang_version="6.0"

2
coin/provisioning/common/unix/libclang.sh
View File

@@ -55,7 +55,7 @@ if [ $# -eq 0 ]
echo "Using macOS defaults"
version=$libclang_version
url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-mac.7z"
sha1="4781d154b274b2aec99b878c364f0ea80ff00a80"
sha1="10e48167b61726b20517172f8aff80fa1d9a379b"
fi
zip="libclang.7z"

4
coin/provisioning/common/windows/android-openssl.ps1
View File

@@ -39,9 +39,9 @@
# Msys need to be installed to target machine
# More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html
$version = "1.0.2j"
$version = "1.0.2o"
$zip = "c:\users\qt\downloads\openssl-$version.tar.gz"
$sha1 = "bdfbdb416942f666865fa48fe13c2d0e588df54f"
$sha1 = "a47faaca57b47a0d9d5fb085545857cc92062691"
$destination = "C:\Utils\openssl-android-master"
Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip

4
coin/provisioning/common/windows/helpers.ps1
View File

@@ -117,10 +117,10 @@ function Is64BitWinHost
return [environment]::Is64BitOperatingSystem
}
function isProxyEnabled {
function IsProxyEnabled {
return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyEnable
}
function getProxy {
function Get-Proxy {
return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyServer
}

24
coin/provisioning/common/windows/libclang.ps1
View File

@@ -1,6 +1,7 @@
param(
[Int32]$archVer=32,
[string]$toolchain="vs2015"
[string]$toolchain="vs2015",
[bool]$setDefault=$true
)
. "$PSScriptRoot\helpers.ps1"
@@ -11,20 +12,22 @@ param(
Get-Content "$PSScriptRoot\..\shared\sw_versions.txt" | Foreach-Object {
$var = $_.Split('=')
New-Variable -Name $var[0] -Value $var[1]
New-Variable -Name $var[0] -Value $var[1] -Force
$libclang_version = $libclang_version -replace '["."]'
}
$zip = "c:\users\qt\downloads\libclang.7z"
$baseDestination = "C:\Utils\libclang-" + $libclang_version
$baseDestination = "C:\Utils\libclang-" + $libclang_version + "-" + $toolchain
function setURL() {
$script:url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-$toolchain`_$archVer.7z"
}
$toolchainSuffix = ""
if ( $toolchain -eq "vs2015" ) {
if ( $archVer -eq 64 ) {
$sha1 = "dc42beb0efff130c4d7dfef3c97adf26f1ab04e0"
$sha1 = "37afa18d243a50c05bee5c6e16b409ed526ec17a"
$destination = $baseDestination + "-64"
setURL
@@ -37,7 +40,7 @@ if ( $toolchain -eq "vs2015" ) {
}
$archVer=32
$sha1 = "64e826c00ae632fbb28655e6e1fa9194980e1205"
$sha1 = "812b6089c6da99ced9ebebbd42923bd96590519d"
$destination = $baseDestination + "-32"
setURL
@@ -47,11 +50,12 @@ if ( $toolchain -eq "vs2015" ) {
Extract-7Zip $zip C:\Utils\
Rename-Item C:\Utils\libclang $destination
Remove-Item -Force -Path $zip
$toolchainSuffix = "msvc"
}
if ( $toolchain -eq "mingw" ) {
if ( $archVer -eq 64 ) {
$sha1 = "3e318f70a1e76c14365ced65f4fa7031bb730818"
$sha1 = "1233e6c008b90d89483df0291a597a0bac426d29"
$destination = $baseDestination + "-64"
setURL
@@ -64,7 +68,7 @@ if ( $toolchain -eq "mingw" ) {
}
$archVer=32
$sha1 = "a9973192a01a9c16976ed0cc6ef6dac3dbc4a2d3"
$sha1 = "2d6ceab0e1a05e2b19fe615c57b64d36977b4933"
$destination = $baseDestination + "-32"
setURL
@@ -74,7 +78,11 @@ if ( $toolchain -eq "mingw" ) {
Extract-7Zip $zip C:\Utils\
Rename-Item C:\Utils\libclang $destination
Remove-Item -Force -Path $zip
$toolchainSuffix = "mingw"
}
Set-EnvironmentVariable "LLVM_INSTALL_DIR" ($baseDestination + "-_ARCH_")
if ( $setDefault ) {
Set-EnvironmentVariable "LLVM_INSTALL_DIR" ($baseDestination + "-_ARCH_")
}
Set-EnvironmentVariable ("LLVM_INSTALL_DIR_" + $toolchainSuffix) ($baseDestination + "-_ARCH_")
Write-Output "libClang = $libclang_version" >> ~/versions.txt

6
coin/provisioning/common/windows/openssl.ps1
View File

@@ -36,7 +36,7 @@
# This script installs OpenSSL $version.
# Both x86 and x64 versions needed when x86 integrations are done on x64 machine
$version = "1_0_2j"
$version = "1_0_2o"
$packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe"
$packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe"
@@ -47,7 +47,7 @@ if (Is64BitWinHost) {
$installFolder = "C:\openssl"
$externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe"
$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe"
$sha1 = "b1660dbdcc77e1b3d81d780c7167be1c75384d44"
$sha1 = "86c71a28eda53fa406b957dd37491d616344b464"
Write-Host "Fetching from URL ..."
Download $externalUrl $internalUrl $packagex64
@@ -74,7 +74,7 @@ if (Is64BitWinHost) {
$externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe"
$sha1 = "29b31d20545214ab4e4c57afb20be2338c317cc3"
$sha1 = "bfc14fc03bd1d4dd03bf5459f62969d6b0ee96fe"
Write-Host "Fetching from URL ..."
Download $externalUrl $internalUrl $packagex86

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

@@ -64,10 +64,11 @@ Add-Path "C:\Python27;C:\Python27\Scripts"
Run-Executable "C:\Python27\python.exe" "-m ensurepip"
# Install python virtual env
#if (isProxyEnabled) {
# Write-Host "Using proxy with pip"
# $pip_args = "--proxy=" + (getProxy)
#}
Run-Executable "C:\Python27\Scripts\pip.exe" "install virtualenv"
if (IsProxyEnabled) {
$proxy = Get-Proxy
Write-Host "Using proxy ($proxy) with pip"
$pip_args = "--proxy=$proxy"
}
Run-Executable "C:\Python27\Scripts\pip.exe" "$pip_args install virtualenv"
Write-Output "Python = $version" >> ~/versions.txt

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

@@ -65,11 +65,12 @@ Set-EnvironmentVariable "PYTHON3_PATH" "$install_path"
Set-EnvironmentVariable "PIP3_PATH" "$install_path\Scripts"
# Install python virtual env
#if (isProxyEnabled) {
# Write-Host "Using proxy with pip"
# $pip_args = "--proxy=" + (getProxy)
#}
Run-Executable "$install_path\Scripts\pip3.exe" "install virtualenv"
if (IsProxyEnabled) {
$proxy = Get-Proxy
Write-Host "Using proxy ($proxy) with pip"
$pip_args = "--proxy=$proxy"
}
Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install virtualenv"
Write-Output "Python3 = $version" >> ~/versions.txt

2
coin/provisioning/common/windows/set-proxy.ps1
View File

@@ -35,7 +35,7 @@ $n = Get-Content "$PSScriptRoot\..\shared\http_proxy.txt"
$n = $n.Split('=')
New-Variable -Name $n[0] -Value $n[1]
if (([string]::IsNullOrEmpty($proxy)) -or ($proxy -eq '""')) {
if ([string]::IsNullOrEmpty($proxy)) {
Write-Host "No proxy is defined."
} else {
Write-Host "Checking proxy @ $proxy"

2
coin/provisioning/common/windows/unset-proxy.ps1
View File

@@ -32,6 +32,8 @@
#############################################################################
Write-Host "Disabling proxy"
# A bit-mask is needed to disable "Automatically detect settings" from LAN
# settings that disturb and re-enable proxy even after disabling it.
$dcs = (Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings\Connections").DefaultConnectionSettings
$dcs[8] = $_ -band 0xF7
Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings\Connections" -Name DefaultConnectionSettings -Value $dcs

12
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh
View File

@@ -1,12 +0,0 @@
#!/usr/bin/env bash
set -ex
BASEDIR=$(dirname "$0")
# shellcheck source=../common/shared/sw_versions.txt
. "$BASEDIR/../common/shared/sw_versions.txt"
VERSION=$libclang_version
URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z"
SHA1="c7466109628418a6aa3db8b3f5825f847f1c4952"
"$BASEDIR/../common/unix/libclang.sh" "$URL" "$SHA1" "$VERSION"

2
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh
View File

@@ -6,6 +6,6 @@ BASEDIR=$(dirname "$0")
. "$BASEDIR/../common/shared/sw_versions.txt"
VERSION=$libclang_version
URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
SHA1="bbdbbc0296f42310077539b7247d285386119ef4"
SHA1="71194c4d6065a62ac1a891123df79fd9da311bf0"
"$BASEDIR/../common/unix/libclang.sh" "$URL" "$SHA1" "$VERSION"

2
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh
View File

@@ -4,6 +4,6 @@ BASEDIR=$(dirname "$0")
. $BASEDIR/../common/shared/sw_versions.txt
VERSION=$libclang_version
URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
SHA1="bbdbbc0296f42310077539b7247d285386119ef4"
SHA1="71194c4d6065a62ac1a891123df79fd9da311bf0"
$BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION"

2
coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh
View File

@@ -7,6 +7,6 @@ BASEDIR=$(dirname "$0")
. "$BASEDIR/../common/shared/sw_versions.txt"
VERSION=$libclang_version
URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
SHA1="bbdbbc0296f42310077539b7247d285386119ef4"
SHA1="71194c4d6065a62ac1a891123df79fd9da311bf0"
"$BASEDIR/../common/unix/libclang.sh" "$URL" "$SHA1" "$VERSION"

4
coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh
View File

@@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../common/unix/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../common/unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
opensslVersion="1.0.2k"
opensslVersion="1.0.2o"
opensslFile="openssl-$opensslVersion.tar.gz"
opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile"
opensslAltDlUrl="https://www.openssl.org/source/$opensslFile"
opensslSha1="5f26a624479c51847ebd2f22bb9f84b3b44dcb44"
opensslSha1="a47faaca57b47a0d9d5fb085545857cc92062691"
# Below target location has been hard coded into Coin.
# QTQAINFRA-1195

2
coin/provisioning/qtci-windows-10-x86/08-libclang.ps1
View File

@@ -1 +1,3 @@
# Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat
. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 mingw $False
. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 vs2015

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

@@ -1 +1,3 @@
# Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat
. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 mingw $False
. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2015