diff options
| author | Phil Christensen <philc@microsoft.com> | 2018-12-04 14:05:12 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2018-12-04 14:05:12 -0800 |
| commit | e712374b2831c4d04fc3b37373ed5cf041a3713e (patch) | |
| tree | 3c1be3898e52d0e01cfc842be7ea553e8fe0bafb /scripts/bootstrap.ps1 | |
| parent | 7f80cbdeb02a126a610f3a3262eaefa9c9f9b938 (diff) | |
| parent | f6d32cc644a6f0fb9adb1bb3c3fd4905e8d61e2e (diff) | |
| download | vcpkg-e712374b2831c4d04fc3b37373ed5cf041a3713e.tar.gz vcpkg-e712374b2831c4d04fc3b37373ed5cf041a3713e.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/4889
Diffstat (limited to 'scripts/bootstrap.ps1')
| -rw-r--r-- | scripts/bootstrap.ps1 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 7ebbb2930..ed82a6ab1 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -328,7 +328,7 @@ if ($disableMetrics) } $platform = "x86" -$vcpkgReleaseDir = "$vcpkgSourcesPath\release" +$vcpkgReleaseDir = "$vcpkgSourcesPath\msbuild.x86.release" if ($win64) { @@ -339,7 +339,7 @@ if ($win64) } $platform = "x64" - $vcpkgReleaseDir = "$vcpkgSourcesPath\x64\release" + $vcpkgReleaseDir = "$vcpkgSourcesPath\msbuild.x64.release" } $arguments = ( @@ -388,5 +388,6 @@ Write-Host "`nBuilding vcpkg.exe... done.`n" Write-Verbose("Placing vcpkg.exe in the correct location") -Copy-Item "$vcpkgReleaseDir\vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" | Out-Null -Copy-Item "$vcpkgReleaseDir\vcpkgmetricsuploader.exe" "$vcpkgRootDir\scripts\vcpkgmetricsuploader.exe" | Out-Null +Copy-Item "$vcpkgReleaseDir\vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" +Copy-Item "$vcpkgReleaseDir\vcpkgmetricsuploader.exe" "$vcpkgRootDir\scripts\vcpkgmetricsuploader.exe" +Remove-Item "$vcpkgReleaseDir" -Force -Recurse -ErrorAction SilentlyContinue |