[mapguide-commits] r6583 - in trunk/Installer: Installers/MapGuide
Libraries/MapGuide Web Extensions
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Apr 20 14:28:31 EDT 2012
Author: jng
Date: 2012-04-20 11:28:30 -0700 (Fri, 20 Apr 2012)
New Revision: 6583
Modified:
trunk/Installer/Installers/MapGuide/MapGuide.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/IIS7.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs
Log:
#1805: More installer updates:
- Persist VIRTUALDIR and APP_POOL_NAME MSI properties to the registry, so that they are correct for uninstallation
- #1985: Add missing custom action calls for setting WOW compatibility in 64-bit windows from 32-bit Installer
- Ensure dotnetsamples, dotnetviewersample and mapviewernet virtual dirs are removed on uninstall
Modified: trunk/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wxs 2012-04-20 17:26:54 UTC (rev 6582)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs 2012-04-20 18:28:30 UTC (rev 6583)
@@ -49,7 +49,15 @@
<Property Id="APACHE_VERSION" Secure="yes" Value="2.2.21" />
<Property Id="PHP_VERSION" Secure="yes" Value="5.3.8" />
<Property Id="MG_VERSION_MAJOR_MINOR" Secure="yes" Value="2.4" />
- <Property Id="APP_POOL_NAME" Secure="yes" Value="MapGuide24AppPool" />
+ <Property Id="APP_POOL_NAME" Secure="yes" Value="MapGuide24AppPool">
+ <RegistrySearch
+ Id="MgAppPoolNameRs"
+ Type="raw"
+ Root="HKLM"
+ Win64="$(var.Win64)"
+ Key="$(var.MgRegKey)"
+ Name="APP_POOL_NAME" />
+ </Property>
<!-- Server Port Settings -->
<Property Id="MG_ADMIN_PORT" Secure="yes" Value="2810" />
<Property Id="MG_CLIENT_PORT" Secure="yes" Value="2811" />
@@ -67,7 +75,15 @@
properties to be exposed in the dialog UI.
-->
<Property Id="SITE_ID" Secure="yes" Value="1" />
- <Property Id="VIRTUALDIR" Secure="yes" Value="mapguide" />
+ <Property Id="VIRTUALDIR" Secure="yes" Value="mapguide">
+ <RegistrySearch
+ Id="MgVirtualDirRs"
+ Type="raw"
+ Root="HKLM"
+ Win64="$(var.Win64)"
+ Key="$(var.MgRegKey)"
+ Name="VIRTUALDIR" />
+ </Property>
<Property Id="MG_WEBSITE" Secure="yes" Value="Default Web Site">
<RegistrySearch
Id="MgWebsiteRs"
@@ -731,7 +747,14 @@
<Custom Action="MapGuideIIS7_I_CreateFastCgi_Cmd" After="MapGuideIIS7_I_AppCmd_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
<Custom Action="MapGuideIIS7_I_CreateAppPool_Cmd" After="MapGuideIIS7_I_CreateFastCgi_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
<Custom Action="MapGuideIIS7_I_SetAppPoolProp_Cmd" After="MapGuideIIS7_I_CreateAppPool_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+
+ <?if "$(var.MgPlatform)" = "x64" ?>
<Custom Action="MapGuideIIS7_I_UnlockSrvHandlers_Cmd" After="MapGuideIIS7_I_SetAppPoolProp_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+ <?else ?>
+ <Custom Action="MapGuideIIS7_I_Set32BitAppPool_Cmd" After="MapGuideIIS7_I_SetAppPoolProp_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_UnlockSrvHandlers_Cmd" After="MapGuideIIS7_I_Set32BitAppPool_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+ <?endif ?>
+
<Custom Action="MapGuideIIS7_I_UnlockSiteHandlers_Cmd" After="MapGuideIIS7_I_UnlockSrvHandlers_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
<Custom Action="MapGuideIIS7_I_CreateMapGuideApp_Cmd" After="MapGuideIIS7_I_UnlockSiteHandlers_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
<Custom Action="MapGuideIIS7_I_SelectXmlCompat_Cmd" After="MapGuideIIS7_I_CreateMapGuideApp_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
@@ -826,15 +849,21 @@
<!-- IIS7 UNINSTALL deferred action properties -->
<Custom Action="MapGuideIIS7_U_AppCmd_Cmd" After="InstallInitialize">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
<Custom Action="MapGuideIIS7_U_ClearMapAgentRestriction_Cmd" After="MapGuideIIS7_U_AppCmd_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
- <Custom Action="MapGuideIIS7_U_RemoveViewer_Cmd" After="MapGuideIIS7_U_ClearMapAgentRestriction_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
- <Custom Action="MapGuideIIS7_U_RemoveMapAgent_Cmd" After="MapGuideIIS7_U_RemoveViewer_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
+ <Custom Action="MapGuideIIS7_U_RemoveDotNetSamples_Cmd" After="MapGuideIIS7_U_ClearMapAgentRestriction_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
+ <Custom Action="MapGuideIIS7_U_RemoveDotNetViewerSample_Cmd" After="MapGuideIIS7_U_RemoveDotNetSamples_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
+ <Custom Action="MapGuideIIS7_U_RemoveViewer_Cmd" After="MapGuideIIS7_U_RemoveDotNetViewerSample_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
+ <Custom Action="MapGuideIIS7_U_RemoveViewerNet_Cmd" After="MapGuideIIS7_U_RemoveViewer_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
+ <Custom Action="MapGuideIIS7_U_RemoveMapAgent_Cmd" After="MapGuideIIS7_U_RemoveViewerNet_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
<Custom Action="MapGuideIIS7_U_RemoveMapGuide_Cmd" After="MapGuideIIS7_U_RemoveMapAgent_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
<Custom Action="MapGuideIIS7_U_DeleteAppPool_Cmd" After="MapGuideIIS7_U_RemoveMapGuide_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
<!-- IIS7 UNINSTALL deferred CAs -->
<Custom Action="MapGuideIIS7_U_ClearMapAgentRestriction" After="MapGuideIIS7_U_DeleteAppPool_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
- <Custom Action="MapGuideIIS7_U_RemoveViewer" After="MapGuideIIS7_U_ClearMapAgentRestriction">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
- <Custom Action="MapGuideIIS7_U_RemoveMapAgent" After="MapGuideIIS7_U_RemoveViewer">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
+ <Custom Action="MapGuideIIS7_U_RemoveDotNetSamples" After="MapGuideIIS7_U_ClearMapAgentRestriction">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
+ <Custom Action="MapGuideIIS7_U_RemoveDotNetViewerSample" After="MapGuideIIS7_U_RemoveDotNetSamples">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
+ <Custom Action="MapGuideIIS7_U_RemoveViewer" After="MapGuideIIS7_U_RemoveDotNetViewerSample">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
+ <Custom Action="MapGuideIIS7_U_RemoveViewerNet" After="MapGuideIIS7_U_RemoveViewer">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
+ <Custom Action="MapGuideIIS7_U_RemoveMapAgent" After="MapGuideIIS7_U_RemoveViewerNet">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
<Custom Action="MapGuideIIS7_U_RemoveMapGuide" After="MapGuideIIS7_U_RemoveMapAgent">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
<Custom Action="MapGuideIIS7_U_DeleteAppPool" After="MapGuideIIS7_U_RemoveMapGuide">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/IIS7.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/IIS7.wxs 2012-04-20 17:26:54 UTC (rev 6582)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/IIS7.wxs 2012-04-20 18:28:30 UTC (rev 6583)
@@ -18,7 +18,7 @@
<!-- Set up FastCGI -->
<CustomAction Id="MapGuideIIS7_I_CreateFastCgi_Cmd" Property="MapGuideIIS7_I_CreateFastCgi" Execute="immediate"
Value="[AppCmd] set config /section:system.webServer/fastCGI "/+[\[]fullPath='[PHPLOCATION]php-cgi.exe'[\]]"" />
- <CustomAction Id="MapGuideIIS7_I_CreateFastCgi" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="check" Impersonate="no"/>
+ <CustomAction Id="MapGuideIIS7_I_CreateFastCgi" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
<!-- Set the application pool's properties -->
<CustomAction Id="MapGuideIIS7_I_SetAppPoolProp_Cmd" Property="MapGuideIIS7_I_SetAppPoolProp" Execute="immediate"
@@ -215,6 +215,11 @@
Value="[AppCmd] delete app "[MG_WEBSITE]/[VIRTUALDIR]/mapviewerajax"" />
<CustomAction Id="MapGuideIIS7_U_RemoveViewer" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
+ <!-- Remove MapViewerNet application -->
+ <CustomAction Id="MapGuideIIS7_U_RemoveViewerNet_Cmd" Property="MapGuideIIS7_U_RemoveViewerNet" Execute="immediate"
+ Value="[AppCmd] delete app "[MG_WEBSITE]/[VIRTUALDIR]/mapviewernet"" />
+ <CustomAction Id="MapGuideIIS7_U_RemoveViewerNet" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
+
<!-- Remove dotnetsamples application -->
<CustomAction Id="MapGuideIIS7_U_RemoveDotNetSamples_Cmd" Property="MapGuideIIS7_U_RemoveDotNetSamples" Execute="immediate"
Value="[AppCmd] delete app "[MG_WEBSITE]/[VIRTUALDIR]/dotnetsamples"" />
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs 2012-04-20 17:26:54 UTC (rev 6582)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs 2012-04-20 18:28:30 UTC (rev 6583)
@@ -44,6 +44,8 @@
<RegistryKey Id="MapGuideKey" Action="create" Root="HKLM" Key="$(var.MgRegKey)">
<RegistryValue Id="IisApiType" Action="write" Type="string" Name="IIS_API_TYPE" Value="[IIS_API_TYPE]" />
<RegistryValue Id="MgWebConfig" Action="write" Type="string" Name="MGWEB_CONFIG" Value="[MGWEB_CONFIG]" />
+ <RegistryValue Id="MgApplicationPoolName" Action="write" Type="string" Name="APP_POOL_NAME" Value="[APP_POOL_NAME]" />
+ <RegistryValue Id="MgVirtualDir" Action="write" Type="string" Name="VIRTUALDIR" Value="[VIRTUALDIR]" />
</RegistryKey>
<CreateFolder />
</Component>
More information about the mapguide-commits
mailing list