diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2018-01-25 14:46:00 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2018-01-25 14:46:00 -0800 |
| commit | a8a20f1a1338ecc5ebb0575135b820b06479ae15 (patch) | |
| tree | a583031c0bb87b0d48cb2d5ffa6ecd9bb82a5032 /scripts | |
| parent | 7722798ecb3a49b46f494058c58ff41d9e31d2c4 (diff) | |
| download | vcpkg-a8a20f1a1338ecc5ebb0575135b820b06479ae15.tar.gz vcpkg-a8a20f1a1338ecc5ebb0575135b820b06479ae15.zip | |
VcpkgInvokeCommand: remove paramter $wait
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/VcpkgPowershellUtils.ps1 | 24 | ||||
| -rw-r--r-- | scripts/bootstrap.ps1 | 4 | ||||
| -rw-r--r-- | scripts/fetchDependency.ps1 | 2 |
3 files changed, 11 insertions, 19 deletions
diff --git a/scripts/VcpkgPowershellUtils.ps1 b/scripts/VcpkgPowershellUtils.ps1 index ec1e8b92b..3ca540874 100644 --- a/scripts/VcpkgPowershellUtils.ps1 +++ b/scripts/VcpkgPowershellUtils.ps1 @@ -167,24 +167,19 @@ function vcpkgExtractFile( [Parameter(Mandatory=$true)][string]$file, function vcpkgInvokeCommand() { param ( [Parameter(Mandatory=$true)][string]$executable, - [string]$arguments = "", - [Parameter(Mandatory=$true)][switch]$wait) + [string]$arguments = "") Write-Verbose "Executing: ${executable} ${arguments}" $process = Start-Process -FilePath "`"$executable`"" -ArgumentList $arguments -PassThru -NoNewWindow - if ($wait) - { - Wait-Process -InputObject $process - $ec = $process.ExitCode - Write-Verbose "Execution terminated with exit code $ec." - } + Wait-Process -InputObject $process + $ec = $process.ExitCode + Write-Verbose "Execution terminated with exit code $ec." } function vcpkgInvokeCommandClean() { param ( [Parameter(Mandatory=$true)][string]$executable, - [string]$arguments = "", - [Parameter(Mandatory=$true)][switch]$wait) + [string]$arguments = "") Write-Verbose "Clean-Executing: ${executable} ${arguments}" $scriptsDir = split-path -parent $script:MyInvocation.MyCommand.Definition @@ -195,10 +190,7 @@ function vcpkgInvokeCommandClean() $arg = "-encodedCommand $encodedCommand" $process = Start-Process -FilePath powershell.exe -ArgumentList $arg -PassThru -NoNewWindow - if ($wait) - { - Wait-Process -InputObject $process - $ec = $process.ExitCode - Write-Verbose "Execution terminated with exit code $ec." - } + Wait-Process -InputObject $process + $ec = $process.ExitCode + Write-Verbose "Execution terminated with exit code $ec." }
\ No newline at end of file diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index bf1dcba8e..a50d0dde1 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -55,8 +55,8 @@ try "/m", "dirs.proj") -join " " - # vcpkgInvokeCommandClean cmd "/c echo %PATH%" -wait:$true - vcpkgInvokeCommandClean $msbuildExe $arguments -wait:$true + # vcpkgInvokeCommandClean cmd "/c echo %PATH%" + vcpkgInvokeCommandClean $msbuildExe $arguments if ($LASTEXITCODE -ne 0) { diff --git a/scripts/fetchDependency.ps1 b/scripts/fetchDependency.ps1 index 463b6f243..ad0b774d4 100644 --- a/scripts/fetchDependency.ps1 +++ b/scripts/fetchDependency.ps1 @@ -103,7 +103,7 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency) { if (-not (Test-Path $executableFromDownload)) { - vcpkgInvokeCommand $downloadPath "-y" -wait:$true + vcpkgInvokeCommand $downloadPath "-y" } } else |