Skip to content

Commit 39c82f3

Browse files
committed
Improve default config and remove stubs
1 parent 4042fee commit 39c82f3

File tree

10 files changed

+19
-110
lines changed

10 files changed

+19
-110
lines changed

extension/BuildPhpExtension/config/stubs/http.composer.json

Lines changed: 0 additions & 12 deletions
This file was deleted.

extension/BuildPhpExtension/config/stubs/ibm_db2.composer.json

Lines changed: 0 additions & 12 deletions
This file was deleted.

extension/BuildPhpExtension/config/stubs/mongodb.composer.json

Lines changed: 0 additions & 18 deletions
This file was deleted.

extension/BuildPhpExtension/config/stubs/oci8.composer.json

Lines changed: 0 additions & 12 deletions
This file was deleted.

extension/BuildPhpExtension/config/stubs/pdo_ibm.composer.json

Lines changed: 0 additions & 12 deletions
This file was deleted.

extension/BuildPhpExtension/config/stubs/pdo_oci.composer.json

Lines changed: 0 additions & 12 deletions
This file was deleted.

extension/BuildPhpExtension/config/stubs/redis.composer.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

extension/BuildPhpExtension/config/stubs/xdebug.composer.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

extension/BuildPhpExtension/private/Get-ArgumentFromConfig.ps1

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ Function Get-ArgumentFromConfig {
3535
if($ConfigW32Content.Contains("PHP_$($Extension.ToUpper())_SHARED")) {
3636
$argValue = "shared"
3737
}
38+
if($Extension -eq "oci8_19" -or $Extension -eq "pdo_oci" -or $Extension -eq 'ibm_db2' -or $Extension -eq 'pdo_ibm') {
39+
$argValue = "../deps,shared"
40+
}
3841

3942
$arg=''
4043
if($null -ne $buildArgPrefix) {

extension/BuildPhpExtension/private/Get-LibrariesFromConfig.ps1

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,24 @@ Function Get-LibrariesFromConfig {
9797
if($Extension -eq "mongodb") {
9898
$foundItems = $foundItems | Where-Object {$_ -notmatch "libsasl.*"}
9999
}
100-
# Add zlib if the extension is memcached
101-
if($Extension -eq "memcached") {
100+
101+
# Custom mappings which are not in config.w32
102+
if($Extension -eq "memcached" -or $Extension -eq "xlswriter") {
102103
$foundItems += "zlib"
103104
}
105+
if($Extension -eq "oci8_19" -or $Extension -eq "pdo_oci") {
106+
$foundItems += "instantclient"
107+
}
108+
if($Extension -eq 'ibm_db2' -or $Extension -eq 'pdo_ibm') {
109+
$foundItems += 'odbc_cli'
110+
}
111+
if($Extension -eq 'xmlrpc') {
112+
$foundItems += 'libiconv'
113+
$foundItems += 'libxml2'
114+
}
115+
if($Extension -eq 'parallel') {
116+
$foundItems += 'pthreads'
117+
}
104118

105119
$highestVersions = @{}
106120

0 commit comments

Comments
 (0)