aboutsummaryrefslogtreecommitdiff
path: root/scripts/bootstrap.ps1
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2018-01-22 18:19:30 -0800
committerAlexander Karatarakis <alkarata@microsoft.com>2018-01-23 14:16:06 -0800
commit0df743d6252efda732c00daa48cef28acbf3f078 (patch)
tree60182da2a0193af6396bcf5f1b67f0d980cc8935 /scripts/bootstrap.ps1
parenta5fe308ea3c29c5f8715b8f0c78571759541c9b5 (diff)
downloadvcpkg-0df743d6252efda732c00daa48cef28acbf3f078.tar.gz
vcpkg-0df743d6252efda732c00daa48cef28acbf3f078.zip
[bootstrap] Build vcpkg in a clean environment
Diffstat (limited to 'scripts/bootstrap.ps1')
-rw-r--r--scripts/bootstrap.ps17
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
index 2c05f1adb..bf1dcba8e 100644
--- a/scripts/bootstrap.ps1
+++ b/scripts/bootstrap.ps1
@@ -5,6 +5,7 @@ param(
)
$scriptsDir = split-path -parent $script:MyInvocation.MyCommand.Definition
+. "$scriptsDir\VcpkgPowershellUtils.ps1"
$vcpkgRootDir = & $scriptsDir\findFileRecursivelyUp.ps1 $scriptsDir .vcpkg-root
Write-Verbose("vcpkg Path " + $vcpkgRootDir)
@@ -52,9 +53,11 @@ try
"/p:PlatformToolset=$platformToolset",
"/p:TargetPlatformVersion=$windowsSDK",
"/m",
- "dirs.proj")
+ "dirs.proj") -join " "
+
+ # vcpkgInvokeCommandClean cmd "/c echo %PATH%" -wait:$true
+ vcpkgInvokeCommandClean $msbuildExe $arguments -wait:$true
- & $msbuildExe $arguments
if ($LASTEXITCODE -ne 0)
{
Write-Error "Building vcpkg.exe failed. Please ensure you have installed Visual Studio with the Desktop C++ workload and the Windows SDK for Desktop C++."