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

Provisioning: Use prebuilt Android openssl if available

Browse Source 
Android openssl configuration is flaky. Some cases it can't find perl.
Let's use prebuilt package from local cache. If not available then
download sources and configure it.

Task-number: QTQAINFRA-3993
Change-Id: I4b15cba763d88d85dfe7908fa22c2ce5f461f5cc
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 25dbd78d3f)
Reviewed-by: Simo Fält <simo.falt@qt.io>
This commit is contained in:
Heikki Halmet
2021-01-15 09:16:56 +02:00
parent 2874c51d2d
commit efdd6f944b
1 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
############################################################################ ############################################################################
## ##
## Copyright (C) 2020 The Qt Company Ltd. ## Copyright (C) 2021 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/ ## Contact: http://www.qt.io/licensing/
## ##
## This file is part of the provisioning scripts of the Qt Toolkit. ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -47,20 +47,29 @@ if (Is64BitWinHost) {
$version = "1.1.1g" $version = "1.1.1g"
$zip = Get-DownloadLocation ("openssl-$version.tar.gz") $zip = Get-DownloadLocation ("openssl-$version.tar.gz")
$prebuilt_zip = Get-DownloadLocation ("openssl-android-master-$version.zip")
$sha1 = "b213a293f2127ec3e323fb3cfc0c9807664fd997" $sha1 = "b213a293f2127ec3e323fb3cfc0c9807664fd997"
$prebuilt_sha1 = "d799f54e402c00eaa2633d54df1e8295bfac3d7b"
$destination = "C:\Utils\openssl-android-master" $destination = "C:\Utils\openssl-android-master"
$prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-android-master-$version.zip"
# msys unix style paths # msys unix style paths
$ndkPath = "/c/Utils/Android/android-ndk-r21d" $ndkPath = "/c/Utils/Android/android-ndk-r21d"
$openssl_path = "/c/Utils/openssl-android-master" $openssl_path = "/c/Utils/openssl-android-master"
$cc_path = "$ndkPath/toolchains/llvm/prebuilt/windows-x86_64/bin" $cc_path = "$ndkPath/toolchains/llvm/prebuilt/windows-x86_64/bin"
if ((Test-Path $prebuilt_url)) {
Download $prebuilt_url $prebuilt_url $prebuilt_zip
Verify-Checksum $prebuilt_zip $prebuilt_sha1
Extract-7Zip $prebuilt_zip C:\Utils
Remove $prebuilt_zip
} else {
Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
Verify-Checksum $zip $sha1 Verify-Checksum $zip $sha1
Extract-7Zip $zip C:\Utils\tmp Extract-7Zip $zip C:\Utils\tmp
Extract-7Zip C:\Utils\tmp\openssl-$version.tar C:\Utils\tmp Extract-7Zip C:\Utils\tmp\openssl-$version.tar C:\Utils\tmp
Move-Item C:\Utils\tmp\openssl-${version} $destination Move-Item C:\Utils\tmp\openssl-${version} $destination
Remove-Item -Path $zip Remove "$zip"
Write-Host "Configuring OpenSSL $version for Android..." Write-Host "Configuring OpenSSL $version for Android..."
Push-Location $destination Push-Location $destination
@@ -85,7 +94,8 @@ $make = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "
CheckExitCode $make CheckExitCode $make
Pop-Location Pop-Location
Remove-item C:\Utils\tmp -Recurse -Confirm:$false
}
Set-EnvironmentVariable "OPENSSL_ANDROID_HOME" "$destination" Set-EnvironmentVariable "OPENSSL_ANDROID_HOME" "$destination"
Remove-item C:\Utils\tmp -Recurse -Confirm:$false
Write-Output "Android OpenSSL = $version" >> ~/versions.txt Write-Output "Android OpenSSL = $version" >> ~/versions.txt