diff options
| author | Simo Fält <simo.falt@qt.io> | 2017-08-18 12:32:37 +0300 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-17 09:45:05 +0000 |
| commit | 6d2929d1aaa97454619725211eee4ff65c54b95e (patch) | |
| tree | 56618ccb7e63e9ce8a3dc086990bbeac0c6b71e2 /coin/provisioning/qtci-windows-7-x86 | |
| parent | ea0825abe8aadf927376f25620c2e6053470a4ee (diff) | |
Provisioning: Move Android toolchain and config to win10
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 <tony.sarajarvi@qt.io>
(cherry picked from commit 5a040ca46a46a3a45fa61036ca5115c4d0819034)
Diffstat (limited to 'coin/provisioning/qtci-windows-7-x86')
| -rw-r--r-- | coin/provisioning/qtci-windows-7-x86/04-msys.ps1 | 16 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-7-x86/30-android.ps1 | 1 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1 | 1 |
3 files changed, 0 insertions, 18 deletions
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" |