[bootstrap] Build vcpkg in a clean environment

1 files changed, 25 insertions, 2 deletions

diff --git a/scripts/VcpkgPowershellUtils.ps1 b/scripts/VcpkgPowershellUtils.ps1
index 7a6a67c2c..ec1e8b92b 100644
--- a/scripts/VcpkgPowershellUtils.ps1
+++ b/scripts/VcpkgPowershellUtils.ps1
@@ -168,10 +168,33 @@ function vcpkgInvokeCommand()
 {
     param ( [Parameter(Mandatory=$true)][string]$executable,
                                         [string]$arguments = "",
-                                        [switch]$wait)
+            [Parameter(Mandatory=$true)][switch]$wait)
 
     Write-Verbose "Executing: ${executable} ${arguments}"
-    $process = Start-Process -FilePath $executable -ArgumentList $arguments -PassThru -NoNewWindow
+    $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."
+    }
+}
+
+function vcpkgInvokeCommandClean()
+{
+    param ( [Parameter(Mandatory=$true)][string]$executable,
+                                        [string]$arguments = "",
+            [Parameter(Mandatory=$true)][switch]$wait)
+
+    Write-Verbose "Clean-Executing: ${executable} ${arguments}"
+    $scriptsDir = split-path -parent $script:MyInvocation.MyCommand.Definition
+    $cleanEnvScript = "$scriptsDir\VcpkgPowershellUtils-ClearEnvironment.ps1"
+    $command = "& `"$cleanEnvScript`"; & `"$executable`" $arguments"
+    $bytes = [System.Text.Encoding]::Unicode.GetBytes($command)
+    $encodedCommand = [Convert]::ToBase64String($bytes)
+    $arg = "-encodedCommand $encodedCommand"
+
+    $process = Start-Process -FilePath powershell.exe -ArgumentList $arg -PassThru -NoNewWindow
     if ($wait)
     {
         Wait-Process -InputObject $process