jmertic Sat Mar 21 01:58:34 2009 UTC
Modified files:
/win-installer PHPInstallerBase53.wxs PHPInstallerBase60.wxs
WebServerConfig53.wxs WebServerConfig60.wxs
Log:
Remove php5apache_hooks.dll from being required to build the installer.
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.18&r2=1.19&diff_format=u
Index: win-installer/PHPInstallerBase53.wxs
diff -u win-installer/PHPInstallerBase53.wxs:1.18
win-installer/PHPInstallerBase53.wxs:1.19
--- win-installer/PHPInstallerBase53.wxs:1.18 Fri Mar 20 20:36:58 2009
+++ win-installer/PHPInstallerBase53.wxs Sat Mar 21 01:58:33 2009
@@ -386,7 +386,6 @@
Level="10">
<ComponentRef Id="php5apache2DLL"/>
<ComponentRef Id="php5apache2_filterDLL"/>
- <ComponentRef Id="php5apache_hooksDLL"/>
<ComponentRef Id="phpwinEXE"/>
<ComponentRef Id="apache20registry"/>
</Feature>-->
@@ -397,7 +396,6 @@
Level="10">
<ComponentRef Id="php5apache2_2DLL"/>
<ComponentRef Id="php5apache2_2_filterDLL"/>
- <ComponentRef Id="php5apache_hooksDLL"/>
<ComponentRef Id="phpwinEXE"/>
<ComponentRef Id="apache22registry"/>
</Feature>
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60.wxs?r1=1.32&r2=1.33&diff_format=u
Index: win-installer/PHPInstallerBase60.wxs
diff -u win-installer/PHPInstallerBase60.wxs:1.32
win-installer/PHPInstallerBase60.wxs:1.33
--- win-installer/PHPInstallerBase60.wxs:1.32 Fri Mar 20 20:36:58 2009
+++ win-installer/PHPInstallerBase60.wxs Sat Mar 21 01:58:33 2009
@@ -386,7 +386,6 @@
Level="10">
<ComponentRef Id="php6apache2DLL"/>
<ComponentRef Id="php6apache2_filterDLL"/>
- <ComponentRef Id="php6apache_hooksDLL"/>
<ComponentRef Id="phpwinEXE"/>
<ComponentRef Id="apache20registry"/>
</Feature>
@@ -397,7 +396,6 @@
Level="10">
<ComponentRef Id="php6apache2_2DLL"/>
<ComponentRef Id="php6apache2_2_filterDLL"/>
- <ComponentRef Id="php6apache_hooksDLL"/>
<ComponentRef Id="phpwinEXE"/>
<ComponentRef Id="apache22registry"/>
</Feature>
http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig53.wxs?r1=1.5&r2=1.6&diff_format=u
Index: win-installer/WebServerConfig53.wxs
diff -u win-installer/WebServerConfig53.wxs:1.5
win-installer/WebServerConfig53.wxs:1.6
--- win-installer/WebServerConfig53.wxs:1.5 Fri Mar 20 20:36:58 2009
+++ win-installer/WebServerConfig53.wxs Sat Mar 21 01:58:33 2009
@@ -14,9 +14,6 @@
<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="cgiforceredirect" DiskId="1"
Guid="0A2DD92F-AFCC-417B-B909-395F9D3B79F5">
<IniFile Id="cgiforceredirectINI" Action="addLine"
Key="cgi.force_redirect" Directory="INSTALLDIR" Name="php.ini"
http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig60.wxs?r1=1.7&r2=1.8&diff_format=u
Index: win-installer/WebServerConfig60.wxs
diff -u win-installer/WebServerConfig60.wxs:1.7
win-installer/WebServerConfig60.wxs:1.8
--- win-installer/WebServerConfig60.wxs:1.7 Fri Mar 20 20:36:58 2009
+++ win-installer/WebServerConfig60.wxs Sat Mar 21 01:58:33 2009
@@ -14,9 +14,6 @@
<Component Id="php6apache2_2_filterDLL" DiskId="1"
Guid="828FA07E-3624-11DC-8CB8-308555D89593">
<File Id="filephp6apache2_2_filterDLL" Name="PHP6AP_3.DLL"
LongName="php6apache2_2_filter.dll" Source="Files\php6apache2_2_filter.dll" />
</Component>
- <Component Id="php6apache_hooksDLL" DiskId="1"
Guid="C4DB476D-1A0A-4C46-826C-1D3FD4BA45D0">
- <File Id="filephp6apache_hooksDLL" Name="PHP6AP_4.DLL"
LongName="php6apache_hooks.dll" Source="Files\php6apache_hooks.dll" />
- </Component>
<Component Id="cgiforceredirect" DiskId="1"
Guid="0A2DD92F-AFCC-417B-B909-395F9D3B79F5">
<IniFile Id="cgiforceredirectINI" Action="addLine"
Key="cgi.force_redirect" Directory="INSTALLDIR" Name="php.ini"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
