From e4ae752c0d460cb9a8b3166664319f706f1a1b1a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 18 Sep 2019 15:09:52 +0300 Subject: Provisioning: Make sure that Configure and Make will pass MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During powershell process error is not caught and provisioning continues even if the exitcode is something else that '0' Task-number: QTQAINFRA-3214 Change-Id: I91116a78d0c4defe6ba4287913c2394e199be958 Reviewed-by: Tony Sarajärvi Reviewed-by: Mårten Nordheim --- .../common/windows/android-openssl.ps1 | 23 +++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'coin/provisioning/common/windows/android-openssl.ps1') diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index 981fa51d..c3c3156a 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -65,8 +65,25 @@ Remove-Item -Path $zip Write-Host "Configuring OpenSSL $version for Android..." Push-Location $destination # $ must be escaped in powershell... -Start-Process -NoNewWindow -Wait -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"") -Start-Process -NoNewWindow -Wait -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"") + +function CheckExitCode { + + param ( + $p + ) + + if ($p.ExitCode) { + Write-host "Process failed with exit code: $($p.ExitCode)" + exit 1 + } +} + +$configure = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"") +CheckExitCode $configure + +$make = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"") +CheckExitCode $make + Pop-Location Set-EnvironmentVariable "OPENSSL_ANDROID_HOME" "$destination" -- cgit v1.2.3 From 52fe759ebacd4d58945f0dd01b3aecf321e20375 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 18 Sep 2019 13:43:22 +0300 Subject: Provisioning: Upgrade OpenSSL version to 1.1.1d MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Plus removing unused file install_openssl_111a.sh Task-number: QTQAINFRA-3224 Change-Id: If5f9ee12e118e0329eb27f8d3ca9829011874382 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/windows/android-openssl.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'coin/provisioning/common/windows/android-openssl.ps1') diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index c3c3156a..e4306584 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -45,9 +45,9 @@ if (Is64BitWinHost) { # 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.1.1b" +$version = "1.1.1d" $zip = Get-DownloadLocation ("openssl-$version.tar.gz") -$sha1 = "e9710abf5e95c48ebf47991b10cbb48c09dae102" +$sha1 = "056057782325134b76d1931c48f2c7e6595d7ef4" $destination = "C:\Utils\openssl-android-master" # msys unix style paths -- cgit v1.2.3