diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2018-02-14 07:46:11 +0100 |
|---|---|---|
| committer | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2018-04-20 06:15:53 +0000 |
| commit | 73621de8916b5d6d17a1dbd24c134d14c1c726a8 (patch) | |
| tree | 8d1e21a4de97070e65183112fccc566a731788b2 /coin/provisioning/qtci-windows-10-x86 | |
| parent | a37f4a2485d30710d743cecdaf1775b43792ed83 (diff) | |
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 <frederik.gladhorn@qt.io>
(cherry picked from commit cb6709ce5c48a31ba1170c71494c1a3869ffa5bb)
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86')
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86/05-msvc.ps1 | 6 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86/08-python3.ps1 | 2 |
2 files changed, 4 insertions, 4 deletions
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 diff --git a/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 b/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 index 28299307..998e6bae 100644 --- a/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\windows\python3.ps1" 32 +. "$PSScriptRoot\..\common\windows\python3.ps1" |