jmertic Wed, 12 May 2010 19:18:22 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=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">
<![CDATA[&apache13 = 3 OR &apache20 = 3 OR &apache22 = 3 OR &apacheCGI = 3]]>
</Custom>
<Custom Action="unconfigApache" After="InstallInitialize" >
Modified: php/win-installer/trunk/PHPInstallerBase52NTS.wxs
===================================================================
--- php/win-installer/trunk/PHPInstallerBase52NTS.wxs 2010-05-12 18:51:53 UTC (rev 299303)
+++ php/win-installer/trunk/PHPInstallerBase52NTS.wxs 2010-05-12 19:18:22 UTC (rev 299304)
@@ -661,10 +661,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"
@@ -805,12 +813,18 @@
<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]]>
</Custom>
Modified: php/win-installer/trunk/PHPInstallerBase53.wxs
===================================================================
--- php/win-installer/trunk/PHPInstallerBase53.wxs 2010-05-12 18:51:53 UTC (rev 299303)
+++ php/win-installer/trunk/PHPInstallerBase53.wxs 2010-05-12 19:18:22 UTC (rev 299304)
@@ -780,10 +780,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"
@@ -796,10 +804,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"
@@ -958,19 +978,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">
<![CDATA[&apache13 = 3 OR &apache20 = 3 OR &apache22 = 3 OR &apacheCGI = 3]]>
</Custom>
<Custom Action="unconfigApache" After="InstallInitialize" >
Modified: php/win-installer/trunk/PHPInstallerBase53NTS.wxs
===================================================================
--- php/win-installer/trunk/PHPInstallerBase53NTS.wxs 2010-05-12 18:51:53 UTC (rev 299303)
+++ php/win-installer/trunk/PHPInstallerBase53NTS.wxs 2010-05-12 19:18:22 UTC (rev 299304)
@@ -670,10 +670,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"
@@ -814,12 +822,18 @@
<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]]>
</Custom>
Modified: php/win-installer/trunk/PHPInstallerBase60.wxs
===================================================================
--- php/win-installer/trunk/PHPInstallerBase60.wxs 2010-05-12 18:51:53 UTC (rev 299303)
+++ php/win-installer/trunk/PHPInstallerBase60.wxs 2010-05-12 19:18:22 UTC (rev 299304)
@@ -781,10 +781,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"
@@ -797,10 +805,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"
@@ -959,19 +979,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">
<![CDATA[&apache13 = 3 OR &apache20 = 3 OR &apache22 = 3 OR &apacheCGI = 3]]>
</Custom>
<Custom Action="unconfigApache" After="InstallInitialize" >
Modified: php/win-installer/trunk/PHPInstallerBase60NTS.wxs
===================================================================
--- php/win-installer/trunk/PHPInstallerBase60NTS.wxs 2010-05-12 18:51:53 UTC (rev 299303)
+++ php/win-installer/trunk/PHPInstallerBase60NTS.wxs 2010-05-12 19:18:22 UTC (rev 299304)
@@ -676,10 +676,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"
@@ -820,12 +828,18 @@
<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]]>
</Custom>
Modified: php/win-installer/trunk/PHPInstallerScripts52.vbs
===================================================================
--- php/win-installer/trunk/PHPInstallerScripts52.vbs 2010-05-12 18:51:53 UTC (rev 299303)
+++ php/win-installer/trunk/PHPInstallerScripts52.vbs 2010-05-12 19:18:22 UTC (rev 299304)
@@ -9,11 +9,11 @@
Args = Split( Session.Property("CustomActionData"), "," )
strApacheDir = Args(0)
strInstallDir = Args(1)
+ strWebServerType = Args(2)
If ( right(strApacheDir,1) <> "\" ) then
strApacheDir = strApacheDir & "\"
End If
- strWebServerType = GetRegistryValue("Software\PHP","WebServerType")
strPHPPath = Replace(strInstallDir,"\","/")
strDirective = vbCrLf & vbCrLf & "#BEGIN PHP INSTALLER EDITS - REMOVE ONLY ON UNINSTALL" & vbCrLf
@@ -168,8 +168,9 @@
Dim DefaultDocuments
fAddScriptMap = TRUE
- strWebServerType = GetRegistryValue("Software\PHP","WebServerType")
- strPHPPath = Session.Property("CustomActionData")
+ Args = Split( Session.Property("CustomActionData"), "," )
+ strPHPPath = Args(0)
+ strWebServerType = Args(1)
If ( right(strPHPPath,1) <> "\" ) then
strPHPPath = strPHPPath & "\"
End If
Modified: php/win-installer/trunk/PHPInstallerScripts53.vbs
===================================================================
--- php/win-installer/trunk/PHPInstallerScripts53.vbs 2010-05-12 18:51:53 UTC (rev 299303)
+++ php/win-installer/trunk/PHPInstallerScripts53.vbs 2010-05-12 19:18:22 UTC (rev 299304)
@@ -9,11 +9,11 @@
Args = Split( Session.Property("CustomActionData"), "," )
strApacheDir = Args(0)
strInstallDir = Args(1)
+ strWebServerType = Args(2)
If ( right(strApacheDir,1) <> "\" ) then
strApacheDir = strApacheDir & "\"
End If
- strWebServerType = GetRegistryValue("Software\PHP","WebServerType")
strPHPPath = Replace(strInstallDir,"\","/")
strDirective = vbCrLf & vbCrLf & "#BEGIN PHP INSTALLER EDITS - REMOVE ONLY ON UNINSTALL" & vbCrLf
@@ -168,8 +168,9 @@
Dim DefaultDocuments
fAddScriptMap = TRUE
- strWebServerType = GetRegistryValue("Software\PHP","WebServerType")
- strPHPPath = Session.Property("CustomActionData")
+ Args = Split( Session.Property("CustomActionData"), "," )
+ strPHPPath = Args(0)
+ strWebServerType = Args(1)
If ( right(strPHPPath,1) <> "\" ) then
strPHPPath = strPHPPath & "\"
End If
Modified: php/win-installer/trunk/PHPInstallerScripts60.vbs
===================================================================
--- php/win-installer/trunk/PHPInstallerScripts60.vbs 2010-05-12 18:51:53 UTC (rev 299303)
+++ php/win-installer/trunk/PHPInstallerScripts60.vbs 2010-05-12 19:18:22 UTC (rev 299304)
@@ -9,11 +9,11 @@
Args = Split( Session.Property("CustomActionData"), "," )
strApacheDir = Args(0)
strInstallDir = Args(1)
+ strWebServerType = Args(2)
If ( right(strApacheDir,1) <> "\" ) then
strApacheDir = strApacheDir & "\"
End If
- strWebServerType = GetRegistryValue("Software\PHP","WebServerType")
strPHPPath = Replace(strInstallDir,"\","/")
strDirective = vbCrLf & vbCrLf & "#BEGIN PHP INSTALLER EDITS - REMOVE ONLY ON UNINSTALL" & vbCrLf
@@ -169,8 +169,9 @@
Dim DefaultDocuments
fAddScriptMap = TRUE
- strWebServerType = GetRegistryValue("Software\PHP","WebServerType")
- strPHPPath = Session.Property("CustomActionData")
+ Args = Split( Session.Property("CustomActionData"), "," )
+ strPHPPath = Args(0)
+ strWebServerType = Args(1)
If ( right(strPHPPath,1) <> "\" ) then
strPHPPath = strPHPPath & "\"
End If
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
