diff options
Diffstat (limited to 'coin/provisioning/common/windows')
-rw-r--r-- | coin/provisioning/common/windows/android-openssl.ps1 | 4 | ||||
-rw-r--r-- | coin/provisioning/common/windows/android.ps1 | 10 | ||||
-rw-r--r-- | coin/provisioning/common/windows/disable-defragment.ps1 | 42 | ||||
-rw-r--r-- | coin/provisioning/common/windows/docker.ps1 | 85 | ||||
-rw-r--r-- | coin/provisioning/common/windows/dxsdk.ps1 | 14 | ||||
-rw-r--r-- | coin/provisioning/common/windows/helpers.ps1 | 19 | ||||
-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 | ||||
-rw-r--r-- | coin/provisioning/common/windows/install-protobuf.ps1 | 64 | ||||
-rw-r--r-- | coin/provisioning/common/windows/mysql.ps1 | 4 | ||||
-rw-r--r-- | coin/provisioning/common/windows/squishInstall.ps1 | 31 | ||||
-rw-r--r-- | coin/provisioning/common/windows/vc_redist.ps1 | 3 |
13 files changed, 173 insertions, 157 deletions
diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index db53bcc9..cf144c90 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -53,10 +53,6 @@ Rename-Item C:\Utils\openssl-$version $destination Remove-Item -Path $zip Remove-Item C:\Utils\openssl-$version.tar -# Set-EnvironmentVariable "CC" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\clang" -# Set-EnvironmentVariable "ANDROID_AR" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\llvm-ar" -# Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\Android\android-ndk-r18b\platforms\android-21\arch-arm\usr" - # Make sure configure for openssl has a "make" and "perl" available $env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin" 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/disable-defragment.ps1 b/coin/provisioning/common/windows/disable-defragment.ps1 index 876938f8..e76f0649 100644 --- a/coin/provisioning/common/windows/disable-defragment.ps1 +++ b/coin/provisioning/common/windows/disable-defragment.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2018 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. @@ -31,4 +31,42 @@ ## ############################################################################# -schtasks /Delete /TN "\Microsoft\Windows\Defrag\ScheduledDefrag" /F +# Windows 7 does not have Get-ScheduledTask and Unregister-ScheduledTask +# thus needing its own version. +Write-Host "Disabling defragmentation" +$version = Get-CimInstance Win32_OperatingSystem | Select-Object -ExpandProperty Caption +if ($version -like '*Windows 7*'){ + $pi = New-Object System.Diagnostics.ProcessStartInfo + $pi.FileName = "C:\Windows\System32\schtasks.exe" + $pi.RedirectStandardError = $true + $pi.UseShellExecute = $false + $pi.Arguments = "/Delete /TN `"\Microsoft\Windows\Defrag\ScheduledDefrag`" /F" + $prog = New-Object System.Diagnostics.Process + $prog.StartInfo = $pi + $prog.Start() | Out-Null + $err = $prog.StandardError.ReadToEnd() + $prog.WaitForExit() + if ($prog.ExitCode -eq 0){ + Write-Host "Scheduled defragmentation removed" + } else { + if ($err -like '*cannot find the file*'){ + Write-Host "No scheduled defragmentation task found" + exit 0 + } else { + Write-Host "Error while deleting scheduled defragmentation task: $err" + } + } +} +else { + try { + $state = (Get-ScheduledTask -ErrorAction Stop -TaskName "ScheduledDefrag").State + Write-Host "Scheduled defragmentation task found in state: $state" + } + catch { + Write-Host "No scheduled defragmentation task found" + exit 0 + } + Write-Host "Unregistering scheduled defragmentation task" + Unregister-ScheduledTask -ErrorAction Stop -Confirm:$false -TaskName ScheduledDefrag + Write-Host "Scheduled Defragmentation task was cancelled" +} diff --git a/coin/provisioning/common/windows/docker.ps1 b/coin/provisioning/common/windows/docker.ps1 deleted file mode 100644 index 6f53eccd..00000000 --- a/coin/provisioning/common/windows/docker.ps1 +++ /dev/null @@ -1,85 +0,0 @@ -############################################################################# -## -## 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. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -. "$PSScriptRoot\helpers.ps1" - -# This script installs Docker tool kits and Apple Bonjour on Windows. - -function DownloadAndInstall -{ - Param ( - [string]$externalUrl, - [string]$internalUrl, - [string]$package, - [string]$sha1, - [string]$parameters - ) - - Write-Host "Fetching $package from URL..." - Download $externalUrl $internalUrl $package - Verify-Checksum $package $sha1 - - Write-Host "Installing $package..." - Run-Executable $package $parameters - - Write-Host "Remove $package..." - Remove-Item -Path $package -} - -# Install Docker Toolbox -$package = Get-DownloadLocation "DockerToolbox.exe" -$externalUrl = "https://download.docker.com/win/stable/DockerToolbox.exe" -$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/DockerToolbox.exe" -$sha1 = "62325c426ff321d9ebfb89664d65cf9ffaef2985" -DownloadAndInstall $externalUrl $internalUrl $package $sha1 "/SP- /SILENT" -Add-Path 'C:\Program Files\Docker Toolbox' -docker --version -docker-compose --version - -# Install Apple Bonjour -$package = Get-DownloadLocation "BonjourPSSetup.exe" -$externalUrl = "http://support.apple.com/downloads/DL999/en_US/BonjourPSSetup.exe" -$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/BonjourPSSetup.exe" -$sha1 = "847f39e0ea80d2a4d902fe59657e18f5bc32a8cb" -DownloadAndInstall $externalUrl $internalUrl $package $sha1 "/qr" - -# Nested virtualization - Print CPU features to verify that CI has enabled VT-X/AMD-v support -$testserver = "$PSScriptRoot\..\shared\testserver\docker_testserver.sh" -$sysInfoStr = systeminfo -if ($sysInfoStr -like "*A hypervisor has been detected*") { - & 'C:\Program Files\Git\bin\bash.exe' --login $testserver Hyper-V -} elseif ($sysInfoStr -like "*Virtualization Enabled In Firmware: Yes*") { - & 'C:\Program Files\Git\bin\bash.exe' --login $testserver VMX -} else { - Write-Error "VMX not found error! Please make sure Coin has enabled VT-X/AMD-v." -} diff --git a/coin/provisioning/common/windows/dxsdk.ps1 b/coin/provisioning/common/windows/dxsdk.ps1 index ce2bbeb3..f796ae1d 100644 --- a/coin/provisioning/common/windows/dxsdk.ps1 +++ b/coin/provisioning/common/windows/dxsdk.ps1 @@ -4,16 +4,16 @@ $package = "DXSDK_Jun10.exe" -$cacheUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package" +$cachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package" $officialUrl = "https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/$package" -$sdkChecksum = "8fe98c00fde0f524760bb9021f438bd7d9304a69" -$exe = "C:\Windows\Temp\$package" - -Download $officialUrl $cachedUrl $exe +$sdkChecksumSha1 = "8fe98c00fde0f524760bb9021f438bd7d9304a69" +$package_path = "C:\Windows\Temp\$package" +Download $officialUrl $cachedUrl $package_path +Verify-Checksum $package_path $sdkChecksumSha1 sha1 Write-Host "Installing DirectX SDK" -Run-Executable $exe "/u" +Run-Executable $package_path "/u" -Remove-Item -Path $exe +Remove-Item -Path $package_path Write-Output "DirectX SDK = 9.29.1962 (Jun 10)" >> ~\versions.txt diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index 9cd8567e..5a7eb674 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -191,3 +191,22 @@ function Retry{ Throw("Failed to run command successfully in $retry_count tries") } } + +function Remove { + + Param ( + [string]$Path = $(BadParam("a path")) + ) + Write-Host "Removing $Path" + $i = 0 + While ( Test-Path($Path) ){ + Try{ + remove-item -Force -Recurse -Path $Path -ErrorAction Stop + }catch{ + $i +=1 + if ($i -eq 5) {exit 1} + Write-Verbose "$Path locked, trying again in 5" + Start-Sleep -seconds 5 + } + } +} 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" diff --git a/coin/provisioning/common/windows/install-protobuf.ps1 b/coin/provisioning/common/windows/install-protobuf.ps1 new file mode 100644 index 00000000..fd3fb3d3 --- /dev/null +++ b/coin/provisioning/common/windows/install-protobuf.ps1 @@ -0,0 +1,64 @@ +############################################################################# +## +## 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. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# +. "$PSScriptRoot\helpers.ps1" + +# This script will install Google's Protocol Buffers +# Script requires Cmake to be installed and strawberry-perl not to be installed + +$version = "3.6.1" +$sha1 = "44b8ba225f3b4dc45fb56d5881ec6a91329802b6" +$officialUrl = "https://github.com/protocolbuffers/protobuf/releases/download/v$version/protobuf-all-$version.zip" +$cachedUrl = "http://ci-files01-hki.ci.local/input/automotive_suite/protobuf-all-$version.zip" +$zip = "C:\Utils\protobuf-all-$version.zip" +$installationFolder = "C:\Utils\protobuf" + +Write-Host "Installing Protocol Buffers" +Add-Path "C:\CMake\bin" +Download "$officialUrl" "$cachedUrl" "$zip" +Verify-Checksum "$zip" "$sha1" +Extract-7Zip "$zip" C:\Utils +New-Item -ItemType directory -Force -Path "C:\Utils\protobuf-$version\cmake\build" +New-Item -ItemType directory -Force -Path "C:\Utils\protobuf-$version\cmake\build\release" +New-Item -ItemType directory -Force -Path "$installationFolder" +cd "C:\Utils\protobuf-$version\cmake\build\release" +cmd /c "`"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvars64.bat`" && cmake -G `"NMake Makefiles`" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$installationFolder ../.. && nmake && nmake install" +if(![System.IO.File]::Exists("$installationFolder\bin\protoc.exe")){ + Write-Host "Can't find $installationFolder\bin\protoc.exe. Installation probably failed!" + exit 1 +} + +Remove-Item "$zip" + +Add-Path "$installationFolder\bin" +Set-EnvironmentVariable PROTOBUF_INCLUDE "$installationFolder\include" +Set-EnvironmentVariable PROTOBUF_LIB "$installationFolder\lib" diff --git a/coin/provisioning/common/windows/mysql.ps1 b/coin/provisioning/common/windows/mysql.ps1 index 29ce0ab4..8ed91402 100644 --- a/coin/provisioning/common/windows/mysql.ps1 +++ b/coin/provisioning/common/windows/mysql.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. @@ -36,7 +36,7 @@ # This script installs MySQL $version. # Both x86 and x64 versions needed when x86 integrations are done on x64 machine -$version = "5.6.11" +$version = "5.7.25" $baseNameX64 = "mysql-$version-winx64" $packagex64 = "C:\Windows\temp\$baseNameX64.zip" $baseNameX86 = "mysql-$version-win32" diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 5fb032f5..de04d242 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -38,18 +38,18 @@ # NOTE! Make sure 64bit versions are always installed before 32bit, # because they use same folder name before a rename -$version = "6.3.2" +$version = "6.4.3" # Qt branch without dot (*.*) -$qtBranch = "510x" -# So far Squish built with Qt5.10 works also with 5.11, but we have to be prepared that on some point +$qtBranch = "512x" +# So far Squish built with Qt5.12 works also with 5.13, but we have to be prepared that on some point # the compatibility breaks, and we may need to have separate Squish packages for different Qt versions. $targetDir = "C:\Utils\squish" $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" $squishBranchUrl = "$squishUrl\$qtBranch" $testSuite = "suite_test_squish" -$testSuiteUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin\$testSuite.7z" +$testSuiteUrl = "$squishUrl\$testSuite.7z" # Squish license $licensePackage = ".squish-3-license" @@ -62,7 +62,10 @@ Function DownloadAndInstallSquish { [string]$bit, [string]$squishPackage ) - + # MinGW x86 available only with Qt5.11, to be updated when Squish is supporting 5.13 + if ("$bit" -eq "win32" -and $squishPackage.StartsWith("mingw")) { + $qtBranch = "511x" + } $SquishUrl = $squishBranchUrl + "\squish-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe" $SquishInstaller = "$targetDir\$squishPackage.exe" $SquishParameters = "unattended=1 targetdir=$targetDir\$squishPackage" @@ -125,25 +128,27 @@ DownloadSquishLicence $squishUrl if ($OSVersion -eq "Windows 10 Enterprise") { if (Is64BitWinHost) { - DownloadAndInstallSquish $version win64 msvc14 + DownloadAndInstallSquish $version win64 "msvc14" + DownloadAndInstallSquish $version win64 "msvc141" + DownloadAndInstallSquish $version win64 "mingw_gcc73_posix_seh" + } else { + DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" } - DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" - DownloadAndInstallSquish $version win32 "msvc14" + DownloadAndInstallSquish $version win32 "msvc141" } elseif ($OSVersion -eq "Windows 8.1 Enterprise") { if (Is64BitWinHost) { - DownloadAndInstallSquish $version win64 "msvc12" DownloadAndInstallSquish $version win64 "msvc14" } - DownloadAndInstallSquish $version win32 "msvc14" + DownloadAndInstallSquish $version win32 "msvc141" } elseif ($OSVersion -eq "Windows 7 Enterprise") { if (Is64BitWinHost) { - DownloadAndInstallSquish $version win64 "msvc12" DownloadAndInstallSquish $version win64 "msvc14" + } else { + DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" } - DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" - DownloadAndInstallSquish $version win32 "msvc14" + DownloadAndInstallSquish $version win32 "msvc141" } diff --git a/coin/provisioning/common/windows/vc_redist.ps1 b/coin/provisioning/common/windows/vc_redist.ps1 index f68846f0..1cd81a37 100644 --- a/coin/provisioning/common/windows/vc_redist.ps1 +++ b/coin/provisioning/common/windows/vc_redist.ps1 @@ -57,5 +57,4 @@ Download $externalUrl $internalUrl $package Verify-Checksum $package $sha1 Write-Host "Installing $package..." Run-Executable $package "/q" -Write-Host "Remove $package..." -Remove-Item -Force -Path $package +Remove $package |