mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-19 03:03:05 +08:00
[ps1] Remove extraneous function
This commit is contained in:
parent
26187d1bed
commit
45d31162c2
@ -13,64 +13,57 @@ $vcpkgRootDir = vcpkgFindFileRecursivelyUp $scriptsDir .vcpkg-root
|
|||||||
$downloadsDir = "$vcpkgRootDir\downloads"
|
$downloadsDir = "$vcpkgRootDir\downloads"
|
||||||
vcpkgCreateDirectoryIfNotExists $downloadsDir
|
vcpkgCreateDirectoryIfNotExists $downloadsDir
|
||||||
|
|
||||||
function fetchToolInternal([Parameter(Mandatory=$true)][string]$tool)
|
$tool = $tool.toLower()
|
||||||
|
|
||||||
|
[xml]$asXml = Get-Content "$scriptsDir\vcpkgTools.xml"
|
||||||
|
$toolData = $asXml.SelectSingleNode("//tools/tool[@name=`"$tool`"]") # Case-sensitive!
|
||||||
|
|
||||||
|
if ($toolData -eq $null)
|
||||||
{
|
{
|
||||||
$tool = $tool.toLower()
|
throw "Unkown tool $tool"
|
||||||
|
}
|
||||||
|
|
||||||
[xml]$asXml = Get-Content "$scriptsDir\vcpkgTools.xml"
|
$exePath = "$downloadsDir\$($toolData.exeRelativePath)"
|
||||||
$toolData = $asXml.SelectSingleNode("//tools/tool[@name=`"$tool`"]") # Case-sensitive!
|
|
||||||
|
|
||||||
if ($toolData -eq $null)
|
|
||||||
{
|
|
||||||
throw "Unkown tool $tool"
|
|
||||||
}
|
|
||||||
|
|
||||||
$exePath = "$downloadsDir\$(@($toolData.exeRelativePath)[0])"
|
|
||||||
|
|
||||||
if (Test-Path $exePath)
|
|
||||||
{
|
|
||||||
return $exePath
|
|
||||||
}
|
|
||||||
|
|
||||||
$isArchive = vcpkgHasProperty -object $toolData -propertyName "archiveRelativePath"
|
|
||||||
if ($isArchive)
|
|
||||||
{
|
|
||||||
$downloadPath = "$downloadsDir\$(@($toolData.archiveRelativePath)[0])"
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$downloadPath = "$downloadsDir\$(@($toolData.exeRelativePath)[0])"
|
|
||||||
}
|
|
||||||
|
|
||||||
[String]$url = @($toolData.url)[0]
|
|
||||||
if (!(Test-Path $downloadPath))
|
|
||||||
{
|
|
||||||
Write-Host "Downloading $tool..."
|
|
||||||
vcpkgDownloadFile $url $downloadPath
|
|
||||||
Write-Host "Downloading $tool... done."
|
|
||||||
}
|
|
||||||
|
|
||||||
$expectedDownloadedFileHash = @($toolData.sha256)[0]
|
|
||||||
$downloadedFileHash = vcpkgGetSHA256 $downloadPath
|
|
||||||
vcpkgCheckEqualFileHash -filePath $downloadPath -expectedHash $expectedDownloadedFileHash -actualHash $downloadedFileHash
|
|
||||||
|
|
||||||
if ($isArchive)
|
|
||||||
{
|
|
||||||
$outFilename = (Get-ChildItem $downloadPath).BaseName
|
|
||||||
Write-Host "Extracting $tool..."
|
|
||||||
vcpkgExtractFile -ArchivePath $downloadPath -DestinationDir $downloadsDir -outFilename $outFilename
|
|
||||||
Write-Host "Extracting $tool... done."
|
|
||||||
}
|
|
||||||
|
|
||||||
if (-not (Test-Path $exePath))
|
|
||||||
{
|
|
||||||
Write-Error "Could not detect or download $tool"
|
|
||||||
throw
|
|
||||||
}
|
|
||||||
|
|
||||||
|
if (Test-Path $exePath)
|
||||||
|
{
|
||||||
return $exePath
|
return $exePath
|
||||||
}
|
}
|
||||||
|
|
||||||
$path = fetchToolInternal $tool
|
$isArchive = vcpkgHasProperty -object $toolData -propertyName "archiveRelativePath"
|
||||||
Write-Verbose "Fetching tool: $tool. Done."
|
if ($isArchive)
|
||||||
return "<sol>::$path::<eol>"
|
{
|
||||||
|
$downloadPath = "$downloadsDir\$($toolData.archiveRelativePath)"
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$downloadPath = "$downloadsDir\$($toolData.exeRelativePath)"
|
||||||
|
}
|
||||||
|
|
||||||
|
[String]$url = $toolData.url
|
||||||
|
if (!(Test-Path $downloadPath))
|
||||||
|
{
|
||||||
|
Write-Host "Downloading $tool..."
|
||||||
|
vcpkgDownloadFile $url $downloadPath
|
||||||
|
Write-Host "Downloading $tool... done."
|
||||||
|
}
|
||||||
|
|
||||||
|
$expectedDownloadedFileHash = $toolData.sha256
|
||||||
|
$downloadedFileHash = vcpkgGetSHA256 $downloadPath
|
||||||
|
vcpkgCheckEqualFileHash -filePath $downloadPath -expectedHash $expectedDownloadedFileHash -actualHash $downloadedFileHash
|
||||||
|
|
||||||
|
if ($isArchive)
|
||||||
|
{
|
||||||
|
$outFilename = (Get-ChildItem $downloadPath).BaseName
|
||||||
|
Write-Host "Extracting $tool..."
|
||||||
|
vcpkgExtractFile -ArchivePath $downloadPath -DestinationDir $downloadsDir -outFilename $outFilename
|
||||||
|
Write-Host "Extracting $tool... done."
|
||||||
|
}
|
||||||
|
|
||||||
|
if (-not (Test-Path $exePath))
|
||||||
|
{
|
||||||
|
Write-Error "Could not detect or download $tool"
|
||||||
|
throw
|
||||||
|
}
|
||||||
|
|
||||||
|
return "<sol>::$exePath::<eol>"
|
||||||
|
Loading…
Reference in New Issue
Block a user