aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-windows-7-x86_64/07-vc_redist.ps1
diff options
context:
space:
mode:
authorOliver Wolff <oliver.wolff@qt.io>2018-02-14 07:46:11 +0100
committerLiang Qi <liang.qi@qt.io>2018-02-26 19:52:45 +0000
commitcb6709ce5c48a31ba1170c71494c1a3869ffa5bb (patch)
tree8fdb8721a71cba868c2fbfe7c9fbc237d1f990a8 /coin/provisioning/qtci-windows-7-x86_64/07-vc_redist.ps1
parent08c88de5c8d531fb4fee03a0c337dd93739d365a (diff)
Unify Windows provisioning scripts & improve error handlingv5.11.0-beta1
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>
Diffstat (limited to 'coin/provisioning/qtci-windows-7-x86_64/07-vc_redist.ps1')
-rw-r--r--coin/provisioning/qtci-windows-7-x86_64/07-vc_redist.ps12
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-windows-7-x86_64/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-7-x86_64/07-vc_redist.ps1
index b8c1ce9f..1e465fe1 100644
--- a/coin/provisioning/qtci-windows-7-x86_64/07-vc_redist.ps1
+++ b/coin/provisioning/qtci-windows-7-x86_64/07-vc_redist.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\windows\vc_redist.ps1" 64
+. "$PSScriptRoot\..\common\windows\vc_redist.ps1"