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

[vcpkg] Don't leak changes to the path in bootstrap

Browse Source
This commit is contained in:
Robert Schumacher 2017-08-25 23:25:41 -07:00
parent 3f88832110
commit 7a2a237e13
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/bootstrap.ps1
View File

@ -8,17 +8,25 @@ $scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition
$vcpkgRootDir = & $scriptsDir\findFileRecursivelyUp.ps1 $scriptsDir .vcpkg-root $vcpkgRootDir = & $scriptsDir\findFileRecursivelyUp.ps1 $scriptsDir .vcpkg-root
Write-Verbose("vcpkg Path " + $vcpkgRootDir) Write-Verbose("vcpkg Path " + $vcpkgRootDir)
$env:path += ";$vcpkgRootDir\downloads\MinGit-2.14.1-32-bit\cmd"
$gitHash = "unknownhash" $gitHash = "unknownhash"
if (Get-Command "git" -ErrorAction SilentlyContinue) $oldpath = $env:path
try
{ {
$gitHash = git log HEAD -n 1 --format="%cd-%H" --date=short $env:path += ";$vcpkgRootDir\downloads\MinGit-2.14.1-32-bit\cmd"
if ($LASTEXITCODE -ne 0) if (Get-Command "git" -ListImported -ErrorAction SilentlyContinue)
{ {
$gitHash = "unknownhash" $gitHash = git log HEAD -n 1 --format="%cd-%H" --date=short
if ($LASTEXITCODE -ne 0)
{
$gitHash = "unknownhash"
}
} }
} }
finally
{
$env:path = $oldpath
}
Write-Verbose("Git repo version string is " + $gitHash) Write-Verbose("Git repo version string is " + $gitHash)
$vcpkgSourcesPath = "$vcpkgRootDir\toolsrc" $vcpkgSourcesPath = "$vcpkgRootDir\toolsrc"
@ -27,7 +35,8 @@ if (!(Test-Path $vcpkgSourcesPath))
New-Item -ItemType directory -Path $vcpkgSourcesPath -force | Out-Null New-Item -ItemType directory -Path $vcpkgSourcesPath -force | Out-Null
} }
try{ try
{
pushd $vcpkgSourcesPath pushd $vcpkgSourcesPath
$msbuildExeWithPlatformToolset = & $scriptsDir\findAnyMSBuildWithCppPlatformToolset.ps1 $msbuildExeWithPlatformToolset = & $scriptsDir\findAnyMSBuildWithCppPlatformToolset.ps1
$msbuildExe = $msbuildExeWithPlatformToolset[0] $msbuildExe = $msbuildExeWithPlatformToolset[0]
@ -40,6 +49,7 @@ try{
Copy-Item $vcpkgSourcesPath\Release\vcpkg.exe $vcpkgRootDir\vcpkg.exe | Out-Null Copy-Item $vcpkgSourcesPath\Release\vcpkg.exe $vcpkgRootDir\vcpkg.exe | Out-Null
Copy-Item $vcpkgSourcesPath\Release\vcpkgmetricsuploader.exe $vcpkgRootDir\scripts\vcpkgmetricsuploader.exe | Out-Null Copy-Item $vcpkgSourcesPath\Release\vcpkgmetricsuploader.exe $vcpkgRootDir\scripts\vcpkgmetricsuploader.exe | Out-Null
} }
finally{ finally
{
popd popd
} }