3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-15 05:55:14 +08:00
Code Issues Projects Releases Wiki Activity

Merge findFileRecursivelyUp into VcpkgPowershellUtils

Browse Source
This commit is contained in:
Alexander Karatarakis 2018-02-06 15:44:59 -08:00
parent 676c861ae6
commit 815e3caf55
5 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/VcpkgPowershellUtils.ps1
View File

@ -226,3 +226,23 @@ function vcpkgFormatElapsedTime([TimeSpan]$ts)
throw $ts throw $ts
} }
function vcpkgFindFileRecursivelyUp()
{
param(
[ValidateNotNullOrEmpty()]
[Parameter(Mandatory=$true)][string]$startingDir,
[ValidateNotNullOrEmpty()]
[Parameter(Mandatory=$true)][string]$filename
)
$currentDir = $startingDir
while (!($currentDir -eq "") -and !(Test-Path "$currentDir\$filename"))
{
Write-Verbose "Examining $currentDir for $filename"
$currentDir = Split-path $currentDir -Parent
}
Write-Verbose "Examining $currentDir for $filename - Found"
return $currentDir
}

2
scripts/bootstrap.ps1
View File

@ -6,7 +6,7 @@ param(
$scriptsDir = split-path -parent $script:MyInvocation.MyCommand.Definition $scriptsDir = split-path -parent $script:MyInvocation.MyCommand.Definition
. "$scriptsDir\VcpkgPowershellUtils.ps1" . "$scriptsDir\VcpkgPowershellUtils.ps1"
$vcpkgRootDir = & $scriptsDir\findFileRecursivelyUp.ps1 $scriptsDir .vcpkg-root $vcpkgRootDir = vcpkgFindFileRecursivelyUp $scriptsDir .vcpkg-root
Write-Verbose("vcpkg Path " + $vcpkgRootDir) Write-Verbose("vcpkg Path " + $vcpkgRootDir)

2
scripts/fetchDependency.ps1
View File

@ -7,7 +7,7 @@ $scriptsDir = split-path -parent $script:MyInvocation.MyCommand.Definition
. "$scriptsDir\VcpkgPowershellUtils.ps1" . "$scriptsDir\VcpkgPowershellUtils.ps1"
Write-Verbose "Fetching dependency: $Dependency" Write-Verbose "Fetching dependency: $Dependency"
$vcpkgRootDir = & $scriptsDir\findFileRecursivelyUp.ps1 $scriptsDir .vcpkg-root $vcpkgRootDir = vcpkgFindFileRecursivelyUp $scriptsDir .vcpkg-root
$downloadsDir = "$vcpkgRootDir\downloads" $downloadsDir = "$vcpkgRootDir\downloads"

18
scripts/findFileRecursivelyUp.ps1
View File

@ -1,18 +0,0 @@
[CmdletBinding()]
param(
[ValidateNotNullOrEmpty()]
[Parameter(Mandatory=$true)][string]$startingDir,
[ValidateNotNullOrEmpty()]
[Parameter(Mandatory=$true)][string]$filename
)
$ErrorActionPreference = "Stop"
$currentDir = $startingDir
while (!($currentDir -eq "") -and !(Test-Path "$currentDir\$filename"))
{
Write-Verbose "Examining $currentDir for $filename"
$currentDir = Split-path $currentDir -Parent
}
Write-Verbose "Examining $currentDir for $filename - Found"
return $currentDir

1
toolsrc/vcpkg.sln
View File

@ -16,7 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{F589
..\scripts\bootstrap.ps1 = ..\scripts\bootstrap.ps1 ..\scripts\bootstrap.ps1 = ..\scripts\bootstrap.ps1
..\scripts\fetchDependency.ps1 = ..\scripts\fetchDependency.ps1 ..\scripts\fetchDependency.ps1 = ..\scripts\fetchDependency.ps1
..\scripts\findAnyMSBuildWithCppPlatformToolset.ps1 = ..\scripts\findAnyMSBuildWithCppPlatformToolset.ps1 ..\scripts\findAnyMSBuildWithCppPlatformToolset.ps1 = ..\scripts\findAnyMSBuildWithCppPlatformToolset.ps1
..\scripts\findFileRecursivelyUp.ps1 = ..\scripts\findFileRecursivelyUp.ps1
..\scripts\findVisualStudioInstallationInstances.ps1 = ..\scripts\findVisualStudioInstallationInstances.ps1 ..\scripts\findVisualStudioInstallationInstances.ps1 = ..\scripts\findVisualStudioInstallationInstances.ps1
..\scripts\get_triplet_environment.cmake = ..\scripts\get_triplet_environment.cmake ..\scripts\get_triplet_environment.cmake = ..\scripts\get_triplet_environment.cmake
..\scripts\getProgramFiles32bit.ps1 = ..\scripts\getProgramFiles32bit.ps1 ..\scripts\getProgramFiles32bit.ps1 = ..\scripts\getProgramFiles32bit.ps1