cvs: win-installer / PHPInstallerCommon.wxs PHPInstallerCommonNTS.wxs
| From: | John Mertic | Date: | Mon, 10 Nov 2008 16:05:03 +0000 |
| Subject: | cvs: win-installer / PHPInstallerCommon.wxs PHPInstallerCommonNTS.wxs | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-54143@lists.php.net to get a copy of this message | ||
jmertic Mon Nov 10 16:05:03 2008 UTC
Modified files:
/win-installer PHPInstallerCommon.wxs PHPInstallerCommonNTS.wxs
Log:
Fixed message displayed when IIS FastCGI is selected but not installed on Windows 2003 Server.
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerCommon.wxs?r1=1.11&r2=1.12&diff_format=u
Index: win-installer/PHPInstallerCommon.wxs
diff -u win-installer/PHPInstallerCommon.wxs:1.11 win-installer/PHPInstallerCommon.wxs:1.12
--- win-installer/PHPInstallerCommon.wxs:1.11 Wed Sep 10 20:49:17 2008
+++ win-installer/PHPInstallerCommon.wxs Mon Nov 10 16:05:03 2008
@@ -278,11 +278,11 @@
Default="yes" Cancel="yes" Text="$(loc.WixUIOK)">
<Publish Event="EndDialog" Value="Return">1</Publish>
</Control>
- <Control Id="iis6Text" Type="Text" X="48" Y="15"
Width="194" Height="30" TabSkip="no"
Text="$(loc.FastCGINotInstalledIIS6)">
- <Condition Action="show">VersionNT = 502</Condition>
+ <Control Id="iis6Text" Type="Text" X="48" Y="15"
Width="194" Height="30" TabSkip="no" Hidden="yes"
Text="$(loc.FastCGINotInstalledIIS6)">
+ <Condition Action="show"><![CDATA[VersionNT <
600]]></Condition>
</Control>
- <Control Id="iis7Text" Type="Text" X="48" Y="15"
Width="194" Height="30" TabSkip="no"
Text="$(loc.FastCGINotInstalledIIS7)">
- <Condition Action="show">VersionNT >= 600</Condition>
+ <Control Id="iis7Text" Type="Text" X="48" Y="15"
Width="194" Height="30" TabSkip="no" Hidden="yes"
Text="$(loc.FastCGINotInstalledIIS7)">
+ <Condition Action="show"><![CDATA[VersionNT >=
600]]></Condition>
</Control>
</Dialog>
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerCommonNTS.wxs?r1=1.3&r2=1.4&diff_format=u
Index: win-installer/PHPInstallerCommonNTS.wxs
diff -u win-installer/PHPInstallerCommonNTS.wxs:1.3 win-installer/PHPInstallerCommonNTS.wxs:1.4
--- win-installer/PHPInstallerCommonNTS.wxs:1.3 Thu Sep 11 19:14:57 2008
+++ win-installer/PHPInstallerCommonNTS.wxs Mon Nov 10 16:05:03 2008
@@ -228,11 +228,11 @@
Default="yes" Cancel="yes" Text="$(loc.WixUIOK)">
<Publish Event="EndDialog" Value="Return">1</Publish>
</Control>
- <Control Id="iis6Text" Type="Text" X="48" Y="15"
Width="194" Height="30" TabSkip="no"
Text="$(loc.FastCGINotInstalledIIS6)">
- <Condition Action="show">VersionNT = 502</Condition>
+ <Control Id="iis6Text" Type="Text" X="48" Y="15"
Width="194" Height="30" TabSkip="no" Hidden="yes"
Text="$(loc.FastCGINotInstalledIIS6)">
+ <Condition Action="show"><![CDATA[VersionNT <
600]]></Condition>
</Control>
- <Control Id="iis7Text" Type="Text" X="48" Y="15"
Width="194" Height="30" TabSkip="no"
Text="$(loc.FastCGINotInstalledIIS7)">
- <Condition Action="show">VersionNT >= 600</Condition>
+ <Control Id="iis7Text" Type="Text" X="48" Y="15"
Width="194" Height="30" TabSkip="no" Hidden="yes"
Text="$(loc.FastCGINotInstalledIIS7)">
+ <Condition Action="show"><![CDATA[VersionNT >=
600]]></Condition>
</Control>
</Dialog>