diff options
author | Heikki Halmet <heikki.halmet@qt.io> | 2021-05-20 10:30:22 +0300 |
---|---|---|
committer | Heikki Halmet <heikki.halmet@qt.io> | 2021-11-12 11:47:20 +0200 |
commit | 954f29898db3db1450477c8aa6b5446c55b4af2e (patch) | |
tree | 7657a49bbd4b487eb557ad787cdc21284b47135a | |
parent | 28d65ee09c10fba60392df4e7cbec94d9256ef16 (diff) |
Provisioning: Install OpenSSL 1.1.1k ARM64 for Windows
Task-number: QTBUG-93822
Change-Id: If48dcc4e9542070a6d0303406b2b0544d35879d4
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 30a1ea30a68c5c307562d4c08a14ee36024ddf49)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 7 | ||||
-rw-r--r-- | coin/provisioning/common/windows/openssl-arm64.ps1 | 71 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/09-openssl-arm64.ps1 | 1 |
3 files changed, 77 insertions, 2 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 15039002..be3b4d5c 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -95,9 +95,12 @@ Configurations: Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging'] Platform dependency: 'Windows10-MSVC2019-x64-host' Environment variables: [ - 'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}', 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', - 'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] + 'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}', + 'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}', + 'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}'] - Id: 'RHEL-8.2-host' Template: 'qtci-linux-RHEL-8.2-x86_64-50' diff --git a/coin/provisioning/common/windows/openssl-arm64.ps1 b/coin/provisioning/common/windows/openssl-arm64.ps1 new file mode 100644 index 00000000..bff83eb8 --- /dev/null +++ b/coin/provisioning/common/windows/openssl-arm64.ps1 @@ -0,0 +1,71 @@ +############################################################################# +## +## Copyright (C) 2021 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +. "$PSScriptRoot\helpers.ps1" + +# This script installs OpenSSL ARM64 $version. + +##### OpenSSL ARM64 has been pre-built with following commands ##### +# Two different builds were done to the same folder C:\openssl_arm64\. One with '--debug' and one with '--release' parameter +# From Visual studio 'C++ Universal Windows Platform support for v142 build tools (ARM64)' and 'Windows Universal C Runtime' were installed +# cd C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build +# call vcvarsamd64_arm64 +# +# perl Configure no-asm VC-WIN64-ARM --debug --prefix=C:\openssl_arm64\ --openssldir=C:\openssl_arm64\ +# nmake +# nmake install +# +# perl Configure no-asm VC-WIN64-ARM --release --prefix=C:\openssl_arm64\ --openssldir=C:\openssl_arm64\ +# nmake +# nmake install +################################################################################################################################################# + +$version = "1_1_1_k" +$url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version-arm64.zip" +$sha1 = "e31f6d3a4af225f9314830aad099bb8e5d4a7ff1" +$installFolder = "C:\openssl_arm64" +$zip_package = "C:\Windows\Temp\$version.zip" + +Write-Host "Fetching from URL ..." +Download $url $url $zip_package +Verify-Checksum $zip_package $sha1 +Extract-7Zip $zip_package C:\ +Remove $zip_package + +Set-EnvironmentVariable "OPENSSL_ROOT_DIR_x64_arm64" "$installFolder" +Set-EnvironmentVariable "OPENSSL_CONF_x64_arm64" "$installFolder\bin\openssl.cfg" +Set-EnvironmentVariable "OPENSSL_INCLUDE_x64_arm64" "$installFolder\include" +Set-EnvironmentVariable "OPENSSL_LIB_x64_arm64" "$installFolder\lib" + +# Store version information to ~/versions.txt, which is used to print version information to provision log. +Write-Output "OpenSSL ARM= $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-openssl-arm64.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-openssl-arm64.ps1 new file mode 100644 index 00000000..c1bbf271 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-openssl-arm64.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\openssl-arm64.ps1" |