[mapguide-commits] r5033 - in trunk/Installer: Installers/MapGuide
Libraries/MapGuide Web Extensions
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Jul 16 06:03:45 EDT 2010
Author: jng
Date: 2010-07-16 10:03:44 +0000 (Fri, 16 Jul 2010)
New Revision: 5033
Modified:
trunk/Installer/Installers/MapGuide/MapGuide.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/IIS7.wxs
Log:
This submission includes the following changes:
- #1062: Set Application Pool to 32-bit for IIS7. This only applies when running an x86 installer on 64-bit windows.
- #1388: Set mandatory reboot for IIS configuration on 64-bit windows. A reboot is required to resolve this issue. Alternatively, users who do not wish to reboot can use IIS environment variable overrides to have a functional MG installation without rebooting (http://www.teachout.com/Blog/tabid/165/EntryId/246/Windows-Environment-Variables-Overrides-for-IIS6.aspx)
Modified: trunk/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wxs 2010-07-15 21:47:04 UTC (rev 5032)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs 2010-07-16 10:03:44 UTC (rev 5033)
@@ -607,7 +607,14 @@
<!-- IIS7 Base deferred CAs -->
<Custom Action="MapGuideIIS7_I_CreateAppPool" After="InstallFiles">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
<Custom Action="MapGuideIIS7_I_SetAppPoolProp" After="MapGuideIIS7_I_CreateAppPool">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+
+ <?if "$(var.MgPlatform)" = "x64" ?>
<Custom Action="MapGuideIIS7_I_UnlockSrvHandlers" After="MapGuideIIS7_I_SetAppPoolProp">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+ <?else ?>
+ <Custom Action="MapGuideIIS7_I_Set32BitAppPool" After="MapGuideIIS7_I_SetAppPoolProp">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_UnlockSrvHandlers" After="MapGuideIIS7_I_Set32BitAppPool">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+ <?endif ?>
+
<Custom Action="MapGuideIIS7_I_UnlockSiteHandlers" After="MapGuideIIS7_I_UnlockSrvHandlers">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
<Custom Action="MapGuideIIS7_I_CreateMapGuideApp" After="MapGuideIIS7_I_UnlockSiteHandlers">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
<Custom Action="MapGuideIIS7_I_CreatePhpScriptMapping" After="MapGuideIIS7_I_CreateMapGuideApp">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
@@ -752,8 +759,27 @@
<Custom
Action="RemoveApacheServiceCA"
Before="RemoveFiles">MGWEB_CONFIG="APACHE" AND &WebExtApacheFeature=2</Custom>
- <!-- 502 = Windows Server 2003 -->
- <ScheduleReboot After="InstallFinalize">VersionNT<502 AND NOT Installed AND &CSMapFeature>2</ScheduleReboot>
+
+ <!--
+ 64-bit IIS requires a machine reboot in order for MENTOR_DICTIONARY_PATH to be picked up by the Web Extensions
+
+ You can technically avoid this reboot by using IIS environment variable overrides as described here:
+ http://www.teachout.com/Blog/tabid/165/EntryId/246/Windows-Environment-Variables-Overrides-for-IIS6.aspx
+
+ If you follow this approach, just say "no" at the reboot prompt.
+
+ Read the below condition as:
+
+ REBOOT if:
+ (("Configuration is IIS" AND "This is a 64-bit windows") OR ("Windows XP or older"))
+ AND "Not installed" AND "CS-Map is freshly installed"
+
+ The 64-bit condition is tested first before the "Windows XP or older" condition
+
+ 502 is the VersionNT value for Windows Server 2003
+
+ -->
+ <ScheduleReboot After="InstallFinalize">((VersionNT64 AND MGWEB_CONFIG="IIS") OR VersionNT<502) AND NOT Installed AND &CSMapFeature>2</ScheduleReboot>
</InstallExecuteSequence>
</Product>
</Wix>
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/IIS7.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/IIS7.wxs 2010-07-15 21:47:04 UTC (rev 5032)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/IIS7.wxs 2010-07-16 10:03:44 UTC (rev 5033)
@@ -65,6 +65,11 @@
Value="[AppCmd] set config /section:isapiCgiRestriction /+[\[]path='"[WEBEXTENSIONSLOCATION]www\mapagent\isapi_MapAgent.dll"',allowed='True',description='"MapGuide MapAgent ISAPI handler"'[\]]" />
<CustomAction Id="MapGuideIIS7_I_EnableMapAgentExtension" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
+ <!-- Set App Pool to 32-bit mode (applies to 64-bit windows) -->
+ <CustomAction Id="MapGuideIIS7_I_Set32BitAppPool_Cmd" Property="MapGuideIIS7_I_Set32BitAppPool" Execute="immediate"
+ Value="[AppCmd] apppool set /apppool.name:"[APP_POOL_NAME]" /enable32BitAppOnWin64:true" />
+ <CustomAction Id="MapGuideIIS7_I_Set32BitAppPool" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no" />
+
<!-- Make the MapGuide application run in the MapGuide app pool -->
<CustomAction Id="MapGuideIIS7_I_AssignMapGuideAppPool_Cmd" Property="MapGuideIIS7_I_AssignMapGuideAppPool" Execute="immediate"
Value="[AppCmd] set app "[MG_WEBSITE]/[VIRTUALDIR]" /applicationPool:"[APP_POOL_NAME]"" />
More information about the mapguide-commits
mailing list