jmertic Mon Aug 11 19:58:24 2008 UTC
Modified files:
/win-installer ExtensionsFeatures53.wxs
Log:
Assure that the only oracle extensions are php_oci, php_oci8_11g, and
php_pdo_oci
http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFeatures53.wxs?r1=1.5&r2=1.6&diff_format=u
Index: win-installer/ExtensionsFeatures53.wxs
diff -u win-installer/ExtensionsFeatures53.wxs:1.5
win-installer/ExtensionsFeatures53.wxs:1.6
--- win-installer/ExtensionsFeatures53.wxs:1.5 Mon Aug 11 12:18:37 2008
+++ win-installer/ExtensionsFeatures53.wxs Mon Aug 11 19:58:24 2008
@@ -246,6 +246,9 @@
<Feature AllowAdvertise="no" Id="ext_php_operator"
Title="$(loc.Featureext_php_operatorTitle)"
Description="$(loc.Featureext_php_operatorDescription)" Level="10">
<ComponentRef Id="php_operator"/>
</Feature>
+ <Feature AllowAdvertise="no" Id="ext_php_oci"
Title="$(loc.Featureext_php_ociTitle)"
Description="$(loc.Featureext_php_ociDescription)" Level="10">
+ <ComponentRef Id="php_oci"/>
+ </Feature>
<Feature AllowAdvertise="no" Id="ext_php_oci8_11g"
Title="$(loc.Featureext_php_oci8_11gTitle)"
Description="$(loc.Featureext_php_oci8_11gDescription)" Level="10">
<ComponentRef Id="php_oci8_11g"/>
</Feature>
@@ -282,8 +285,8 @@
<Feature AllowAdvertise="no"
Id="ext_php_pdo_mysql" Title="$(loc.Featureext_php_pdo_mysqlTitle)"
Description="$(loc.Featureext_php_pdo_mysqlDescription)"
TypicalDefault="install" Level="1">
<ComponentRef Id="php_pdo_mysql"/>
</Feature>
- <Feature AllowAdvertise="no"
Id="ext_php_pdo_oci8" Title="$(loc.Featureext_php_pdo_oci8Title)"
Description="$(loc.Featureext_php_pdo_oci8Description)" Level="10">
- <ComponentRef Id="php_pdo_oci8"/>
+ <Feature AllowAdvertise="no"
Id="ext_php_pdo_oci" Title="$(loc.Featureext_php_pdo_ociTitle)"
Description="$(loc.Featureext_php_pdo_ociDescription)" Level="10">
+ <ComponentRef Id="php_pdo_oci"/>
</Feature>
<Feature AllowAdvertise="no"
Id="ext_php_pdo_odbc" Title="$(loc.Featureext_php_pdo_odbcTitle)"
Description="$(loc.Featureext_php_pdo_odbcDescription)"
TypicalDefault="install" Level="1">
<ComponentRef Id="php_pdo_odbc"/>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
