diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-11-18 19:21:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-11-18 19:21:53 +0100 |
| commit | 6d7ae7ebe1c67bb7264f768eb7050b6355bc6638 (patch) | |
| tree | 081f8d1dec8148d79ea747cd5877923d8188218d /coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 | |
| parent | d8eaed9b0987c32ad62b92565933bd80a83e5f92 (diff) | |
| parent | 4728ffb6200846145e9bfb5d0d6713698921ffc7 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
coin/provisioning/common/linux/docker.sh
Change-Id: Ic5c3fcaa856137de46c6f3830ca75cedb084927d
Diffstat (limited to 'coin/provisioning/qtci-windows-7-x86/09-openssl.ps1')
| -rw-r--r-- | coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 | 8 |
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" |