From 5a040ca46a46a3a45fa61036ca5115c4d0819034 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: [PATCH] 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 --- coin/platform_configs/qt5.txt | 6 +++--- .../04-msys.ps1 => common/windows/msys.ps1} | 2 +- coin/provisioning/qtci-windows-10-x86_64/04-msys.ps1 | 1 + .../10-openssl_for_android.ps1} | 0 .../40-android.ps1} | 0 5 files changed, 5 insertions(+), 4 deletions(-) rename coin/provisioning/{qtci-windows-7-x86/04-msys.ps1 => common/windows/msys.ps1} (90%) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/04-msys.ps1 rename coin/provisioning/{qtci-windows-7-x86/31-android_openssl.ps1 => qtci-windows-10-x86_64/10-openssl_for_android.ps1} (100%) rename coin/provisioning/{qtci-windows-7-x86/30-android.ps1 => qtci-windows-10-x86_64/40-android.ps1} (100%) diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 37065eff..88d3cf4a 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/qtci-windows-7-x86/04-msys.ps1 b/coin/provisioning/common/windows/msys.ps1 similarity index 90% rename from coin/provisioning/qtci-windows-7-x86/04-msys.ps1 rename to coin/provisioning/common/windows/msys.ps1 index 24d7a5ca..df67cc20 100644 --- a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 +++ b/coin/provisioning/common/windows/msys.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\windows\helpers.ps1" +. "$PSScriptRoot\helpers.ps1" # This script will install msys which is needed for configuring openssl for Android 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-7-x86/31-android_openssl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/10-openssl_for_android.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/30-android.ps1 b/coin/provisioning/qtci-windows-10-x86_64/40-android.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/30-android.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/40-android.ps1