aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2019-11-11 14:24:36 +0200
committerHeikki Halmet <heikki.halmet@qt.io>2019-11-18 09:01:38 +0200
commitb92f5652259bd4354a84775bf9aaf785b91c1eaa (patch)
treead76f6fb72a0c9a27c005f22dc08d8c769d80d93
parent6fb05cf7ca78efab4ce562ba3092874aeb152b5e (diff)
Provisioning: Install pre-builded openssl for Windows 7
Task-number: QTQAINFRA-3224 Change-Id: I972b497e1a98f2ebbb6633158714409313cf0506 (cherry picked from commit 569fd1dabc47dccd80331d4f380eae811fd07447) Reviewed-by: Simo Fält <simo.falt@qt.io>
-rw-r--r--coin/provisioning/qtci-windows-7-x86/09-openssl.ps18
1 files changed, 5 insertions, 3 deletions
diff --git a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1
index f90938c4..269771c7 100644
--- a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1
@@ -43,10 +43,10 @@
# nmake install
-$version = "1.1.1b"
+$version = "1.1.1d"
$zip = Get-DownloadLocation ("openssl-$version.7z")
-$sha1 = "7afba53ab984cecb54a1915c135cbb2a20c6b576"
-$url = "http://ci-files01-hki.intra.qt.io/input/openssl/openssl_${version}_prebuild_x86.7z"
+$sha1 = "2bf9379c4cea81858c4288cf06cc3444996bcad5"
+$url = "http://ci-files01-hki.intra.qt.io/input/openssl/openssl_${version}_prebuild_x86_windows7_msvc2010.zip"
Download $url $url $zip
Verify-Checksum $zip $sha1
@@ -55,6 +55,8 @@ $installFolder = "C:\openssl"
Extract-7Zip $zip "C:\"
Remove-Item -Path $zip
+Move-Item -Path C:\openssl_${version}_prebuild_x86_windows7_msvc2010 -Destination C:\openssl
+
Set-EnvironmentVariable "OPENSSL_CONF_x86" "$installFolder\openssl.cnf"
Set-EnvironmentVariable "OPENSSL_INCLUDE_x86" "$installFolder\include"
Set-EnvironmentVariable "OPENSSL_LIB_x86" "$installFolder\lib"