From cb6709ce5c48a31ba1170c71494c1a3869ffa5bb Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Wed, 14 Feb 2018 07:46:11 +0100 Subject: Unify Windows provisioning scripts & improve error handling While Coin should also see exit codes != 0 as error, we should stick to one way of handling script errors. As Power Shell cmdlets signal an error by throwing an exception we should do the same (and that approach also works in Coin). Additionally extracting 7zip files was unified across scripts by using the existing helper function instead of reinventing the wheel again and again. A similar helper function was introduced for starting an external application (and handling its errors). Also echo and other "cmd" commands were replaced by their PowerShell equivalents to have a unified approach across our Windows provisioning scripts. Change-Id: I70129ce38692f1396c33c13b33a2918485fa5271 Reviewed-by: Frederik Gladhorn --- coin/provisioning/qtci-windows-10-x86/05-msvc.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'coin/provisioning/qtci-windows-10-x86/05-msvc.ps1') diff --git a/coin/provisioning/qtci-windows-10-x86/05-msvc.ps1 b/coin/provisioning/qtci-windows-10-x86/05-msvc.ps1 index 1de57a66..d019fc92 100644 --- a/coin/provisioning/qtci-windows-10-x86/05-msvc.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/05-msvc.ps1 @@ -34,10 +34,10 @@ # Visual Studios are pre-provisioned to tier1 images # MSVC 2015 Update 3 -echo "Visual Studio 2015 = Version 14.0.25421.3 Update 3" >> ~\versions.txt +Write-Output "Visual Studio 2015 = Version 14.0.25421.3 Update 3" >> ~\versions.txt # MSVC 2017 -echo "Visual Studio 2017 = Version 15.1 (26403.7)" >> ~\versions.txt +Write-Output "Visual Studio 2017 = Version 15.1 (26403.7)" >> ~\versions.txt # MSVC 2017 Build Tools -echo "Visual Studio 2017 Build Tools = Version 15.1 (26403.7)" >> ~\versions.txt +Write-Output "Visual Studio 2017 Build Tools = Version 15.1 (26403.7)" >> ~\versions.txt -- cgit v1.2.3