jmertic Tue Dec 16 21:12:25 2008 UTC Modified files: /win-installer PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs Log: Sync up the setttings for the CustomActions amongst the various PHP installer versions. Fixes Bug 46826.
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.31&r2=1.32&diff_format=u Index: win-installer/PHPInstallerBase52.wxs diff -u win-installer/PHPInstallerBase52.wxs:1.31 win-installer/PHPInstallerBase52.wxs:1.32 --- win-installer/PHPInstallerBase52.wxs:1.31 Fri Dec 5 12:33:13 2008 +++ win-installer/PHPInstallerBase52.wxs Tue Dec 16 21:12:25 2008 @@ -118,7 +118,7 @@ <Custom Action="AssignAPACHEDIR" After="CostInitialize">NOT APACHEDIR</Custom> <Custom Action="AssignAPACHEDIR2" After="CostInitialize">APACHEREGDIR</Custom> </InstallUISequence> - + <Property Id="WEBSERVERPICKER"> <RegistrySearch Id="webservertype" Root="HKLM" @@ -337,7 +337,7 @@ LongName="Programs"> <Directory Id="ProgramMenuDir" Name="PHP5" - LongName="PHP 5" /> + LongName="PHP 5"/> </Directory> <Directory Id="usrdirectory" Name="usr"> <Directory Id="mibsdirectory" Name="mibs" /> @@ -737,16 +737,16 @@ <Custom Action="fcgiconfigJSFastCGIremove" After="InstallInitialize"> <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> </Custom> - <Custom Action="unconfigIIS4" After="InstallInitialize"> + <Custom Action="unconfigIIS4" After="InstallValidate"> <![CDATA[VersionNT < 600 AND (&iis4ISAPI = 2 OR &iis4CGI = 2 OR &iis4FastCGI = 2)]]> </Custom> - <Custom Action="configIIS4" After="InstallInitialize"> + <Custom Action="configIIS4" After="InstallFinalize"> <![CDATA[VersionNT < 600 AND (&iis4ISAPI = 3 OR &iis4CGI = 3 OR &iis4FastCGI = 3)]]> </Custom> - <Custom Action="unconfigApache" After="InstallInitialize"> + <Custom Action="unconfigApache" After="InstallValidate"> <![CDATA[&apache13 = 2 OR &apache20 = 2 OR &apache22 = 2 OR &apacheCGI = 2]]> </Custom> - <Custom Action="configApache" After="InstallInitialize"> + <Custom Action="configApache" After="InstallFinalize"> <![CDATA[&apache13 = 3 OR &apache20 = 3 OR &apache22 = 3 OR &apacheCGI = 3]]> </Custom> <RemoveExistingProducts After="InstallValidate" /> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.7&r2=1.8&diff_format=u Index: win-installer/PHPInstallerBase52NTS.wxs diff -u win-installer/PHPInstallerBase52NTS.wxs:1.7 win-installer/PHPInstallerBase52NTS.wxs:1.8 --- win-installer/PHPInstallerBase52NTS.wxs:1.7 Mon Nov 10 19:13:10 2008 +++ win-installer/PHPInstallerBase52NTS.wxs Tue Dec 16 21:12:25 2008 @@ -317,7 +317,6 @@ Name="PHP5" LongName="PHP 5"/> </Directory> - <Directory Id="usrdirectory" Name="usr"> <Directory Id="mibsdirectory" Name="mibs" /> </Directory> @@ -497,10 +496,10 @@ <Custom Action="iis700FastCGIremove" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> </Custom> - <Custom Action="fcgiconfigJSFastCGI" After="InstallFinalize"> + <Custom Action="fcgiconfigJSFastCGI" After="InstallInitialize"> <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="fcgiconfigJSFastCGIremove" After="InstallFinalize"> + <Custom Action="fcgiconfigJSFastCGIremove" After="InstallInitialize"> <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> </Custom> <Custom Action="unconfigIIS4" After="InstallValidate"> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.7&r2=1.8&diff_format=u Index: win-installer/PHPInstallerBase53.wxs diff -u win-installer/PHPInstallerBase53.wxs:1.7 win-installer/PHPInstallerBase53.wxs:1.8 --- win-installer/PHPInstallerBase53.wxs:1.7 Fri Dec 5 12:33:13 2008 +++ win-installer/PHPInstallerBase53.wxs Tue Dec 16 21:12:25 2008 @@ -118,7 +118,7 @@ <Custom Action="AssignAPACHEDIR" After="CostInitialize">NOT APACHEDIR</Custom> <Custom Action="AssignAPACHEDIR2" After="CostInitialize">APACHEREGDIR</Custom> </InstallUISequence> - + <Property Id="WEBSERVERPICKER"> <RegistrySearch Id="webservertype" Root="HKLM" @@ -319,7 +319,7 @@ LongName="Programs"> <Directory Id="ProgramMenuDir" Name="PHP5" - LongName="PHP 5" /> + LongName="PHP 5"/> </Directory> </Directory> <Feature AllowAdvertise="no" @@ -384,10 +384,8 @@ Title="$(loc.Featureapache13Title)" Description="$(loc.Featureapache13Description)" Level="10"> -<!-- <ComponentRef Id="php5apacheDLL"/> <ComponentRef Id="php5apache_hooksDLL"/> ---> <ComponentRef Id="phpwinEXE"/> <ComponentRef Id="apache13registry"/> </Feature> @@ -398,7 +396,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> @@ -709,16 +707,16 @@ <Custom Action="fcgiconfigJSFastCGIremove" After="InstallInitialize"> <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> </Custom> - <Custom Action="unconfigIIS4" After="InstallInitialize"> + <Custom Action="unconfigIIS4" After="InstallValidate"> <![CDATA[VersionNT < 600 AND (&iis4ISAPI = 2 OR &iis4CGI = 2 OR &iis4FastCGI = 2)]]> </Custom> - <Custom Action="configIIS4" After="InstallInitialize"> + <Custom Action="configIIS4" After="InstallFinalize"> <![CDATA[VersionNT < 600 AND (&iis4ISAPI = 3 OR &iis4CGI = 3 OR &iis4FastCGI = 3)]]> </Custom> - <Custom Action="unconfigApache" After="InstallInitialize"> + <Custom Action="unconfigApache" After="InstallValidate"> <![CDATA[&apache13 = 2 OR &apache20 = 2 OR &apache22 = 2 OR &apacheCGI = 2]]> </Custom> - <Custom Action="configApache" After="InstallInitialize"> + <Custom Action="configApache" After="InstallFinalize"> <![CDATA[&apache13 = 3 OR &apache20 = 3 OR &apache22 = 3 OR &apacheCGI = 3]]> </Custom> <RemoveExistingProducts After="InstallValidate" /> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.6&r2=1.7&diff_format=u Index: win-installer/PHPInstallerBase53NTS.wxs diff -u win-installer/PHPInstallerBase53NTS.wxs:1.6 win-installer/PHPInstallerBase53NTS.wxs:1.7 --- win-installer/PHPInstallerBase53NTS.wxs:1.6 Mon Nov 10 19:13:10 2008 +++ win-installer/PHPInstallerBase53NTS.wxs Tue Dec 16 21:12:25 2008 @@ -467,10 +467,10 @@ <Custom Action="iis700FastCGIremove" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> </Custom> - <Custom Action="fcgiconfigJSFastCGI" After="InstallFinalize"> + <Custom Action="fcgiconfigJSFastCGI" After="InstallInitialize"> <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="fcgiconfigJSFastCGIremove" After="InstallFinalize"> + <Custom Action="fcgiconfigJSFastCGIremove" After="InstallInitialize"> <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> </Custom> <Custom Action="unconfigIIS4" After="InstallValidate"> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60.wxs?r1=1.21&r2=1.22&diff_format=u Index: win-installer/PHPInstallerBase60.wxs diff -u win-installer/PHPInstallerBase60.wxs:1.21 win-installer/PHPInstallerBase60.wxs:1.22 --- win-installer/PHPInstallerBase60.wxs:1.21 Mon Nov 10 19:13:10 2008 +++ win-installer/PHPInstallerBase60.wxs Tue Dec 16 21:12:25 2008 @@ -118,7 +118,7 @@ <Custom Action="AssignAPACHEDIR" After="CostInitialize">NOT APACHEDIR</Custom> <Custom Action="AssignAPACHEDIR2" After="CostInitialize">APACHEREGDIR</Custom> </InstallUISequence> - + <Property Id="WEBSERVERPICKER"> <RegistrySearch Id="webservertype" Root="HKLM" http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60NTS.wxs?r1=1.7&r2=1.8&diff_format=u Index: win-installer/PHPInstallerBase60NTS.wxs diff -u win-installer/PHPInstallerBase60NTS.wxs:1.7 win-installer/PHPInstallerBase60NTS.wxs:1.8 --- win-installer/PHPInstallerBase60NTS.wxs:1.7 Mon Nov 10 19:13:10 2008 +++ win-installer/PHPInstallerBase60NTS.wxs Tue Dec 16 21:12:25 2008 @@ -467,10 +467,10 @@ <Custom Action="iis700FastCGIremove" After="InstallInitialize"> <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]> </Custom> - <Custom Action="fcgiconfigJSFastCGI" After="InstallFinalize"> + <Custom Action="fcgiconfigJSFastCGI" After="InstallInitialize"> <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]> </Custom> - <Custom Action="fcgiconfigJSFastCGIremove" After="InstallFinalize"> + <Custom Action="fcgiconfigJSFastCGIremove" After="InstallInitialize"> <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]> </Custom> <Custom Action="unconfigIIS4" After="InstallValidate">
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php