3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 18:31:15 +08:00
Code Issues Projects Releases Wiki Activity

VcpkgInvokeCommand: remove paramter $wait

Browse Source
This commit is contained in:
Alexander Karatarakis 2018-01-25 14:46:00 -08:00
parent 7722798ecb
commit a8a20f1a13
3 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/VcpkgPowershellUtils.ps1
View File

@ -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."
}

4
scripts/bootstrap.ps1
View File

@ -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)
{

2
scripts/fetchDependency.ps1
View File

@ -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