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

Rename $explicitlyRequestedVSPath to $withVSPath

Browse Source
This commit is contained in:
Alexander Karatarakis 2017-11-09 21:41:16 -08:00
parent 615f7e112f
commit 7eb0095094
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/bootstrap.ps1
View File

@ -1,7 +1,7 @@
[CmdletBinding()]
param(
[ValidateNotNullOrEmpty()][string]$disableMetrics = "0",
[Parameter(Mandatory=$False)][string]$explicitlyRequestedVSPath = ""
[Parameter(Mandatory=$False)][string]$withVSPath = ""
)
$scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition
@ -39,7 +39,7 @@ if (!(Test-Path $vcpkgSourcesPath))
try
{
pushd $vcpkgSourcesPath
$msbuildExeWithPlatformToolset = & $scriptsDir\findAnyMSBuildWithCppPlatformToolset.ps1 $explicitlyRequestedVSPath
$msbuildExeWithPlatformToolset = & $scriptsDir\findAnyMSBuildWithCppPlatformToolset.ps1 $withVSPath
$msbuildExe = $msbuildExeWithPlatformToolset[0]
$platformToolset = $msbuildExeWithPlatformToolset[1]
$windowsSDK = & $scriptsDir\getWindowsSDK.ps1

6
scripts/findAnyMSBuildWithCppPlatformToolset.ps1
View File

@ -1,10 +1,10 @@
[CmdletBinding()]
param(
[Parameter(Mandatory=$False)]
[string]$explicitlyRequestedVSPath = ""
[string]$withVSPath = ""
)
$explicitlyRequestedVSPath = $explicitlyRequestedVSPath -replace "\\$" # Remove potential trailing backslash
$withVSPath = $withVSPath -replace "\\$" # Remove potential trailing backslash
$scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition
$VisualStudioInstallationInstances = & $scriptsDir\findVisualStudioInstallationInstances.ps1
@ -19,7 +19,7 @@ foreach ($instanceCandidateWithEOL in $VisualStudioInstallationInstances)
$version = $split[2]
$path = $split[3]
if ($explicitlyRequestedVSPath -ne "" -and $explicitlyRequestedVSPath -ne $path)
if ($withVSPath -ne "" -and $withVSPath -ne $path)
{
Write-Verbose "Skipping: $instanceCandidate"
continue