diff options
author | Liang Qi <liang.qi@qt.io> | 2019-04-14 23:11:30 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-04-14 23:11:30 +0200 |
commit | e10a2d4ffe7a1e55e660a487f8357070afd990c4 (patch) | |
tree | 75119e711cf3d38e891f62d8f931e386763f9e5b /coin/provisioning/common/windows | |
parent | 74eab55ea83a9919e0a3085015d2e522bd351ac1 (diff) | |
parent | f2af07b8edafa15594eed67afb68dc2481721541 (diff) | |
download | qt5-e10a2d4ffe7a1e55e660a487f8357070afd990c4.tar.gz |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.gitmodules
Change-Id: I6f34dcaedd77228215e1cfa92cd12b6334a41834
Diffstat (limited to 'coin/provisioning/common/windows')
-rw-r--r-- | coin/provisioning/common/windows/android.ps1 | 10 | ||||
-rw-r--r-- | coin/provisioning/common/windows/install-breakpad.ps1 | 2 | ||||
-rw-r--r-- | coin/provisioning/common/windows/install-gnuwin32.ps1 (renamed from coin/provisioning/common/windows/msvc_2015_update3_patch.ps1) | 47 | ||||
-rw-r--r-- | coin/provisioning/common/windows/install-mingw.ps1 | 5 |
4 files changed, 22 insertions, 42 deletions
diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index 1b4dd35d..def09116 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -40,10 +40,10 @@ # That's why we need to use Andoid-21 API version in Qt 5.9. # NDK -$ndkVersion = "r18b" -$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip" -$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86.zip" -$ndkChecksum = "4b8b6a4edc0fa967b429c1d6d25adf69acc28803" +$ndkVersion = "r19c" +$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86_64.zip" +$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86_64.zip" +$ndkChecksum = "c4cd8c0b6e7618ca0a871a5f24102e40c239f6a3" $ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion" $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip" @@ -98,7 +98,7 @@ Out-File -FilePath C:\Utils\Android\licenses\android-sdk-license -Encoding utf8 cd $toolsFolder\bin\ $sdkmanager_args += "platforms;$sdkApiLevel", "platform-tools", "build-tools;$sdkBuildToolsVersion" $command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat @sdkmanager_args' -iex $command +Invoke-Expression $command $command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat --licenses' iex $command cmd /c "dir C:\Utils\android" diff --git a/coin/provisioning/common/windows/install-breakpad.ps1 b/coin/provisioning/common/windows/install-breakpad.ps1 index 4a9544cc..7db6d8ac 100644 --- a/coin/provisioning/common/windows/install-breakpad.ps1 +++ b/coin/provisioning/common/windows/install-breakpad.ps1 @@ -87,7 +87,7 @@ catch { git checkout $linux_syscall_support_commit_sha1 } -Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad\src" +Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad" # Write HEAD commit sha to versions txt, so build can be repeated at later date Write-Output "breakpad = $breakpad_commit_sha" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 b/coin/provisioning/common/windows/install-gnuwin32.ps1 index bfbb397a..99862b3c 100644 --- a/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 +++ b/coin/provisioning/common/windows/install-gnuwin32.ps1 @@ -1,6 +1,6 @@ -############################################################################# +############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -29,39 +29,18 @@ ## ## $QT_END_LICENSE$ ## -############################################################################# +############################################################################ . "$PSScriptRoot\helpers.ps1" -# Install Cumulative Servicing Release Visual Studio 2015 update 3 -# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx +# This script will install gnuwin32 -$version = "2015 update3 (KB3165756)" -$packagePath = "C:\Windows\Temp" -$package = $packagePath + "\vs14-kb3165756.exe" -$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/vs14-kb3165756.exe" -$url_official = "http://go.microsoft.com/fwlink/?LinkID=816878" -$sha1 = "6a21d9b291ca75d44baad95e278fdc0d05d84c02" -$preparedPackage = "\\ci-files01-hki.intra.qt.io\provisioning\windows\vs14-kb3165756-update" +$prog = "gnuwin32" +$zipPackage = "$prog.zip" +$temp = "$env:tmp" +$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/$prog/$zipPackage" +$externalUrl = "http://download.qt.io/development_releases/$prog/$zipPackage" +Download $externalUrl $internalUrl "$temp\$zipPackage" +Verify-Checksum "$temp\$zipPackage" "d7a34a385ccde2374b8a2ca3369e5b8a1452c5a5" +Extract-7Zip "$temp\$zipPackage" C:\Utils -if (Test-Path $preparedPackage) { - # The prepared package contains updated packages so that not everything has to be downloaded - Write-Host "Using prepared package" - Copy-Item -Recurse $preparedPackage $packagePath - # Remove the whole downloaded folder - $toRemove = $packagePath + "\vs14-kb3165756-update" - $executable = "$toRemove\vs14-kb3165756.exe" -} else { - Write-Host "Fetching patch for Visual Studio $version..." - Download $url_official $url_cache $package - $executable = $package - # Remove the downloaded executable - $toRemove = $executable -} - -Verify-Checksum $executable $sha1 -Write-Host "Installing patch for Visual Studio $version..." -Run-Executable $executable "/norestart /passive" - -Remove-Item -Force -Recurse -Path $toRemove - -Write-Output "Visual Studio = $version" >> ~\versions.txt +Write-Output "$prog qt5 commit sha = 98c4f1bbebfb3cc6d8e031d36fd1da3c19e634fb" >> ~\versions.txt diff --git a/coin/provisioning/common/windows/install-mingw.ps1 b/coin/provisioning/common/windows/install-mingw.ps1 index 8b7fe41d..bc05ba91 100644 --- a/coin/provisioning/common/windows/install-mingw.ps1 +++ b/coin/provisioning/common/windows/install-mingw.ps1 @@ -37,7 +37,8 @@ function InstallMinGW { Param ( [string] $release = $(BadParam("release file name")), - [string] $sha1 = $(BadParam("SHA1 checksum of the file")) + [string] $sha1 = $(BadParam("SHA1 checksum of the file")), + [string] $suffix = "" ) $arch, $version, $null, $threading, $ex_handling, $build_ver, $revision = $release.split('-') @@ -45,7 +46,7 @@ function InstallMinGW if ($arch -eq "i686") { $win_arch = "Win32" } elseif ($arch -eq "x86_64") { $win_arch = "Win64" } - $envvar = "MINGW$version" + $envvar = "MINGW$version$suffix" $envvar = $envvar -replace '["."]' $targetdir = "C:\$envvar" $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $release + ".7z" |