pajoye Mon Oct 20 15:01:29 2008 UTC
Modified files:
/win-installer ExtensionsGUID.xml GenPHPInstaller.wxs.php
PHPInstallerBase52.wxs
Log:
- update for 5.3, apache1 is out, some shared exts
http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsGUID.xml?r1=1.10&r2=1.11&diff_format=u
Index: win-installer/ExtensionsGUID.xml
diff -u win-installer/ExtensionsGUID.xml:1.10
win-installer/ExtensionsGUID.xml:1.11
--- win-installer/ExtensionsGUID.xml:1.10 Fri Aug 22 19:01:07 2008
+++ win-installer/ExtensionsGUID.xml Mon Oct 20 15:01:28 2008
@@ -139,4 +139,8 @@
<Extension Name="php_ffi" Guid="B18F94FC-4688-4C7E-87A1-8EEC8F52417D"/>
<Extension Name="php_intl" Guid="9048A2B4-188A-438D-8AB8-6BFE7D0910FE"/>
<Extension Name="php_oci8_11g" Guid="0A362A05-C876-420C-8F82-9F8AB8912A78"/>
+ <Extension Name="bcmath" Guid="45ACA2D5-2948-4132-A934-D92BE0E8D3F7"/>
+ <Extension Name="bz2" Guid="E45B574F-4D05-4C6A-B4DF-DB0030618B4B"/>
+ <Extension Name="calendar" Guid="DA822400-49BA-405A-9602-F40E58D2DA57"/>
+ <Extension Name="com_dotnet" Guid="28210AEA-1E67-4B02-919D-2554593AC21A"/>
</Extensions>
http://cvs.php.net/viewvc.cgi/win-installer/GenPHPInstaller.wxs.php?r1=1.8&r2=1.9&diff_format=u
Index: win-installer/GenPHPInstaller.wxs.php
diff -u win-installer/GenPHPInstaller.wxs.php:1.8
win-installer/GenPHPInstaller.wxs.php:1.9
--- win-installer/GenPHPInstaller.wxs.php:1.8 Mon Oct 13 09:57:01 2008
+++ win-installer/GenPHPInstaller.wxs.php Mon Oct 20 15:01:28 2008
@@ -45,7 +45,7 @@
// remove extension info from php.ini-recommended
$infile = fopen("Files/php.ini-recommended",'r');
$outfile = fopen("Files/php.ini",'w');
-if (!$outfile || $infile) {
+if (!$outfile || !$infile) {
echo "Cannot open php.ini or php.ini-recommended\n";
exit(1);
}
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.27&r2=1.28&diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.27
win-installer/PHPInstallerBase52.wxs:1.28
--- win-installer/PHPInstallerBase52.wxs:1.27 Mon Oct 13 09:57:01 2008
+++ win-installer/PHPInstallerBase52.wxs Mon Oct 20 15:01:28 2008
@@ -399,10 +399,10 @@
Title="$(loc.Featureapache13Title)"
Description="$(loc.Featureapache13Description)"
Level="10">
-<!--
+
<ComponentRef Id="php5apacheDLL"/>
<ComponentRef Id="php5apache_hooksDLL"/>
--->
+
<ComponentRef Id="phpwinEXE"/>
<ComponentRef Id="apache13registry"/>
</Feature>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
