[PHP-CVS] svn: /php/win-installer/trunk/ PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs PHPInstaller
jmertic Wed, 12 May 2010 19:18:22 + Revision: http://svn.php.net/viewvc?view=revisionrevision=299304 Log: Bug #50584 - Fix problem with expecting newly created registry values to be available in the VB installer scripts by instead passing those values to the custom action via CustomActionData property. Bug: http://bugs.php.net/50584 (Assigned) Windows installer does not configure Apache in silent mode Changed paths: U php/win-installer/trunk/PHPInstallerBase52.wxs U php/win-installer/trunk/PHPInstallerBase52NTS.wxs U php/win-installer/trunk/PHPInstallerBase53.wxs U php/win-installer/trunk/PHPInstallerBase53NTS.wxs U php/win-installer/trunk/PHPInstallerBase60.wxs U php/win-installer/trunk/PHPInstallerBase60NTS.wxs U php/win-installer/trunk/PHPInstallerScripts52.vbs U php/win-installer/trunk/PHPInstallerScripts53.vbs U php/win-installer/trunk/PHPInstallerScripts60.vbs Modified: php/win-installer/trunk/PHPInstallerBase52.wxs === --- php/win-installer/trunk/PHPInstallerBase52.wxs 2010-05-12 18:51:53 UTC (rev 299303) +++ php/win-installer/trunk/PHPInstallerBase52.wxs 2010-05-12 19:18:22 UTC (rev 299304) @@ -794,10 +794,18 @@ Execute=deferred Impersonate=no VBScriptCall=configIIS4 / -CustomAction Id=configIIS4CustomActionDataValue +CustomAction Id=configIIS4CGICustomActionDataValue Return=check Property=configIIS4 - Value=[INSTALLDIR] / + Value=[INSTALLDIR],iis4CGI / +CustomAction Id=configIIS4ISAPICustomActionDataValue + Return=check + Property=configIIS4 + Value=[INSTALLDIR],iis4ISAPI / +CustomAction Id=configIIS4FastCGICustomActionDataValue + Return=check + Property=configIIS4 + Value=[INSTALLDIR],iis4FastCGI / CustomAction Id=unconfigIIS4 BinaryKey=PHPInstallerScripts Return=check @@ -810,10 +818,22 @@ Execute=deferred Impersonate=no VBScriptCall=configApache / -CustomAction Id=configApacheCustomActionDataValue +CustomAction Id=configApache13CustomActionDataValue Return=check Property=configApache - Value=[APACHEDIR],[INSTALLDIR] / + Value=[APACHEDIR],[INSTALLDIR],apache13 / +CustomAction Id=configApache20CustomActionDataValue + Return=check + Property=configApache + Value=[APACHEDIR],[INSTALLDIR],apache20 / +CustomAction Id=configApache22CustomActionDataValue + Return=check + Property=configApache + Value=[APACHEDIR],[INSTALLDIR],apache22 / +CustomAction Id=configApacheCGICustomActionDataValue + Return=check + Property=configApache + Value=[APACHEDIR],[INSTALLDIR],apacheCGI / CustomAction Id=unconfigApache BinaryKey=PHPInstallerScripts Return=check @@ -972,19 +992,34 @@ Custom Action=fcgiconfigJSFastCGIremoveXP After=fcgiconfigJSFastCGIremoveCmdXP ![CDATA[(VersionNT = 501 AND ServicePackLevel = 2) AND iis4FastCGI = 2]] /Custom - Custom Action=configIIS4CustomActionDataValue After=WriteRegistryValues -![CDATA[VersionNT 600 AND iis4FastCGI = 3]] + Custom Action=configIIS4CGICustomActionDataValue After=WriteRegistryValues +![CDATA[VersionNT 600 AND iis4CGI = 3]] /Custom - Custom Action=configIIS4 After=configIIS4CustomActionDataValue + Custom Action=configIIS4ISAPICustomActionDataValue After=WriteRegistryValues +![CDATA[VersionNT 600 AND iis4ISAPI = 3]] + /Custom + Custom Action=configIIS4FastCGICustomActionDataValue After=WriteRegistryValues ![CDATA[VersionNT 600 AND iis4FastCGI = 3]] /Custom + Custom Action=configIIS4 After=configIIS4FastCGICustomActionDataValue +![CDATA[VersionNT 600 AND (iis4FastCGI = 3 OR iis4ISAPI = 3 OR iis4CGI = 3)]] + /Custom Custom Action=unconfigIIS4 After=InstallInitialize -![CDATA[VersionNT 600 AND iis4FastCGI = 2]] +![CDATA[VersionNT 600 AND (iis4FastCGI = 2 OR iis4ISAPI = 2 OR iis4CGI = 2)]] /Custom - Custom Action=configApacheCustomActionDataValue After=WriteRegistryValues -![CDATA[apache13 = 3 OR apache20 = 3 OR apache22 = 3 OR apacheCGI = 3]] + Custom Action=configApache13CustomActionDataValue After=WriteRegistryValues +![CDATA[apache13 = 3]] /Custom - Custom Action=configApache After=configApacheCustomActionDataValue + Custom Action=configApache20CustomActionDataValue After=WriteRegistryValues +![CDATA[apache20 = 3]] + /Custom + Custom Action=configApache22CustomActionDataValue After=WriteRegistryValues +![CDATA[apache22 = 3]] + /Custom + Custom Action=configApacheCGICustomActionDataValue After=WriteRegistryValues +![CDATA[apacheCGI = 3]] + /Custom + Custom Action=configApache After=configApacheCGICustomActionDataValue
[PHP-CVS] svn: /php/win-installer/trunk/ PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs PHPInstaller
jmertic Wed, 30 Sep 2009 13:44:28 + Revision: http://svn.php.net/viewvc?view=revisionrevision=288996 Log: Bug #47855 - Change the VBScript custom actions to be deferred and not to impersonate the installing user, so the apache config changes are made as an elevated privileges user. Solves problem of not being able to install with Apache under Windows Vista/2008/7. Bug: http://bugs.php.net/47855 (Assigned) VC6 Thread Safe MSI install fails Changed paths: U php/win-installer/trunk/PHPInstallerBase52.wxs U php/win-installer/trunk/PHPInstallerBase52NTS.wxs U php/win-installer/trunk/PHPInstallerBase53.wxs U php/win-installer/trunk/PHPInstallerBase53NTS.wxs U php/win-installer/trunk/PHPInstallerBase60.wxs U php/win-installer/trunk/PHPInstallerBase60NTS.wxs U php/win-installer/trunk/PHPInstallerScripts52.vbs U php/win-installer/trunk/PHPInstallerScripts53.vbs U php/win-installer/trunk/PHPInstallerScripts60.vbs Modified: php/win-installer/trunk/PHPInstallerBase52.wxs === --- php/win-installer/trunk/PHPInstallerBase52.wxs 2009-09-30 13:32:18 UTC (rev 288995) +++ php/win-installer/trunk/PHPInstallerBase52.wxs 2009-09-30 13:44:28 UTC (rev 288996) @@ -708,7 +708,7 @@ DllEntry=CAQuietExec Return=ignore Execute=deferred - Impersonate=no / + Impersonate=no / CustomAction Id=fcgiconfigJSFastCGISetActivityTimeoutCmd Property=fcgiconfigJSFastCGISetActivityTimeout Value=quot;\\localhost\admin$\system32\cscript.exequot; quot;[WindowsFolder]system32\inetsrv\fcgiconfig.jsquot; -set -section:quot;PHPquot; -ActivityTimeout:600 / @@ -784,18 +784,34 @@ CustomAction Id=configIIS4 BinaryKey=PHPInstallerScripts Return=check + Execute=deferred + Impersonate=no VBScriptCall=configIIS4 / +CustomAction Id=configIIS4CustomActionDataValue + Return=check + Property=configIIS4 + Value=[INSTALLDIR] / 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=configApacheCustomActionDataValue + Return=check + Property=configApache + Value=[APACHEDIR],[INSTALLDIR] / CustomAction Id=unconfigApache BinaryKey=PHPInstallerScripts Return=check + Execute=deferred + Impersonate=no VBScriptCall=unconfigApache / InstallExecuteSequence @@ -949,18 +965,24 @@ Custom Action=fcgiconfigJSFastCGIremoveXP After=fcgiconfigJSFastCGIremoveCmdXP ![CDATA[(VersionNT = 501 AND ServicePackLevel = 2) AND iis4FastCGI = 2]] /Custom - Custom Action=configIIS4 After=InstallFinalize + Custom Action=configIIS4CustomActionDataValue After=WriteRegistryValues ![CDATA[VersionNT 600 AND iis4FastCGI = 3]] /Custom + Custom Action=configIIS4 After=configIIS4CustomActionDataValue +![CDATA[VersionNT 600 AND iis4FastCGI = 3]] + /Custom Custom Action=unconfigIIS4 After=InstallInitialize ![CDATA[VersionNT 600 AND iis4FastCGI = 2]] /Custom - Custom Action=unconfigApache After=InstallValidate -![CDATA[apache13 = 2 OR apache20 = 2 OR apache22 = 2 OR apacheCGI = 2]] + Custom Action=configApacheCustomActionDataValue After=WriteRegistryValues +![CDATA[apache13 = 3 OR apache20 = 3 OR apache22 = 3 OR apacheCGI = 3]] /Custom - Custom Action=configApache After=InstallFinalize + Custom Action=configApache After=configApacheCustomActionDataValue ![CDATA[apache13 = 3 OR apache20 = 3 OR apache22 = 3 OR apacheCGI = 3]] /Custom + Custom Action=unconfigApache After=InstallInitialize +![CDATA[apache13 = 2 OR apache20 = 2 OR apache22 = 2 OR apacheCGI = 2]] + /Custom RemoveExistingProducts After=InstallValidate / /InstallExecuteSequence Modified: php/win-installer/trunk/PHPInstallerBase52NTS.wxs === --- php/win-installer/trunk/PHPInstallerBase52NTS.wxs 2009-09-30 13:32:18 UTC (rev 288995) +++ php/win-installer/trunk/PHPInstallerBase52NTS.wxs 2009-09-30 13:44:28 UTC (rev 288996) @@ -651,10 +651,18 @@ CustomAction Id=configIIS4 BinaryKey=PHPInstallerScripts Return=check + Execute=deferred + Impersonate=no VBScriptCall=configIIS4 / +CustomAction Id=configIIS4CustomActionDataValue + Return=check + Property=configIIS4 + Value=[INSTALLDIR] / CustomAction Id=unconfigIIS4 BinaryKey=PHPInstallerScripts Return=check + Execute=deferred + Impersonate=no
