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

[bootstrap.ps1] Remove unneeded <sol> <eol>

Browse Source 
it was used for communication with vcpkg
This commit is contained in:
Alexander Karatarakis 2018-05-19 18:07:09 -07:00
parent 8549a095a8
commit bc96c069ac
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/bootstrap.ps1
View File

@ -7,6 +7,7 @@ Set-StrictMode -Version Latest
$scriptsDir = split-path -parent $script:MyInvocation.MyCommand.Definition $scriptsDir = split-path -parent $script:MyInvocation.MyCommand.Definition
$vcpkgRootDir = $scriptsDir $vcpkgRootDir = $scriptsDir
$withVSPath = $withVSPath -replace "\\$" # Remove potential trailing backslash $withVSPath = $withVSPath -replace "\\$" # Remove potential trailing backslash
function vcpkgHasProperty([Parameter(Mandatory=$true)][AllowNull()]$object, [Parameter(Mandatory=$true)]$propertyName) function vcpkgHasProperty([Parameter(Mandatory=$true)][AllowNull()]$object, [Parameter(Mandatory=$true)]$propertyName)
{ {
if ($object -eq $null) if ($object -eq $null)
@ -84,7 +85,7 @@ function getVisualStudioInstances()
} }
# Placed like that for easy sorting according to preference # Placed like that for easy sorting according to preference
$results.Add("<sol>::${releaseType}::${installationVersion}::${installationPath}::<eol>") > $null $results.Add("${releaseType}::${installationVersion}::${installationPath}") > $null
} }
} }
else else
@ -100,7 +101,7 @@ function getVisualStudioInstances()
if ((Test-Path $clExe) -And (Test-Path $vcvarsallbat)) if ((Test-Path $clExe) -And (Test-Path $vcvarsallbat))
{ {
$results.Add("<sol>::PreferenceWeight1::Legacy::14.0::$installationPath::<eol>") > $null $results.Add("PreferenceWeight1::Legacy::14.0::$installationPath") > $null
} }
} }
@ -110,7 +111,7 @@ function getVisualStudioInstances()
if ((Test-Path $clExe) -And (Test-Path $vcvarsallbat)) if ((Test-Path $clExe) -And (Test-Path $vcvarsallbat))
{ {
$results.Add("<sol>::PreferenceWeight1::Legacy::14.0::$installationPath::<eol>") > $null $results.Add("PreferenceWeight1::Legacy::14.0::$installationPath") > $null
} }
$results.Sort() $results.Sort()
@ -128,9 +129,8 @@ function findAnyMSBuildWithCppPlatformToolset([string]$withVSPath)
} }
Write-Verbose "VS Candidates:`n`r$([system.String]::Join([Environment]::NewLine, $VisualStudioInstances))" Write-Verbose "VS Candidates:`n`r$([system.String]::Join([Environment]::NewLine, $VisualStudioInstances))"
foreach ($instanceCandidateWithEOL in $VisualStudioInstances) foreach ($instanceCandidate in $VisualStudioInstances)
{ {
$instanceCandidate = $instanceCandidateWithEOL -replace "<sol>::" -replace "::<eol>"
Write-Verbose "Inspecting: $instanceCandidate" Write-Verbose "Inspecting: $instanceCandidate"
$split = $instanceCandidate -split "::" $split = $instanceCandidate -split "::"
# $preferenceWeight = $split[0] # $preferenceWeight = $split[0]