summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2019-10-03 10:16:15 +0300
committerHeikki Halmet <heikki.halmet@qt.io>2019-10-09 11:50:32 +0300
commitd02f0a913e26aa27f3a6b6f275a24b89a6b4388c (patch)
tree4ee1dc479a253ee06dbd255a08235c47ba597ce4
parente4ae752c0d460cb9a8b3166664319f706f1a1b1a (diff)
Provisioning: Hide windows squish installation output from the log5.13
This will prevent the output of unwanted information Change-Id: I5f1824a6bbe98c673ef04dc2daa0db0536d27828 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
-rw-r--r--coin/provisioning/common/windows/squishInstall.ps16
1 files changed, 4 insertions, 2 deletions
diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1
index de04d242..2cc45785 100644
--- a/coin/provisioning/common/windows/squishInstall.ps1
+++ b/coin/provisioning/common/windows/squishInstall.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.
@@ -73,7 +73,9 @@ Function DownloadAndInstallSquish {
Write-Host "Fetching from URL $squishUrl"
Copy-Item "$SquishUrl" "$SquishInstaller"
Write-Host "Installing Squish"
- Run-Executable "$SquishInstaller" "$SquishParameters"
+ $stdoutFile = [System.IO.Path]::GetTempFileName()
+ $stderrFile = [System.IO.Path]::GetTempFileName()
+ Start-Process -FilePath "$SquishInstaller" -Wait -ArgumentList $SquishParameters -PassThru -RedirectStandardOutput $stdoutFile -RedirectStandardError $stderrFile | Out-Null
Remove-Item -Path $SquishInstaller
if ("$bit" -eq "win64") {
if ($squishPackage.StartsWith("mingw")) {