diff options
author | Liang Qi <liang.qi@qt.io> | 2018-03-10 17:08:25 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-03-10 17:08:46 +0100 |
commit | ec45725ef26cc756df791f6020e1aa97839da365 (patch) | |
tree | 8fcf3dd9129c64794dc2bd376e3b7d9aee9b9b3c /coin/provisioning/common/linux/openssl_for_android_linux.sh | |
parent | d6d6318e987572c8a1bdeee37378371f6c2b0f1e (diff) | |
parent | 5bbeaf6c0d4fe3b5b81ff9003c4bdba1e4991813 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I1c443b44c8ebe41b84ca5bbbb9dc8884a8fdfa8a
Diffstat (limited to 'coin/provisioning/common/linux/openssl_for_android_linux.sh')
-rwxr-xr-x | coin/provisioning/common/linux/openssl_for_android_linux.sh | 40 |
1 files changed, 9 insertions, 31 deletions
diff --git a/coin/provisioning/common/linux/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh index e9f50b87..30022c39 100755 --- a/coin/provisioning/common/linux/openssl_for_android_linux.sh +++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh @@ -36,7 +36,6 @@ # This script install OpenSSL from sources. # Requires GCC and Perl to be in PATH. -source "${BASH_SOURCE%/*}/../unix/try_catch.sh" source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" @@ -51,37 +50,16 @@ sha="36af23887402a5ea4ebef91df8e61654906f58f2" # QTQAINFRA-1436 opensslHome="${installFolder}openssl-1.0.2" -ExceptionDownload=99 -ExceptionTar=100 -ExceptionConfig=101 +DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" -try -( - (DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile") || throw $ExceptionDownload +tar -xzf "$targetFile" -C "$installFolder" +# This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436) +mv "${opensslHome}g" "${opensslHome}" +pushd "$opensslHome" - tar -xzf "$targetFile" -C "$installFolder" || throw $ExceptionTar - # This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436) - mv "${opensslHome}g" "${opensslHome}" - pushd "$opensslHome" - perl Configure shared android || throw $ExceptionConfig +echo "Running configure" +perl Configure shared android - SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome" +SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome" - echo "OpenSSL for Android = $version" >> ~/versions.txt -) -catch || { - case $ex_code in - $ExceptionDownload) - exit 1; - ;; - $ExceptionTar) - echo "Failed to extract $targetFile" - exit 1; - ;; - $ExceptionConfig) - echo "Failed to run 'config'." - exit 1; - ;; - esac - -} +echo "OpenSSL for Android = $version" >> ~/versions.txt |