jmertic Mon Aug 11 12:06:19 2008 UTC
Modified files:
/win-installer ExtensionsFeatures53.wxs ExtensionsFragment.wxs
Log:
Add libpq.dll to the installer.
Removed references to older oci extensions.
http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFeatures53.wxs?r1=1.3&r2=1.4&diff_format=u
Index: win-installer/ExtensionsFeatures53.wxs
diff -u win-installer/ExtensionsFeatures53.wxs:1.3
win-installer/ExtensionsFeatures53.wxs:1.4
--- win-installer/ExtensionsFeatures53.wxs:1.3 Thu Aug 7 17:34:55 2008
+++ win-installer/ExtensionsFeatures53.wxs Mon Aug 11 12:06:19 2008
@@ -247,12 +247,6 @@
<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_oracle"
Title="$(loc.Featureext_php_oracleTitle)"
Description="$(loc.Featureext_php_oracleDescription)" Level="10">
- <ComponentRef Id="php_oracle"/>
- </Feature>
- <Feature AllowAdvertise="no" Id="ext_php_oci8"
Title="$(loc.Featureext_php_oci8Title)"
Description="$(loc.Featureext_php_oci8Description)" Level="10">
- <ComponentRef Id="php_oci8"/>
- </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>
@@ -289,9 +283,6 @@
<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_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_oci8" Title="$(loc.Featureext_php_pdo_oci8Title)"
Description="$(loc.Featureext_php_pdo_oci8Description)" Level="10">
<ComponentRef Id="php_pdo_oci8"/>
</Feature>
@@ -300,6 +291,7 @@
</Feature>
<Feature AllowAdvertise="no"
Id="ext_php_pdo_pgsql" Title="$(loc.Featureext_php_pdo_pgsqlTitle)"
Description="$(loc.Featureext_php_pdo_pgsqlDescription)" Level="10">
<ComponentRef Id="php_pdo_pgsql"/>
+ <ComponentRef Id="libpqDLL"/>
</Feature>
<Feature AllowAdvertise="no"
Id="ext_php_pdo_sqlite" Title="$(loc.Featureext_php_pdo_sqliteTitle)"
Description="$(loc.Featureext_php_pdo_sqliteDescription)"
TypicalDefault="install" Level="1">
<ComponentRef Id="php_pdo_sqlite"/>
@@ -323,6 +315,7 @@
</Feature>
<Feature AllowAdvertise="no" Id="ext_php_pgsql"
Title="$(loc.Featureext_php_pgsqlTitle)"
Description="$(loc.Featureext_php_pgsqlDescription)" TypicalDefault="install"
Level="1">
<ComponentRef Id="php_pgsql"/>
+ <ComponentRef Id="libpqDLL"/>
</Feature>
<Feature AllowAdvertise="no" Id="ext_php_printer"
Title="$(loc.Featureext_php_printerTitle)"
Description="$(loc.Featureext_php_printerDescription)" Level="10">
<ComponentRef Id="php_printer"/>
http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFragment.wxs?r1=1.3&r2=1.4&diff_format=u
Index: win-installer/ExtensionsFragment.wxs
diff -u win-installer/ExtensionsFragment.wxs:1.3
win-installer/ExtensionsFragment.wxs:1.4
--- win-installer/ExtensionsFragment.wxs:1.3 Mon Aug 4 14:59:30 2008
+++ win-installer/ExtensionsFragment.wxs Mon Aug 11 12:06:19 2008
@@ -26,6 +26,9 @@
<Component Id="msqlDLL" DiskId="1"
Guid="C37BB17E-8C9D-4FB6-AD40-100BDDFDADD5">
<File Id="filemsqlDLL" Name="msql.dll"
Source="Files\msql.dll" />
</Component>
+ <Component Id="libpqDLL" DiskId="1"
Guid="6C109270-64B0-11DD-AD8B-0800200C9A66">
+ <File Id="filelibpqDLL" Name="libpq.dll"
Source="Files\libpq.dll" />
+ </Component>
<Component Id="ssleay32DLL" DiskId="1"
Guid="D7E5F122-9764-4165-BDDA-922D60408C2F">
<File Id="filessleay32DLL" Name="ssleay32.dll"
Source="Files\ssleay32.dll" />
</Component>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
