Skip to content

Commit 5c5fc5d

Browse files
committed
Do not rely on series files for php deps
1 parent cfa40e4 commit 5c5fc5d

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

extension/BuildPhpExtension/private/Add-PhpDependencies.ps1

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@ Function Add-PhpDependencies {
1414
}
1515
process {
1616
$phpBaseUrl = 'https://downloads.php.net/~windows/php-sdk/deps'
17-
$phpSeries = Invoke-WebRequest -Uri "$phpBaseUrl/series/packages-$($Config.php_version)-$($Config.vs_version)-$($Config.arch)-staging.txt"
18-
$seriesFiles = $phpSeries.Content -Split "[\r\n]+"
17+
$phpSeries = Invoke-WebRequest -Uri "$phpBaseUrl/$($Config.vs_version)/$($Config.arch)"
1918
$no_matches = @()
2019
foreach ($library in $Config.php_libraries) {
2120
$installed = $false
22-
foreach ($file in $seriesFiles) {
21+
foreach ($file in $phpSeries.Links.Href) {
2322
if ($file -match "^$library") {
2423
Invoke-WebRequest "$phpBaseUrl/$($Config.vs_version)/$($Config.arch)/$file" -OutFile $library
2524
Expand-Archive $library "../deps"

extension/BuildPhpExtension/private/Get-ExtensionConfig.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,13 @@ Function Get-ExtensionConfig {
118118
}
119119

120120
if($Libraries.Count -gt 0) {
121-
$phpSeries = (Invoke-WebRequest -Uri "https://downloads.php.net/~windows/php-sdk/deps/series/packages-$PhpVersion-$VsVersion-$Arch-staging.txt").Content
121+
$phpSeries = Invoke-WebRequest -Uri "https://downloads.php.net/~windows/php-sdk/deps/$VsVersion/$Arch"
122122
$extensionSeries = Invoke-WebRequest -Uri "https://downloads.php.net/~windows/pecl/deps"
123123
$extensionArchivesSeries = Invoke-WebRequest -Uri "https://downloads.php.net/~windows/pecl/deps/archives"
124124
}
125125
$Libraries | Select-Object -Unique | ForEach-Object {
126126
if($null -ne $_ -and -not([string]::IsNullOrWhiteSpace($_))) {
127-
if ($phpSeries.Contains($_) -and -not($config.php_libraries.Contains($_))) {
127+
if ($phpSeries.Content.ToLower().Contains($_) -and -not($config.php_libraries.Contains($_))) {
128128
$config.php_libraries += $_
129129
} elseif (($extensionSeries.Content + $extensionArchivesSeries.Content).ToLower().Contains($_.ToLower()) -and -not($config.extension_libraries.Contains($_))) {
130130
$lib = Get-PeclLibraryZip -Library $_ -PhpVersion $PhpVersion -VsVersion $VsVersion -Arch $Arch -ExtensionSeries $extensionSeries

0 commit comments

Comments
 (0)