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/common/cmake.ps1 | 2 +- coin/provisioning/common/python.ps1 | 4 ++-- coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 | 4 ++-- 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 +- 7 files changed, 10 insertions(+), 10 deletions(-) (limited to 'coin') diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1 index 6870f3a7..88e2a10c 100644 --- a/coin/provisioning/common/cmake.ps1 +++ b/coin/provisioning/common/cmake.ps1 @@ -2,7 +2,7 @@ $zip = "c:\users\qt\downloads\cmake-3.6.2-win32-x86.zip" -Download https://cmake.org/files/v3.6/cmake-3.6.2-win32-x86.zip http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-win32-x86.zip $zip +Download https://cmake.org/files/v3.6/cmake-3.6.2-win32-x86.zip \\ci-files01-hki.ci.local\provisioning\cmake\cmake-3.6.2-win32-x86.zip $zip Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E" Extract-Zip $zip C: diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/python.ps1 index 3edbc412..ef4be200 100644 --- a/coin/provisioning/common/python.ps1 +++ b/coin/provisioning/common/python.ps1 @@ -43,12 +43,12 @@ $package = "C:\Windows\temp\python-$version.msi" if ( $archVer -eq 64 ) { echo "Running in 64 bit system" $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.amd64.msi" - $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version.amd64.msi" + $internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\python-$version.amd64.msi" $sha1 = "d9113142bae8829365c595735e1ad1f9f5e2894c" } else { $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.msi" - $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version.msi" + $internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\python-$version.msi" $sha1 = "7e3b54236dbdbea8fe2458db501176578a4d59c0" } diff --git a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 index 079f26c3..fa2c753a 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 @@ -40,7 +40,7 @@ $openglPackage = "C:\Windows\SysWOW64\opengl32.dll" $mesaOpenglUrl = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z" $mesaOpenglSha1 = "e742e9d4e16b9c69b6d844940861d3ef1748356b" -$openglUrl = "http://ci-files01-hki.ci.local/input/mesa3d/windows/32bit/opengl32.dll" +$openglUrl = "\\ci-files01-hki.ci.local\provisioning\mesa3d\windows\32bit\opengl32.dll" $openglSha1 = "690730f973aa39bd80648e026248394fde07a753" Invoke-WebRequest -UseBasicParsing $mesaOpenglUrl -OutFile $package diff --git a/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 index 35340ca7..cd0115d2 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 @@ -44,7 +44,7 @@ $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" $architecture = "x64" $installFolder = "C:\openssl" $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe" -$internalUrl = "http://ci-files01-hki.ci.local/input/openssl/Win64OpenSSL-$version.exe" +$internalUrl = "\\ci-files01-hki.ci.local\provisioning\openssl\Win64OpenSSL-$version.exe" $sha1 = "b1660dbdcc77e1b3d81d780c7167be1c75384d44" echo "Fetching from URL ..." @@ -65,7 +65,7 @@ echo "Set $architecture environment variables ..." $architecture = "x86" $installFolder = "C:\openssl$architecture" $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" -$internalUrl = "http://ci-files01-hki.ci.local/input/openssl/Win32OpenSSL-$version.exe" +$internalUrl = "\\ci-files01-hki.ci.local\provisioning\openssl\Win32OpenSSL-$version.exe" $sha1 = "29b31d20545214ab4e4c57afb20be2338c317cc3" echo "Fetching from URL ..." 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