cvs: win-installer / GenPHPInstaller.wxs.php PHPInstallerBase52.wxs PHPInstallerBase53.wxs WebServerConfig53.wxs

From: Date: Mon, 13 Oct 2008 09:57:01 +0000
Subject: cvs: win-installer / GenPHPInstaller.wxs.php PHPInstallerBase52.wxs PHPInstallerBase53.wxs WebServerConfig53.wxs
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-53498@lists.php.net to get a copy of this message
pajoye Mon Oct 13 09:57:01 2008 UTC Modified files: /win-installer GenPHPInstaller.wxs.php PHPInstallerBase52.wxs PHPInstallerBase53.wxs WebServerConfig53.wxs Log: - disabe apache1 in the installer http://cvs.php.net/viewvc.cgi/win-installer/GenPHPInstaller.wxs.php?r1=1.7&r2=1.8&diff_format=u Index: win-installer/GenPHPInstaller.wxs.php diff -u win-installer/GenPHPInstaller.wxs.php:1.7 win-installer/GenPHPInstaller.wxs.php:1.8 --- win-installer/GenPHPInstaller.wxs.php:1.7 Thu Sep 11 19:16:37 2008 +++ win-installer/GenPHPInstaller.wxs.php Mon Oct 13 09:57:01 2008 @@ -45,6 +45,10 @@ // remove extension info from php.ini-recommended $infile = fopen("Files/php.ini-recommended",'r'); $outfile = fopen("Files/php.ini",'w'); +if (!$outfile || $infile) { + echo "Cannot open php.ini or php.ini-recommended\n"; + exit(1); +} while (!feof($infile)) { $buffer = fgets($infile); if ( stristr($buffer,';extension') === FALSE ) { http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.26&r2=1.27&diff_format=u Index: win-installer/PHPInstallerBase52.wxs diff -u win-installer/PHPInstallerBase52.wxs:1.26 win-installer/PHPInstallerBase52.wxs:1.27 --- win-installer/PHPInstallerBase52.wxs:1.26 Fri Sep 12 16:03:32 2008 +++ win-installer/PHPInstallerBase52.wxs Mon Oct 13 09:57:01 2008 @@ -399,8 +399,10 @@ Title="$(loc.Featureapache13Title)" Description="$(loc.Featureapache13Description)" Level="10"> +<!-- <ComponentRef Id="php5apacheDLL"/> <ComponentRef Id="php5apache_hooksDLL"/> +--> <ComponentRef Id="phpwinEXE"/> <ComponentRef Id="apache13registry"/> </Feature> @@ -420,7 +422,7 @@ Title="$(loc.Featureapache22Title)" Description="$(loc.Featureapache22Description)" Level="10"> - <ComponentRef Id="php5apache2_2DLL"/> + <ComponentRef Id="php5apache2_2DLL"/> <ComponentRef Id="php5apache2_2_filterDLL"/> <ComponentRef Id="php5apache_hooksDLL"/> <ComponentRef Id="phpwinEXE"/> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.3&r2=1.4&diff_format=u Index: win-installer/PHPInstallerBase53.wxs diff -u win-installer/PHPInstallerBase53.wxs:1.3 win-installer/PHPInstallerBase53.wxs:1.4 --- win-installer/PHPInstallerBase53.wxs:1.3 Fri Sep 12 16:03:32 2008 +++ win-installer/PHPInstallerBase53.wxs Mon Oct 13 09:57:01 2008 @@ -378,8 +378,10 @@ Title="$(loc.Featureapache13Title)" Description="$(loc.Featureapache13Description)" Level="10"> +<!-- <ComponentRef Id="php5apacheDLL"/> <ComponentRef Id="php5apache_hooksDLL"/> +--> <ComponentRef Id="phpwinEXE"/> <ComponentRef Id="apache13registry"/> </Feature> @@ -390,7 +392,7 @@ Level="10"> <ComponentRef Id="php5apache2DLL"/> <ComponentRef Id="php5apache2_filterDLL"/> - <ComponentRef Id="php5apache_hooksDLL"/> +<!-- <ComponentRef Id="php5apache_hooksDLL"/> --> <ComponentRef Id="phpwinEXE"/> <ComponentRef Id="apache20registry"/> </Feature> @@ -401,7 +403,7 @@ Level="10"> <ComponentRef Id="php5apache2_2DLL"/> <ComponentRef Id="php5apache2_2_filterDLL"/> - <ComponentRef Id="php5apache_hooksDLL"/> +<!-- <ComponentRef Id="php5apache_hooksDLL"/>--> <ComponentRef Id="phpwinEXE"/> <ComponentRef Id="apache22registry"/> </Feature> http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig53.wxs?r1=1.1&r2=1.2&diff_format=u Index: win-installer/WebServerConfig53.wxs diff -u win-installer/WebServerConfig53.wxs:1.1 win-installer/WebServerConfig53.wxs:1.2 --- win-installer/WebServerConfig53.wxs:1.1 Fri Aug 22 18:51:40 2008 +++ win-installer/WebServerConfig53.wxs Mon Oct 13 09:57:01 2008 @@ -2,9 +2,11 @@ <Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'> <Fragment Id='FragmentWebServerConfig'> <DirectoryRef Id='INSTALLDIR'> +<!-- <Component Id="php5apacheDLL" DiskId="1" Guid="FEEF42A9-BCCA-44DD-88E5-501D39B87DA0"> <File Id="filephp5apacheDLL" Name="PHP5AP_1.DLL" LongName="php5apache.dll" Source="Files\php5apache.dll" /> </Component> +--> <Component Id="php5apache2DLL" DiskId="1" Guid="97997967-0ED5-4695-A714-F1333A0FC1B9"> <File Id="filephp5apache2DLL" Name="PHP5AP_2.DLL" LongName="php5apache2.dll" Source="Files\php5apache2.dll" /> </Component> @@ -17,9 +19,11 @@ <Component Id="php5apache2_2_filterDLL" DiskId="1" Guid="828FA07E-3624-11DC-8CB8-308555D89593"> <File Id="filephp5apache2_2_filterDLL" Name="PHP5AP_3.DLL" LongName="php5apache2_2_filter.dll" Source="Files\php5apache2_2_filter.dll" /> </Component> +<!-- <Component Id="php5apache_hooksDLL" DiskId="1" Guid="C4DB476D-1A0A-4C46-826C-1D3FD4BA45D0"> <File Id="filephp5apache_hooksDLL" Name="PHP5AP_4.DLL" LongName="php5apache_hooks.dll" Source="Files\php5apache_hooks.dll" /> </Component> +--> <Component Id="php5isapiDLL" DiskId="1" Guid="5B5419B5-917A-462A-B325-CB61B82E5FF2"> <File Id="filephp5isapiDLL" Name="PHP5IS_1.DLL" LongName="php5isapi.dll" Source="Files\php5isapi.dll" /> </Component>

« previous php.cvs (#53498) next »