From 6d2929d1aaa97454619725211eee4ff65c54b95e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Fri, 18 Aug 2017 12:32:37 +0300 Subject: Provisioning: Move Android toolchain and config to win10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Installing Android toolchains and ssl headers to win10 template and moving Android windows platform configs to win10 from win7. Task-number: QTQAINFRA-1266 Change-Id: I9b3e3a378451e0bdfc7dc5c7b75ee035faf8994c Reviewed-by: Tony Sarajärvi (cherry picked from commit 5a040ca46a46a3a45fa61036ca5115c4d0819034) --- coin/platform_configs/qt5.txt | 6 +++--- coin/provisioning/common/windows/android-openssl.ps1 | 2 +- coin/provisioning/common/windows/msys.ps1 | 16 ++++++++++++++++ coin/provisioning/qtci-windows-10-x86_64/04-msys.ps1 | 1 + .../qtci-windows-10-x86_64/10-openssl_for_android.ps1 | 1 + coin/provisioning/qtci-windows-10-x86_64/40-android.ps1 | 1 + coin/provisioning/qtci-windows-7-x86/04-msys.ps1 | 16 ---------------- coin/provisioning/qtci-windows-7-x86/30-android.ps1 | 1 - .../qtci-windows-7-x86/31-android_openssl.ps1 | 1 - 9 files changed, 23 insertions(+), 22 deletions(-) create mode 100644 coin/provisioning/common/windows/msys.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/04-msys.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/40-android.ps1 delete mode 100644 coin/provisioning/qtci-windows-7-x86/04-msys.ps1 delete mode 100644 coin/provisioning/qtci-windows-7-x86/30-android.ps1 delete mode 100644 coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1 (limited to 'coin') diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 5a189f25..3de18a74 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -8,9 +8,9 @@ qtci-windows-10-x86_64-10 Mingw73 qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-7-x86-3 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-7-x86-3 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index 5390dfae..4fe5e5ee 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -54,7 +54,7 @@ Remove-Item -Path $zip Remove-Item C:\Utils\openssl-$version.tar Set-EnvironmentVariable "CC" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\clang" -Set-EnvironmentVariable "AR" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\llvm-ar" +Set-EnvironmentVariable "ANDROID_AR" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\llvm-ar" Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\Android\android-ndk-r18b\platforms\android-21\arch-arm\usr" # Make sure configure for openssl has a "make" and "perl" available diff --git a/coin/provisioning/common/windows/msys.ps1 b/coin/provisioning/common/windows/msys.ps1 new file mode 100644 index 00000000..df67cc20 --- /dev/null +++ b/coin/provisioning/common/windows/msys.ps1 @@ -0,0 +1,16 @@ +. "$PSScriptRoot\helpers.ps1" + +# This script will install msys which is needed for configuring openssl for Android + +$version = "1.0.11" +$url = "\\ci-files01-hki.intra.qt.io\provisioning\windows\msys-$version.7z" + +$zip = Get-DownloadLocation ("msys-$version.7z") +$sha1 = "22cd76f1263db8c72727a9537228c481ff33c285" +$destination = "C:\msys" + +Download $url $url $zip +Verify-Checksum $zip $sha1 +C:\Utils\sevenzip\7z.exe x $zip -oC:\ + +Write-Output "Msys = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/04-msys.ps1 b/coin/provisioning/qtci-windows-10-x86_64/04-msys.ps1 new file mode 100644 index 00000000..44efea92 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/04-msys.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\msys.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 new file mode 100644 index 00000000..25c6f28a --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\android-openssl.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/40-android.ps1 b/coin/provisioning/qtci-windows-10-x86_64/40-android.ps1 new file mode 100644 index 00000000..69799974 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/40-android.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\android.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 deleted file mode 100644 index 24d7a5ca..00000000 --- a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 +++ /dev/null @@ -1,16 +0,0 @@ -. "$PSScriptRoot\..\common\windows\helpers.ps1" - -# This script will install msys which is needed for configuring openssl for Android - -$version = "1.0.11" -$url = "\\ci-files01-hki.intra.qt.io\provisioning\windows\msys-$version.7z" - -$zip = Get-DownloadLocation ("msys-$version.7z") -$sha1 = "22cd76f1263db8c72727a9537228c481ff33c285" -$destination = "C:\msys" - -Download $url $url $zip -Verify-Checksum $zip $sha1 -C:\Utils\sevenzip\7z.exe x $zip -oC:\ - -Write-Output "Msys = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-windows-7-x86/30-android.ps1 b/coin/provisioning/qtci-windows-7-x86/30-android.ps1 deleted file mode 100644 index 69799974..00000000 --- a/coin/provisioning/qtci-windows-7-x86/30-android.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\android.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1 deleted file mode 100644 index 25c6f28a..00000000 --- a/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\android-openssl.ps1" -- cgit v1.2.3