Improve library detection

Author: shivammathur

extension/BuildPhpExtension/private/Get-ExtensionConfig.ps1

@@ -189,19 +189,23 @@ Function Get-ExtensionConfig {
             }
             $thirdPartyLibraries = @("boost", "instantclient", "odbc_cli")
             $Libraries | Select-Object -Unique | ForEach-Object {
-                if($thirdPartyLibraries.Contains($_)) {
+                if($thirdPartyLibraries.Contains($_) -and $config.extension_libraries -notcontains $_) {
                     $config.extension_libraries += $_
                 } elseif($null -ne $_ -and -not([string]::IsNullOrWhiteSpace($_))) {
                     if ($phpSeries.Content.ToLower().Contains($_) -and -not($config.php_libraries.Contains($_))) {
                         $config.php_libraries += $_
                     } elseif (($extensionSeries.Content + $extensionArchivesSeries.Content).ToLower().Contains($_.ToLower()) -and -not($config.extension_libraries.Contains($_))) {
                         $lib = Get-PeclLibraryZip -Library $_ -PhpVersion $PhpVersion -VsVersion $VsVersion -Arch $Arch -ExtensionSeries $extensionSeries
                         if($null -ne $lib) {
-                            $config.extension_libraries += $lib
+                            if($config.extension_libraries -notcontains $lib) {
+                                $config.extension_libraries += $lib
+                            }
                         } else {
                             $lib = Get-PeclLibraryZip -Library $_ -PhpVersion $PhpVersion -VsVersion $VsVersion -Arch $Arch -ExtensionSeries $extensionArchivesSeries
                             if($null -ne $lib) {
-                                $config.extension_libraries += $lib
+                                if($config.extension_libraries -notcontains $lib) {
+                                    $config.extension_libraries += $lib
+                                }
                             } else {
                                 throw "Library $_ not found for the PHP version $PhpVersion and Visual Studio version $VsVersion"
                             }

extension/BuildPhpExtension/private/Get-LibrariesFromConfig.ps1

@@ -26,9 +26,8 @@ Function Get-LibrariesFromConfig {
         $jsonPath = [System.IO.Path]::Combine($PSScriptRoot, '..\config\vs.json')
     }
     process {
-        $jsonData = (
-        Get-File -Url "https://downloads.php.net/~windows/pecl/deps/libmapping.json"
-        ).Content | ConvertFrom-Json
+        $jsonDataContent = (Get-File -Url "https://downloads.php.net/~windows/pecl/deps/libmapping.json").Content
+        $jsonData = $jsonDataContent | ConvertFrom-Json
 
         $phpSeries = (Get-File -Url "https://downloads.php.net/~windows/php-sdk/deps/$VsVersion/$Arch").Content.ToLower()
 
@@ -61,6 +60,17 @@ Function Get-LibrariesFromConfig {
             return $null
         }
 
+        Function Test-Library {
+            param (
+                [Parameter(Mandatory=$true, Position=0)]
+                [string]$library
+            )
+            if($jsonDataContent.Contains("`"$library-") -or $phpSeries.Contains("`"$library-") -or $jsonDataContent.Contains("`"lib$library-") -or $phpSeries.Contains("`"lib$library-")) {
+                return $library
+            }
+            return $null
+        }
+
         $jsonContent = Get-Content -Path $jsonPath -Raw
         $VsConfig = ConvertFrom-Json -InputObject $jsonContent
         $VsVersions = @($VsVersion)
@@ -71,19 +81,20 @@ Function Get-LibrariesFromConfig {
 
         $foundItems = @()
         $libraryFilesFound = @()
-        [regex]::Matches($ConfigW32Content, 'CHECK_LIB\(["'']([^"'']+)["'']|["'']([^"'']+\.lib)["'']|(\w+\.lib)|(SETUP_\w+)') | ForEach-Object {
-            $_.Groups[1].Value.Split(';') + ($_.Groups[2].Value -Split '[^\w\.]') + ($_.Groups[3].Value -Split '[^\w\.]') + ($_.Groups[4].Value) | ForEach-Object {
+        [regex]::Matches($ConfigW32Content, 'CHECK_LIB\(["'']([^"'']+)["'']|["'']([^"'']+\.lib)["'']|(\w+\.lib)|(\w+\slib)|(SETUP_\w+)') | ForEach-Object {
+            $_.Groups[1].Value.Split(';') + ($_.Groups[2].Value -Split '[^\w\.]') + ($_.Groups[3].Value -Split '[^\w\.]') + ($_.Groups[4].Value) + ($_.Groups[5].Value) | ForEach-Object {
                 $libraryFilesFound += $_
             }
         }
         $libraryFilesFound | Select-Object -Unique | ForEach-Object {
             if($_) {
-                switch ($_) {
+                switch -Wildcard ($_) {
                     SETUP_ZLIB_LIB { $library = "zlib" }
                     SETUP_OPENSSL { $library = "openssl" }
                     SETUP_SQLITE3 { $library = "sqlite" }
                     libeay32.lib { $library = "openssl" }
                     ssleay32.lib { $library = "openssl" }
+                    "* lib" { $library = Test-Library $_.Replace(" lib","") }
                     Default { $library = Find-Library $_ $VsVersions }
                 }
                 if($library -and (-not($foundItems.Contains($library)))) {
@@ -102,6 +113,9 @@ Function Get-LibrariesFromConfig {
         if($Extension -eq "memcached" -or $Extension -eq "xlswriter") {
             $foundItems += "zlib"
         }
+        if($ConfigW32Content.Contains("boost")) {
+            $foundItems += "boost"
+        }
         if($Extension -eq "oci8_19" -or $Extension -eq "pdo_oci") {
             $foundItems += "instantclient"
         }