From 038d26308151b5e15394b9a63b274278a2456662 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 8 May 2017 17:09:23 +0200 Subject: Speed up Windows installation of cmake, python, opengl, mysys and Android MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We're better off copying off the internal server using CIFS than using PowerShell's incredibly slow Invoke-WebRequest. Change-Id: Ic39cf08be70335e9309575d543155bffaceb0db0 Reviewed-by: Tony Sarajärvi Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-windows-7-x86/04-msys.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/06-android.ps1 | 4 ++-- coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'coin/provisioning/qtci-windows-7-x86') diff --git a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 index b75fd2a6..fdb70ef8 100644 --- a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 @@ -3,7 +3,7 @@ # This script will install msys which is needed for configuring openssl for Android $version = "1.0.11" -$url = "http://ci-files01-hki.ci.local/input/windows/msys-$version.7z" +$url = "\\ci-files01-hki.ci.local\provisioning\windows\msys-$version.7z" $zip = "c:\users\qt\downloads\msys-$version.7z" $sha1 = "22cd76f1263db8c72727a9537228c481ff33c285" diff --git a/coin/provisioning/qtci-windows-7-x86/06-android.ps1 b/coin/provisioning/qtci-windows-7-x86/06-android.ps1 index 96be39a3..aa4a4fa5 100644 --- a/coin/provisioning/qtci-windows-7-x86/06-android.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/06-android.ps1 @@ -8,7 +8,7 @@ # NDK $ndkVersion = "r10e" -$ndkCachedUrl = "http://ci-files01-hki.ci.local/input/android/android-ndk-$ndkVersion-windows-x86.zip" +$ndkCachedUrl = "\\ci-files01-hki.ci.local\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip" $ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86.zip" $ndkChecksum = "1d0b8f2835be741f3048fb03c0a3e9f71ab7f357" $ndkFolder = "c:\utils\android-ndk-$ndkVersion" @@ -19,7 +19,7 @@ $sdkVersion = "r24.4.1" $sdkApi = "ANDROID_API_VERSION" $sdkApiLevel = "android-18" $sdkBuildToolsVersion = "23.0.3" -$sdkCachedUrl= "http://ci-files01-hki.ci.local/input/android/android-sdk_$sdkVersion-windows.zip" +$sdkCachedUrl= "\\ci-files01-hki.ci.local\provisioning\android\android-sdk_$sdkVersion-windows.zip" $sdkOfficialUrl = "https://dl.google.com/android/android-sdk_$sdkVersion-windows.zip" $sdkChecksum = "66b6a6433053c152b22bf8cab19c0f3fef4eba49" $sdkFolder = "c:\utils\android-sdk-windows" diff --git a/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 index a1b656c6..14a5a085 100644 --- a/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 @@ -9,7 +9,7 @@ $zip = "c:\users\qt\downloads\openssl-$version.tar.gz" $sha1 = "bdfbdb416942f666865fa48fe13c2d0e588df54f" $destination = "C:\Utils\openssl-android-master" -Download https://www.openssl.org/source/openssl-$version.tar.gz http://ci-files01-hki.ci.local/input/openssl/openssl-$version.tar.gz $zip +Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.ci.local\provisioning\openssl\openssl-$version.tar.gz $zip Verify-Checksum $zip $sha1 C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils -- cgit v1.2.3