cvs: win-installer / PHPInstallerBase52.wxs PHPInstallerBase53.wxs

jmertic Fri Dec 5 12:33:14 2008 UTC Modified files: /win-installer PHPInstallerBase52.wxs PHPInstallerBase53.wxs Log: Bug 46757 - Revert changes making the VBScript custom actions deferred. http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.30&r2=1.31&diff_format=u Index: win-installer/PHPInstallerBase52.wxs diff -u win-installer/PHPInstallerBase52.wxs:1.30 win-installer/PHPInstallerBase52.wxs:1.31 --- win-installer/PHPInstallerBase52.wxs:1.30 Mon Nov 10 19:13:10 2008 +++ win-installer/PHPInstallerBase52.wxs Fri Dec 5 12:33:13 2008 @@ -405,10 +405,8 @@ Title="$(loc.Featureapache13Title)" Description="$(loc.Featureapache13Description)" Level="10"> - <ComponentRef Id="php5apacheDLL"/> <ComponentRef Id="php5apache_hooksDLL"/> - <ComponentRef Id="phpwinEXE"/> <ComponentRef Id="apache13registry"/> </Feature> @@ -667,26 +665,18 @@ <CustomAction Id="configIIS4" BinaryKey="PHPInstallerScripts" Return="check" - Execute="deferred" - Impersonate="no" VBScriptCall="configIIS4" /> <CustomAction Id="unconfigIIS4" BinaryKey="PHPInstallerScripts" Return="check" - Execute="deferred" - Impersonate="no" VBScriptCall="unconfigIIS4" /> <CustomAction Id="configApache" BinaryKey="PHPInstallerScripts" Return="check" - Execute="deferred" - Impersonate="no" VBScriptCall="configApache" /> <CustomAction Id="unconfigApache" BinaryKey="PHPInstallerScripts" Return="check" - Execute="deferred" - Impersonate="no" VBScriptCall="unconfigApache" /> <InstallExecuteSequence> http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.6&r2=1.7&diff_format=u Index: win-installer/PHPInstallerBase53.wxs diff -u win-installer/PHPInstallerBase53.wxs:1.6 win-installer/PHPInstallerBase53.wxs:1.7 --- win-installer/PHPInstallerBase53.wxs:1.6 Mon Nov 10 19:13:10 2008 +++ win-installer/PHPInstallerBase53.wxs Fri Dec 5 12:33:13 2008 @@ -632,32 +632,23 @@ <CustomAction Id="fcgiconfigJSFastCGIremove" ExeCommand="cscript &quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -remove -section:&quot;PHP&quot;ß" Return="ignore" - Execute="deferred" - Impersonate="no" + Impersonate="no" Directory="INSTALLDIR"/> <CustomAction Id="configIIS4" BinaryKey="PHPInstallerScripts" Return="check" - Execute="deferred" - Impersonate="no" VBScriptCall="configIIS4" /> <CustomAction Id="unconfigIIS4" BinaryKey="PHPInstallerScripts" Return="check" - Execute="deferred" - Impersonate="no" VBScriptCall="unconfigIIS4" /> <CustomAction Id="configApache" BinaryKey="PHPInstallerScripts" Return="check" - Execute="deferred" - Impersonate="no" VBScriptCall="configApache" /> <CustomAction Id="unconfigApache" BinaryKey="PHPInstallerScripts" Return="check" - Execute="deferred" - Impersonate="no" VBScriptCall="unconfigApache" /> <InstallExecuteSequence>