Add support in Add-Extension for in-tree extensions

Author: shivammathur

extension/BuildPhpExtension/private/Add-Extension.ps1

@@ -22,47 +22,55 @@ Function Add-Extension {
     }
     process {
         Set-GAGroup start
-        Get-File -Url "https://pecl.php.net/get/$Extension" -OutFile "$Extension.tgz"
         $currentDirectory = (Get-Location).Path
-        & tar -xzf "$Extension.tgz" -C $currentDirectory
-        Set-Location "$Extension-*"
-        $extensionBuildDirectory = Join-Path -Path (Get-Location).Path -ChildPath $config.build_directory
-        # Apply patches only for php/php-windows-builder and shivammathur/php-windows-builder
-        if($null -ne $env:GITHUB_REPOSITORY) {
-            if($env:GITHUB_REPOSITORY -eq 'php/php-windows-builder' -or $env:GITHUB_REPOSITORY -eq 'shivammathur/php-windows-builder') {
-                if(Test-Path -PATH $PSScriptRoot\..\patches\$Extension.ps1) {
-                    . $PSScriptRoot\..\patches\$Extension.ps1
+        $extensionList = & "$currentDirectory\php-bin\php.exe" -m
+        if(-not($extensionList -contains $Extension)) {
+            if(-not(Test-Path $currentDirectory\php-bin\ext\$php_$Extension.dll)) {
+                Get-File -Url "https://pecl.php.net/get/$Extension" -OutFile "$Extension.tgz"
+                & tar -xzf "$Extension.tgz" -C $currentDirectory
+                Set-Location "$Extension-*"
+                $extensionBuildDirectory = Join-Path -Path (Get-Location).Path -ChildPath $config.build_directory
+                # Apply patches only for php/php-windows-builder and shivammathur/php-windows-builder
+                if ($null -ne $env:GITHUB_REPOSITORY)
+                {
+                    if ($env:GITHUB_REPOSITORY -eq 'php/php-windows-builder' -or $env:GITHUB_REPOSITORY -eq 'shivammathur/php-windows-builder')
+                    {
+                        if (Test-Path -PATH $PSScriptRoot\..\patches\$Extension.ps1)
+                        {
+                            . $PSScriptRoot\..\patches\$Extension.ps1
+                        }
+                    }
                 }
+                $configW32Content = [string](Get-Content -Path "config.w32")
+                $argument = Get-ArgumentFromConfig $Extension $configW32Content
+                $bat_content = @()
+                $bat_content += ""
+                $bat_content += "call phpize 2>&1"
+                $bat_content += "call configure --with-php-build=`"..\deps`" $argument --with-mp=`"disable`" --with-prefix=$Prefix 2>&1"
+                $bat_content += "nmake /nologo 2>&1"
+                $bat_content += "exit %errorlevel%"
+                Set-Content -Encoding "ASCII" -Path $Extension-task.bat -Value $bat_content
+                $builder = "$currentDirectory\php-sdk\phpsdk-starter.bat"
+                $task = (Get-Item -Path "." -Verbose).FullName + "\$Extension-task.bat"
+                $suffix = "php_" + (@(
+                    $Config.name,
+                    $Config.ref,
+                    $Config.php_version,
+                    $Config.ts,
+                    $Config.vs_version,
+                    $Config.arch
+                ) -join "-")
+                & $builder -c $Config.vs_version -a $Config.Arch -s $Config.vs_toolset -t $task | Tee-Object -FilePath "build-$suffix.txt"
+                Write-Host (Get-Content "build-$suffix.txt" -Raw)
+                $includePath = "$currentDirectory\php-dev\include"
+                New-Item -Path $includePath\ext -Name $Extension -ItemType "directory" | Out-Null
+                Get-ChildItem -Path (Get-Location).Path -Recurse -Include '*.h', '*.c' | Copy-Item -Destination "$includePath\ext\$Extension"
+                Copy-Item -Path "$extensionBuildDirectory\*.dll" -Destination "$currentDirectory\php-bin\ext" -Force
+                Copy-Item -Path "$extensionBuildDirectory\*.lib" -Destination "$currentDirectory\php-dev\lib" -Force
             }
+            Add-Content -Path "$currentDirectory\php-bin\php.ini" -Value "extension=$Extension"
+            Set-Location $currentDirectory
         }
-        $configW32Content = [string](Get-Content -Path "config.w32")
-        $argument = Get-ArgumentFromConfig $Extension $configW32Content
-        $bat_content = @()
-        $bat_content += ""
-        $bat_content += "call phpize 2>&1"
-        $bat_content += "call configure --with-php-build=`"..\deps`" $argument --with-mp=`"disable`" --with-prefix=$Prefix 2>&1"
-        $bat_content += "nmake /nologo 2>&1"
-        $bat_content += "exit %errorlevel%"
-        Set-Content -Encoding "ASCII" -Path $Extension-task.bat -Value $bat_content
-        $builder = "$currentDirectory\php-sdk\phpsdk-starter.bat"
-        $task = (Get-Item -Path "." -Verbose).FullName + "\$Extension-task.bat"
-        $suffix = "php_" + (@(
-            $Config.name,
-            $Config.ref,
-            $Config.php_version,
-            $Config.ts,
-            $Config.vs_version,
-            $Config.arch
-        ) -join "-")
-        & $builder -c $Config.vs_version -a $Config.Arch -s $Config.vs_toolset -t $task | Tee-Object -FilePath "build-$suffix.txt"
-        Write-Host (Get-Content "build-$suffix.txt" -Raw)
-        $includePath = "$currentDirectory\php-dev\include"
-        New-Item -Path $includePath\ext -Name $Extension -ItemType "directory" | Out-Null
-        Get-ChildItem -Path (Get-Location).Path -Recurse -Include '*.h', '*.c' | Copy-Item -Destination "$includePath\ext\$Extension"
-        Copy-Item -Path "$extensionBuildDirectory\*.dll" -Destination "$currentDirectory\php-bin\ext" -Force
-        Copy-Item -Path "$extensionBuildDirectory\*.lib" -Destination "$currentDirectory\php-dev\lib" -Force
-        Add-Content -Path "$currentDirectory\php-bin\php.ini" -Value "extension=$Extension"
-        Set-Location $currentDirectory
         Set-GAGroup end
     }
     end {