jmertic Thu Sep 11 19:14:57 2008 UTC
Modified files:
/win-installer PHPInstallerBase52NTS.wxs PHPInstallerBase53NTS.wxs
PHPInstallerBase60NTS.wxs PHPInstallerCommonNTS.wxs
WebServerConfig52NTS.wxs WebServerConfig53NTS.wxs
WebServerConfig60NTS.wxs
Log:
Added option to install just the CGI binary for the NTS builds ( no auto
config )
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.3&r2=1.4&diff_format=u
Index: win-installer/PHPInstallerBase52NTS.wxs
diff -u win-installer/PHPInstallerBase52NTS.wxs:1.3
win-installer/PHPInstallerBase52NTS.wxs:1.4
--- win-installer/PHPInstallerBase52NTS.wxs:1.3 Wed Sep 10 20:32:05 2008
+++ win-installer/PHPInstallerBase52NTS.wxs Thu Sep 11 19:14:57 2008
@@ -396,6 +396,14 @@
<ComponentRef Id="cgiforceredirect"/>
<ComponentRef Id="iis4FastCGIregistry"/>
</Feature>
+ <Feature AllowAdvertise="no"
+ Id="cgi"
+ Title="$(loc.FeaturecgiTitle)"
+ Description="$(loc.FeaturecgiDescription)"
+ Level="1">
+ <ComponentRef Id="phpcgiEXE"/>
+ <ComponentRef Id="cgiregistry"/>
+ </Feature>
<Feature AllowAdvertise="no"
Id="noconfig"
Title="$(loc.FeaturecgiTitle)"
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.2&r2=1.3&diff_format=u
Index: win-installer/PHPInstallerBase53NTS.wxs
diff -u win-installer/PHPInstallerBase53NTS.wxs:1.2
win-installer/PHPInstallerBase53NTS.wxs:1.3
--- win-installer/PHPInstallerBase53NTS.wxs:1.2 Wed Sep 10 20:32:05 2008
+++ win-installer/PHPInstallerBase53NTS.wxs Thu Sep 11 19:14:57 2008
@@ -374,6 +374,14 @@
<ComponentRef Id="cgiforceredirect"/>
<ComponentRef Id="iis4FastCGIregistry"/>
</Feature>
+ <Feature AllowAdvertise="no"
+ Id="cgi"
+ Title="$(loc.FeaturecgiTitle)"
+ Description="$(loc.FeaturecgiDescription)"
+ Level="1">
+ <ComponentRef Id="phpcgiEXE"/>
+ <ComponentRef Id="cgiregistry"/>
+ </Feature>
<Feature AllowAdvertise="no"
Id="noconfig"
Title="$(loc.FeaturecgiTitle)"
@@ -404,14 +412,17 @@
<CustomAction Id="iis700FastCGIadd"
ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET
CONFIG /section:system.webServer/fastCGI
/+[fullPath='[INSTALLDIR]php-cgi.exe']"
Return="ignore"
+ Execute="deferred"
Directory="INSTALLDIR"/>
<CustomAction Id="iis700FastCGI"
ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET
CONFIG /section:system.webServer/handlers
/+[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either']
"
Return="ignore"
+ Execute="deferred"
Directory="INSTALLDIR"/>
<CustomAction Id="iis700FastCGIremove"
ExeCommand=""[WindowsFolder]system32\inetsrv\APPCMD.EXE" SET
CONFIG /section:system.webServer/handlers
/-[name='PHP-FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either']
"
Return="ignore"
+ Execute="deferred"
Directory="INSTALLDIR"/>
<CustomAction Id="fcgiconfigJSFastCGI"
ExeCommand="cscript
"[WindowsFolder]system32\inetsrv\fcgiconfig.js" -add
-section:"PHP" -extension:php
-path:"[INSTALLDIR]php-cgi.exe""
@@ -431,13 +442,13 @@
VBScriptCall="unconfigIIS4" />
<InstallExecuteSequence>
- <Custom Action="iis700FastCGIadd" After="InstallFinalize">
+ <Custom Action="iis700FastCGIadd" After="InstallInitialize">
<![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
</Custom>
- <Custom Action="iis700FastCGI" After="InstallFinalize">
+ <Custom Action="iis700FastCGI" After="InstallInitialize">
<![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
</Custom>
- <Custom Action="iis700FastCGIremove" After="InstallFinalize">
+ <Custom Action="iis700FastCGIremove" After="InstallInitialize">
<![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]>
</Custom>
<Custom Action="fcgiconfigJSFastCGI" After="InstallFinalize">
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60NTS.wxs?r1=1.3&r2=1.4&diff_format=u
Index: win-installer/PHPInstallerBase60NTS.wxs
diff -u win-installer/PHPInstallerBase60NTS.wxs:1.3
win-installer/PHPInstallerBase60NTS.wxs:1.4
--- win-installer/PHPInstallerBase60NTS.wxs:1.3 Wed Sep 10 20:33:14 2008
+++ win-installer/PHPInstallerBase60NTS.wxs Thu Sep 11 19:14:57 2008
@@ -374,6 +374,14 @@
<ComponentRef Id="cgiforceredirect"/>
<ComponentRef Id="iis4FastCGIregistry"/>
</Feature>
+ <Feature AllowAdvertise="no"
+ Id="cgi"
+ Title="$(loc.FeaturecgiTitle)"
+ Description="$(loc.FeaturecgiDescription)"
+ Level="1">
+ <ComponentRef Id="phpcgiEXE"/>
+ <ComponentRef Id="cgiregistry"/>
+ </Feature>
<Feature AllowAdvertise="no"
Id="noconfig"
Title="$(loc.FeaturecgiTitle)"
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerCommonNTS.wxs?r1=1.2&r2=1.3&diff_format=u
Index: win-installer/PHPInstallerCommonNTS.wxs
diff -u win-installer/PHPInstallerCommonNTS.wxs:1.2
win-installer/PHPInstallerCommonNTS.wxs:1.3
--- win-installer/PHPInstallerCommonNTS.wxs:1.2 Wed Sep 10 20:32:05 2008
+++ win-installer/PHPInstallerCommonNTS.wxs Thu Sep 11 19:14:57 2008
@@ -556,8 +556,10 @@
X="20" Y="50" Width="330" Height="180" Property="WEBSERVERPICKER"
/>
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56"
Height="17" Default="yes" Text="$(loc.WixUINext)">
<Publish Event="AddLocal"
Value="iis4FastCGI"><![CDATA[WEBSERVERPICKER = "iis4FastCGI"]]></Publish>
+ <Publish Event="AddLocal" Value="cgi"><![CDATA[WEBSERVERPICKER =
"cgi"]]></Publish>
<Publish Event="AddLocal" Value="noconfig"><![CDATA[WEBSERVERPICKER
= "noconfig"]]></Publish>
<Publish Event="Remove" Value="iis4FastCGI"><![CDATA[WEBSERVERPICKER
<> "iis4FastCGI"]]></Publish>
+ <Publish Event="Remove" Value="cgi"><![CDATA[WEBSERVERPICKER <>
"cgi"]]></Publish>
<Publish Event="Remove" Value="noconfig"><![CDATA[WEBSERVERPICKER <>
"noconfig"]]></Publish>
<Publish Event="SpawnDialog"
Value="FastCGINotInstalled"><![CDATA[WEBSERVERPICKER = "iis4FastCGI" AND
FASTCGIINSTALLED = 0]]></Publish>
<Publish Event="NewDialog"
Value="[WixUI_WebServerDlg_Next]"><![CDATA[WEBSERVERPICKER <> "iis4FastCGI" OR
(WEBSERVERPICKER = "iis4FastCGI" AND FASTCGIINSTALLED <> 0)]]></Publish>
@@ -584,8 +586,10 @@
<RadioButtonGroup Property="WEBSERVERPICKER">
<RadioButton Text="$(loc.Featureiis4FastCGITitle)"
Value="iis4FastCGI" X="5" Y="0" Width="250" Height="15" />
- <RadioButton Text="$(loc.WebServerDlgNoWebServer)"
- Value="noconfig" X="5" Y="12" Width="250" Height="15" />
+ <RadioButton Text="$(loc.FeaturecgiTitle)"
+ Value="cgi" X="5" Y="15" Width="250" Height="15" />
+ <RadioButton Text="$(loc.WebServerDlgNoWebServer)"
+ Value="noconfig" X="5" Y="30" Width="250" Height="15" />
</RadioButtonGroup>
http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig52NTS.wxs?r1=1.1&r2=1.2&diff_format=u
Index: win-installer/WebServerConfig52NTS.wxs
diff -u win-installer/WebServerConfig52NTS.wxs:1.1
win-installer/WebServerConfig52NTS.wxs:1.2
--- win-installer/WebServerConfig52NTS.wxs:1.1 Sat Apr 12 19:24:30 2008
+++ win-installer/WebServerConfig52NTS.wxs Thu Sep 11 19:14:57 2008
@@ -18,6 +18,17 @@
Type="string"
Value="iis4FastCGI"/>
</Component>
+ <Component Id="cgiregistry"
+ DiskId="1"
+ Guid="6B49A096-49A4-11DC-8314-0800200C9A66">
+ <Registry Id="cgiregistryWebServerType"
+ Root="HKLM"
+ Key="Software\PHP"
+ Name="WebServerType"
+ Action="write"
+ Type="string"
+ Value="cgi"/>
+ </Component>
<Component Id="noconfigregistry"
DiskId="1"
Guid="6B49A097-49A4-11DC-8314-0800200C9A66">
http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig53NTS.wxs?r1=1.1&r2=1.2&diff_format=u
Index: win-installer/WebServerConfig53NTS.wxs
diff -u win-installer/WebServerConfig53NTS.wxs:1.1
win-installer/WebServerConfig53NTS.wxs:1.2
--- win-installer/WebServerConfig53NTS.wxs:1.1 Fri Aug 22 18:51:40 2008
+++ win-installer/WebServerConfig53NTS.wxs Thu Sep 11 19:14:57 2008
@@ -18,6 +18,17 @@
Type="string"
Value="iis4FastCGI"/>
</Component>
+ <Component Id="cgiregistry"
+ DiskId="1"
+ Guid="6B49A096-49A4-11DC-8314-0800200C9A66">
+ <Registry Id="cgiregistryWebServerType"
+ Root="HKLM"
+ Key="Software\PHP"
+ Name="WebServerType"
+ Action="write"
+ Type="string"
+ Value="cgi"/>
+ </Component>
<Component Id="noconfigregistry"
DiskId="1"
Guid="6B49A097-49A4-11DC-8314-0800200C9A66">
http://cvs.php.net/viewvc.cgi/win-installer/WebServerConfig60NTS.wxs?r1=1.1&r2=1.2&diff_format=u
Index: win-installer/WebServerConfig60NTS.wxs
diff -u win-installer/WebServerConfig60NTS.wxs:1.1
win-installer/WebServerConfig60NTS.wxs:1.2
--- win-installer/WebServerConfig60NTS.wxs:1.1 Sat Apr 12 19:24:30 2008
+++ win-installer/WebServerConfig60NTS.wxs Thu Sep 11 19:14:57 2008
@@ -18,6 +18,17 @@
Type="string"
Value="iis4FastCGI"/>
</Component>
+ <Component Id="cgiregistry"
+ DiskId="1"
+ Guid="6B49A096-49A4-11DC-8314-0800200C9A66">
+ <Registry Id="cgiregistryWebServerType"
+ Root="HKLM"
+ Key="Software\PHP"
+ Name="WebServerType"
+ Action="write"
+ Type="string"
+ Value="cgi"/>
+ </Component>
<Component Id="noconfigregistry"
DiskId="1"
Guid="6B49A097-49A4-11DC-8314-0800200C9A66">
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
