[mapguide-commits] r6575 - in trunk/Installer: Bootstrapper
Installers/MapGuide Installers/MapGuide/Lang
Libraries/MapGuide Server Libraries/MapGuide Web Extensions
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Apr 18 10:01:19 EDT 2012
Author: jng
Date: 2012-04-18 07:01:19 -0700 (Wed, 18 Apr 2012)
New Revision: 6575
Modified:
trunk/Installer/Bootstrapper/Setup.nsi
trunk/Installer/Installers/MapGuide/Lang/MapGuide_en-US.wxl
trunk/Installer/Installers/MapGuide/MapGuide.wxs
trunk/Installer/Libraries/MapGuide Server/InstallService.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/IIS7.wxs
Log:
#1805: More installer updates:
- Add progress status messages for most custom actions
- #1427: Add check in x64 NSIS bootstrapper to prevent installation on 32-bit windows
- #1984: Set requestValidationMode to 2.0 to fix
- Attach version numbers to certain IIS configuration names to improve configuration uniqueness (still cannot do side-by-side yet)
- Setup /mapguide to use .net 4.0 for IIS5.1/IIS6
Modified: trunk/Installer/Bootstrapper/Setup.nsi
===================================================================
--- trunk/Installer/Bootstrapper/Setup.nsi 2012-04-12 12:46:54 UTC (rev 6574)
+++ trunk/Installer/Bootstrapper/Setup.nsi 2012-04-18 14:01:19 UTC (rev 6575)
@@ -1,3 +1,4 @@
+!include x64.nsh
!ifdef MAXCOMPRESSION
SetCompressor /FINAL /SOLID lzma
@@ -32,6 +33,14 @@
StrCmp $R0 0 +3
MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running."
Abort
+
+; Only for 64-bit installers. Prevent installation on 32-bit windows for obvious reasons
+!if ${CPU} = "x64"
+ ${IfNot} ${RunningX64}
+ MessageBox MB_OK|MB_ICONEXCLAMATION "This installer can only be run on 64-bit windows"
+ Abort
+ ${EndIf}
+!endif
FunctionEnd
Section Main
Modified: trunk/Installer/Installers/MapGuide/Lang/MapGuide_en-US.wxl
===================================================================
--- trunk/Installer/Installers/MapGuide/Lang/MapGuide_en-US.wxl 2012-04-12 12:46:54 UTC (rev 6574)
+++ trunk/Installer/Installers/MapGuide/Lang/MapGuide_en-US.wxl 2012-04-18 14:01:19 UTC (rev 6575)
@@ -80,4 +80,70 @@
<String Id="MgServerUninstallCA">Removing MapGuide Service</String>
<String Id="RemoveApacheServiceCA">Removing Apache Service</String>
<String Id="RemoveTomcatServiceCA">Removing Tomcat Service</String>
+
+ <String Id="MapGuideIIS7_I_UnlockSiteHandlers">Unlocking site handler config</String>
+ <String Id="MapGuideIIS7_I_CreateAppPool">Creating IIS application pool</String>
+ <String Id="MapGuideIIS7_I_CreateFastCgi">Creating FastCgi application mapping</String>
+ <String Id="MapGuideIIS7_I_SetAppPoolProp">Setting Application Pool properties</String>
+ <String Id="MapGuideIIS7_I_CreateMapGuideApp">Creating mapguide virtual dir</String>
+ <String Id="MapGuideIIS7_I_SelectXmlCompat">Applying compatibility settings for selection XML to work</String>
+ <String Id="MapGuideIIS7_I_CreatePhpScriptMapping">Creating PHP handler mapping</String>
+ <String Id="MapGuideIIS7_I_CreateMapAgentApp">Creating mapagent virtual dir</String>
+ <String Id="MapGuideIIS7_I_SetMapAgentHandlerAccess">Setting access policy for mapagent virtual dir</String>
+ <String Id="MapGuideIIS7_I_CreateMapAgentScriptHandling">Creating handler mapping for mapagent virtual dir</String>
+ <String Id="MapGuideIIS7_I_EnableMapAgentExtension">Enabling mapagent ISAPI extension</String>
+ <String Id="MapGuideIIS7_I_AssignMapGuideAppPool">Assigning application pool to mapguide virtual dir</String>
+ <String Id="MapGuideIIS7_I_AssignMapAgentAppPool">Assigning application pool to mapagent virtual dir</String>
+ <String Id="MapGuideIIS7_I_UnlockHttpErrorsMain">Unlocking http errors config</String>
+ <String Id="MapGuideIIS7_I_UnlockHttpErrorsWebSite">Unlocking http errors config for web site</String>
+ <String Id="MapGuideIIS7_I_UnlockHttpErrorsMapGuide">Unlocking http errors config for mapguide virtual dir</String>
+ <String Id="MapGuideIIS7_I_Reset401Handler">Resetting 401 handler</String>
+ <String Id="MapGuideIIS7_I_AddJsonMime">Adding JSON mime type</String>
+ <String Id="MapGuideIIS7_I_CreateViewerPhp">Creating mapviewerajax virtual dir to point to mapviewerphp</String>
+ <String Id="MapGuideIIS7_I_SetViewerDocPhp">Setting default document for mapviewerajax virtual dir</String>
+ <String Id="MapGuideIIS7_I_AssignViewerAppPoolPhp">Setting application pool for mapviewerajax</String>
+ <String Id="MapGuideIIS7_I_CreateViewerNet">Creating mapviewerajax virtual dir to point to mapviewernet</String>
+ <String Id="MapGuideIIS7_I_SetViewerDocNet">Setting default document for mapviewerajax virtual dir</String>
+ <String Id="MapGuideIIS7_I_AssignViewerAppPoolNet">Setting application pool for mapviewerajax</String>
+ <String Id="MapGuideIIS7_I_CreateMapViewerNet">Creating mapviewernet virtual dir</String>
+ <String Id="MapGuideIIS7_I_SetMapViewerDocNet">Setting default document for mapviewernet virtual dir</String>
+ <String Id="MapGuideIIS7_I_AssignMapViewerAppPoolNet">Setting application pool for mapviewernet virtual dir</String>
+ <String Id="MapGuideIIS7_I_CreateViewerSampleNet">Creating dotnetviewersample virtual dir</String>
+ <String Id="MapGuideIIS7_I_SetViewerDocViewerSampleNet">Setting default document for dotnetviewersample virtual dir</String>
+ <String Id="MapGuideIIS7_I_AssignViewerAppPoolViewerSampleNet">Setting application pool for dotnetviewersample virtual dir</String>
+ <String Id="MapGuideIIS7_I_CreateViewerDevGuideSamplesNet">Creating dotnetsamples virtual dir</String>
+ <String Id="MapGuideIIS7_I_SetViewerDocDevGuideSamplesNet">Setting default document for dotnetsamples virtual dir</String>
+ <String Id="MapGuideIIS7_I_AssignViewerAppPoolDevGuideSamplesNet">Setting application pool for dotnetsamples virtual dir</String>
+ <String Id="MapGuideIIS7_U_ClearMapAgentRestriction">Clearing mapagent restrictions</String>
+ <String Id="MapGuideIIS7_U_RemoveViewer">Removing mapviewerajax virtual dir</String>
+ <String Id="MapGuideIIS7_U_RemoveMapAgent">Removing mapagent virtual dir</String>
+ <String Id="MapGuideIIS7_U_RemoveMapGuide">Removing mapguide virtual dir</String>
+ <String Id="MapGuideIIS7_U_DeleteAppPool">Deleting application pool</String>
+ <String Id="AspNetRegIIS">Registering ASP.net</String>
+ <String Id="FdoRegArcSde">Registering FDO Provider: OSGeo.ArcSDE</String>
+ <String Id="FdoRegSdf">Registering FDO Provider: OSGeo.SDF</String>
+ <String Id="FdoRegShp">Registering FDO Provider: OSGeo.SHP</String>
+ <String Id="FdoRegWfs">Registering FDO Provider: OSGeo.WFS</String>
+ <String Id="FdoRegWms">Registering FDO Provider: OSGeo.WMS</String>
+ <String Id="FdoRegOdbc">Registering FDO Provider: OSGeo.ODBC</String>
+ <String Id="FdoRegMySql">Registering FDO Provider: OSGeo.MySQL</String>
+ <String Id="FdoRegGdal">Registering FDO Provider: OSGeo.Gdal</String>
+ <String Id="FdoRegOgr">Registering FDO Provider: OSGeo.OGR</String>
+ <String Id="FdoRegPostgreSql">Registering FDO Provider: OSGeo.PostgreSQL</String>
+ <String Id="FdoRegOracle">Registering FDO Provider: King.Oracle</String>
+ <String Id="FdoRegSqlServer">Registering FDO Provider: OSGeo.SQLServerSpatial</String>
+ <String Id="FdoRegSlt">Registering FDO Provider: OSGeo.SQLite</String>
+ <String Id="FdoUnRegArcSde">Un-registering FDO Provider: OSGeo.ArcSDE</String>
+ <String Id="FdoUnRegSdf">Un-registering FDO Provider: OSGeo.SDF</String>
+ <String Id="FdoUnRegShp">Un-registering FDO Provider: OSGeo.SHP</String>
+ <String Id="FdoUnRegWfs">Un-registering FDO Provider: OSGeo.WFS</String>
+ <String Id="FdoUnRegWms">Un-registering FDO Provider: OSGeo.WMS</String>
+ <String Id="FdoUnRegOdbc">Un-registering FDO Provider: OSGeo.ODBC</String>
+ <String Id="FdoUnRegMySql">Un-registering FDO Provider: OSGeo.MySQL</String>
+ <String Id="FdoUnRegGdal">Un-registering FDO Provider: OSGeo.Gdal</String>
+ <String Id="FdoUnRegOgr">Un-registering FDO Provider: OSGeo.OGR</String>
+ <String Id="FdoUnRegPostgreSql">Un-registering FDO Provider: OSGeo.PostgreSQL</String>
+ <String Id="FdoUnRegOracle">Un-registering FDO Provider: King.Oracle</String>
+ <String Id="FdoUnRegSqlServer">Un-registering FDO Provider: OSGeo.SQLServerSpatial</String>
+ <String Id="FdoUnRegSlt">Un-registering FDO Provider: OSGeo.SQLite</String>
</WixLocalization>
\ No newline at end of file
Modified: trunk/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wxs 2012-04-12 12:46:54 UTC (rev 6574)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs 2012-04-18 14:01:19 UTC (rev 6575)
@@ -55,8 +55,12 @@
<Property Id="MG_CLIENT_PORT" Secure="yes" Value="2811" />
<Property Id="MG_SITE_PORT" Secure="yes" Value="2812" />
<!-- Used by FdoRegUtil.exe -->
- <Property Id="FDO_VERSION" Secure="yes" Value="3.7.0.0" />
<Property Id="FDO_VERSION_SMALL" Secure="yes" Value="3.7" />
+ <Property Id="FDO_VERSION" Secure="yes" Value="[FDO_VERSION_SMALL].0.0" />
+ <!-- IIS vars -->
+ <Property Id="ASPNETVERSION" Value="v4.0" />
+ <Property Id="PHP_FCGI_HANDLER_NAME" Value="MapGuide_[MG_VERSION_MAJOR_MINOR]_PHP_via_FastCGI" />
+ <Property Id="MAPAGENT_ISAPI_NAME" Value="MapGuide [MG_VERSION_MAJOR_MINOR] MapAgent ISAPI handler" />
<!--
These are currently static, though there is opportunity in the future for these
@@ -651,7 +655,68 @@
<ProgressText Action="MgServerUninstallCA">!(loc.MgServerUninstallCA)</ProgressText>
<ProgressText Action="RemoveApacheServiceCA">!(loc.RemoveApacheServiceCA)</ProgressText>
<ProgressText Action="RemoveTomcatServiceCA">!(loc.RemoveTomcatServiceCA)</ProgressText>
-
+ <ProgressText Action="MapGuideIIS7_I_UnlockSiteHandlers">!(loc.MapGuideIIS7_I_UnlockSiteHandlers)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_CreateMapGuideApp">!(loc.MapGuideIIS7_I_CreateMapGuideApp)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_SelectXmlCompat">!(loc.MapGuideIIS7_I_SelectXmlCompat)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_CreatePhpScriptMapping">!(loc.MapGuideIIS7_I_CreatePhpScriptMapping)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_CreateMapAgentApp">!(loc.MapGuideIIS7_I_CreateMapAgentApp)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_SetMapAgentHandlerAccess">!(loc.MapGuideIIS7_I_SetMapAgentHandlerAccess)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_CreateMapAgentScriptHandling">!(loc.MapGuideIIS7_I_CreateMapAgentScriptHandling)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_EnableMapAgentExtension">!(loc.MapGuideIIS7_I_EnableMapAgentExtension)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_AssignMapGuideAppPool">!(loc.MapGuideIIS7_I_AssignMapGuideAppPool)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_AssignMapAgentAppPool">!(loc.MapGuideIIS7_I_AssignMapAgentAppPool)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_UnlockHttpErrorsMain">!(loc.MapGuideIIS7_I_UnlockHttpErrorsMain)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_UnlockHttpErrorsWebSite">!(loc.MapGuideIIS7_I_UnlockHttpErrorsWebSite)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_UnlockHttpErrorsMapGuide">!(loc.MapGuideIIS7_I_UnlockHttpErrorsMapGuide)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_Reset401Handler">!(loc.MapGuideIIS7_I_Reset401Handler)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_AddJsonMime">!(loc.MapGuideIIS7_I_AddJsonMime)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_CreateViewerPhp">!(loc.MapGuideIIS7_I_CreateViewerPhp)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_SetViewerDocPhp">!(loc.MapGuideIIS7_I_SetViewerDocPhp)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_AssignViewerAppPoolPhp">!(loc.MapGuideIIS7_I_AssignViewerAppPoolPhp)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_CreateViewerNet">!(loc.MapGuideIIS7_I_CreateViewerNet)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_SetViewerDocNet">!(loc.MapGuideIIS7_I_SetViewerDocNet)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_AssignViewerAppPoolNet">!(loc.MapGuideIIS7_I_AssignViewerAppPoolNet)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_CreateMapViewerNet">!(loc.MapGuideIIS7_I_CreateMapViewerNet)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_SetMapViewerDocNet">!(loc.MapGuideIIS7_I_SetMapViewerDocNet)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_AssignMapViewerAppPoolNet">!(loc.MapGuideIIS7_I_AssignMapViewerAppPoolNet)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_CreateViewerSampleNet">!(loc.MapGuideIIS7_I_CreateViewerSampleNet)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_SetViewerDocViewerSampleNet">!(loc.MapGuideIIS7_I_SetViewerDocViewerSampleNet)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_AssignViewerAppPoolViewerSampleNet">!(loc.MapGuideIIS7_I_AssignViewerAppPoolViewerSampleNet)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_CreateViewerDevGuideSamplesNet">!(loc.MapGuideIIS7_I_CreateViewerDevGuideSamplesNet)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_SetViewerDocDevGuideSamplesNet">!(loc.MapGuideIIS7_I_SetViewerDocDevGuideSamplesNet)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_I_AssignViewerAppPoolDevGuideSamplesNet">!(loc.MapGuideIIS7_I_AssignViewerAppPoolDevGuideSamplesNet)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_U_ClearMapAgentRestriction">!(loc.MapGuideIIS7_U_ClearMapAgentRestriction)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_U_RemoveViewer">!(loc.MapGuideIIS7_U_RemoveViewer)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_U_RemoveMapAgent">!(loc.MapGuideIIS7_U_RemoveMapAgent)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_U_RemoveMapGuide">!(loc.MapGuideIIS7_U_RemoveMapGuide)</ProgressText>
+ <ProgressText Action="MapGuideIIS7_U_DeleteAppPool">!(loc.MapGuideIIS7_U_DeleteAppPool)</ProgressText>
+ <ProgressText Action="AspNetRegIIS">!(loc.AspNetRegIIS)</ProgressText>
+ <ProgressText Action="FdoRegArcSde">!(loc.FdoRegArcSde)</ProgressText>
+ <ProgressText Action="FdoRegSdf">!(loc.FdoRegSdf)</ProgressText>
+ <ProgressText Action="FdoRegShp">!(loc.FdoRegShp)</ProgressText>
+ <ProgressText Action="FdoRegWfs">!(loc.FdoRegWfs)</ProgressText>
+ <ProgressText Action="FdoRegWms">!(loc.FdoRegWms)</ProgressText>
+ <ProgressText Action="FdoRegOdbc">!(loc.FdoRegOdbc)</ProgressText>
+ <ProgressText Action="FdoRegMySql">!(loc.FdoRegMySql)</ProgressText>
+ <ProgressText Action="FdoRegGdal">!(loc.FdoRegGdal)</ProgressText>
+ <ProgressText Action="FdoRegOgr">!(loc.FdoRegOgr)</ProgressText>
+ <ProgressText Action="FdoRegPostgreSql">!(loc.FdoRegPostgreSql)</ProgressText>
+ <ProgressText Action="FdoRegOracle">!(loc.FdoRegOracle)</ProgressText>
+ <ProgressText Action="FdoRegSqlServer">!(loc.FdoRegSqlServer)</ProgressText>
+ <ProgressText Action="FdoRegSlt">!(loc.FdoRegSlt)</ProgressText>
+ <ProgressText Action="FdoUnRegArcSde">!(loc.FdoUnRegArcSde)</ProgressText>
+ <ProgressText Action="FdoUnRegSdf">!(loc.FdoUnRegSdf)</ProgressText>
+ <ProgressText Action="FdoUnRegShp">!(loc.FdoUnRegShp)</ProgressText>
+ <ProgressText Action="FdoUnRegWfs">!(loc.FdoUnRegWfs)</ProgressText>
+ <ProgressText Action="FdoUnRegWms">!(loc.FdoUnRegWms)</ProgressText>
+ <ProgressText Action="FdoUnRegOdbc">!(loc.FdoUnRegOdbc)</ProgressText>
+ <ProgressText Action="FdoUnRegMySql">!(loc.FdoUnRegMySql)</ProgressText>
+ <ProgressText Action="FdoUnRegGdal">!(loc.FdoUnRegGdal)</ProgressText>
+ <ProgressText Action="FdoUnRegOgr">!(loc.FdoUnRegOgr)</ProgressText>
+ <ProgressText Action="FdoUnRegPostgreSql">!(loc.FdoUnRegPostgreSql)</ProgressText>
+ <ProgressText Action="FdoUnRegOracle">!(loc.FdoUnRegOracle)</ProgressText>
+ <ProgressText Action="FdoUnRegSqlServer">!(loc.FdoUnRegSqlServer)</ProgressText>
+ <ProgressText Action="FdoUnRegSlt">!(loc.FdoUnRegSlt)</ProgressText>
</UI>
<!-- Trac #361: Run our custom CA as part of the UI install sequence -->
@@ -669,7 +734,8 @@
<Custom Action="MapGuideIIS7_I_UnlockSrvHandlers_Cmd" After="MapGuideIIS7_I_SetAppPoolProp_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
<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_CreatePhpScriptMapping_Cmd" After="MapGuideIIS7_I_CreateMapGuideApp_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>
+ <Custom Action="MapGuideIIS7_I_CreatePhpScriptMapping_Cmd" After="MapGuideIIS7_I_SelectXmlCompat_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
<Custom Action="MapGuideIIS7_I_CreateMapAgentApp_Cmd" After="MapGuideIIS7_I_CreatePhpScriptMapping_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
<Custom Action="MapGuideIIS7_I_SetMapAgentHandlerAccess_Cmd" After="MapGuideIIS7_I_CreateMapAgentApp_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
<Custom Action="MapGuideIIS7_I_CreateMapAgentScriptHandling_Cmd" After="MapGuideIIS7_I_SetMapAgentHandlerAccess_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
@@ -682,19 +748,34 @@
<Custom Action="MapGuideIIS7_I_Reset401Handler_Cmd" After="MapGuideIIS7_I_UnlockHttpErrorsMapGuide_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
<Custom Action="MapGuideIIS7_I_AddJsonMime_Cmd" After="MapGuideIIS7_I_Reset401Handler_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <!-- IIS7 PHP Viewer properties for deferred actions -->
+ <!-- IIS7 PHP Viewer properties for deferred actions -->
<Custom Action="MapGuideIIS7_I_CreateViewerPhp_Cmd" After="MapGuideIIS7_I_AddJsonMime_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
<Custom Action="MapGuideIIS7_I_SetViewerDocPhp_Cmd" After="MapGuideIIS7_I_CreateViewerPhp_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
<Custom Action="MapGuideIIS7_I_AssignViewerAppPoolPhp_Cmd" After="MapGuideIIS7_I_SetViewerDocPhp_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <!-- IIS7 ASP.Net Viewer properties for deferred actions -->
+ <!-- IIS7 ASP.Net Viewer properties for deferred actions -->
<Custom Action="MapGuideIIS7_I_CreateViewerNet_Cmd" After="MapGuideIIS7_I_Reset401Handler_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
<Custom Action="MapGuideIIS7_I_SetViewerDocNet_Cmd" After="MapGuideIIS7_I_CreateViewerNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
<Custom Action="MapGuideIIS7_I_AssignViewerAppPoolNet_Cmd" After="MapGuideIIS7_I_SetViewerDocNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <!-- IIS7 Base deferred CAs -->
+ <!-- mapviewernet -->
+ <Custom Action="MapGuideIIS7_I_CreateMapViewerNet_Cmd" After="MapGuideIIS7_I_AssignViewerAppPoolNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_SetMapViewerDocNet_Cmd" After="MapGuideIIS7_I_CreateMapViewerNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_AssignMapViewerAppPoolNet_Cmd" After="MapGuideIIS7_I_SetMapViewerDocNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+
+ <!-- .net viewer sample -->
+ <Custom Action="MapGuideIIS7_I_CreateViewerSampleNet_Cmd" After="MapGuideIIS7_I_AssignMapViewerAppPoolNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetViewerSampleFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_SetViewerDocViewerSampleNet_Cmd" After="MapGuideIIS7_I_CreateViewerSampleNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetViewerSampleFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_AssignViewerAppPoolViewerSampleNet_Cmd" After="MapGuideIIS7_I_SetViewerDocViewerSampleNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetViewerSampleFeature>2</Custom>
+
+ <!-- .net devguide sample -->
+ <Custom Action="MapGuideIIS7_I_CreateViewerDevGuideSamplesNet_Cmd" After="MapGuideIIS7_I_AssignViewerAppPoolViewerSampleNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetDevGuideSamplesFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_SetViewerDocDevGuideSamplesNet_Cmd" After="MapGuideIIS7_I_CreateViewerDevGuideSamplesNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetDevGuideSamplesFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_AssignViewerAppPoolDevGuideSamplesNet_Cmd" After="MapGuideIIS7_I_SetViewerDocDevGuideSamplesNet_Cmd">MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2 AND &WebExtDotNetDevGuideSamplesFeature>2</Custom>
+
+ <!-- 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_CreateFastCgi" After="MapGuideIIS7_I_CreateAppPool">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_CreateFastCgi" After="MapGuideIIS7_I_CreateAppPool">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
<Custom Action="MapGuideIIS7_I_SetAppPoolProp" After="MapGuideIIS7_I_CreateFastCgi">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
<?if "$(var.MgPlatform)" = "x64" ?>
@@ -706,7 +787,8 @@
<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>
+ <Custom Action="MapGuideIIS7_I_SelectXmlCompat" After="MapGuideIIS7_I_CreateMapGuideApp">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
+ <Custom Action="MapGuideIIS7_I_CreatePhpScriptMapping" After="MapGuideIIS7_I_SelectXmlCompat">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
<Custom Action="MapGuideIIS7_I_CreateMapAgentApp" After="MapGuideIIS7_I_CreatePhpScriptMapping">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
<Custom Action="MapGuideIIS7_I_SetMapAgentHandlerAccess" After="MapGuideIIS7_I_CreateMapAgentApp">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
<Custom Action="MapGuideIIS7_I_CreateMapAgentScriptHandling" After="MapGuideIIS7_I_SetMapAgentHandlerAccess">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
Modified: trunk/Installer/Libraries/MapGuide Server/InstallService.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/InstallService.wxs 2012-04-12 12:46:54 UTC (rev 6574)
+++ trunk/Installer/Libraries/MapGuide Server/InstallService.wxs 2012-04-18 14:01:19 UTC (rev 6575)
@@ -2,7 +2,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<!-- mgserver.exe -->
<?if "$(var.MgPlatform)" = "x64" ?>
- <?define MGSERVER_MAP = "file_SRVBINFILES_23" ?>
+ <?define MGSERVER_MAP = "file_SRVBINFILES_26" ?>
<?else ?>
<?define MGSERVER_MAP = "file_SRVBINFILES_26" ?>
<?endif ?>
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs 2012-04-12 12:46:54 UTC (rev 6574)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs 2012-04-18 14:01:19 UTC (rev 6575)
@@ -34,7 +34,7 @@
<PropertyRef Id="IIS_API_TYPE"/>
<CustomAction Id="AspNetRegIIS_Cmd" Property="AspNetRegIIS" Execute="immediate"
- Value=""[FRAMEWORKDIR]v2.0.50727\aspnet_regiis.exe" -s W3SVC/[SITE_ID]/ROOT/[VIRTUALDIR]" />
+ Value=""[FRAMEWORKDIR]v4.0.30319\aspnet_regiis.exe" -s W3SVC/[SITE_ID]/ROOT/[VIRTUALDIR]" />
<CustomAction Id="AspNetRegIIS" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no" />
<!-- Begin Trac Ticket #361 stuff -->
@@ -196,8 +196,8 @@
<Condition>MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#6"</Condition>
<CreateFolder />
<iis:WebAppPool Id="IIS6MapGuideAppPool" Name="[APP_POOL_NAME]" />
- <iis:WebServiceExtension Id="IIS6PhpWebServiceExt" Allow="yes" Description="MapGuide PHP ISAPI Extension" File="$(var.PHP_MAP)" />
- <iis:WebServiceExtension Id="IIS6MapGuideWebServiceExt" Allow="yes" Description="MapGuide MapAgent ISAPI Extension" File="$(var.FCGI_MAP)" />
+ <iis:WebServiceExtension Id="IIS6PhpWebServiceExt" Allow="yes" Description="[PHP_FCGI_HANDLER_NAME]" File="$(var.PHP_MAP)" />
+ <iis:WebServiceExtension Id="IIS6MapGuideWebServiceExt" Allow="yes" Description="[MAPAGENT_ISAPI_NAME]" File="$(var.FCGI_MAP)" />
<iis:WebVirtualDir Id="IIS6MapGuideVDir" Alias="[VIRTUALDIR]" Directory="WEBROOTLOCATION" WebSite="IISDefaultWebSite" >
<iis:WebDirProperties Id="IIS6MapGuideDocuments" DefaultDocuments="index.php,index.html,index.htm,default.aspx,index.aspx,default.htm,default.html" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
<iis:MimeMap Id="IIS6JsonMimeType" Type="application/json" Extension =".json" />
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/IIS7.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/IIS7.wxs 2012-04-12 12:46:54 UTC (rev 6574)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/IIS7.wxs 2012-04-18 14:01:19 UTC (rev 6575)
@@ -2,7 +2,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:iis="http://schemas.microsoft.com/wix/IIsExtension"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
- <Fragment>
+ <Fragment>
<!-- ************************* Custom Actions for IIS7 INSTALL ***************************************** -->
@@ -12,7 +12,7 @@
<!-- Create the application pool -->
<CustomAction Id="MapGuideIIS7_I_CreateAppPool_Cmd" Property="MapGuideIIS7_I_CreateAppPool" Execute="immediate"
- Value="[AppCmd] add apppool /name:"[APP_POOL_NAME]" /managedRuntimeVersion:"v4.0"" />
+ Value="[AppCmd] add apppool /name:"[APP_POOL_NAME]" /managedRuntimeVersion:"[ASPNETVERSION]"" />
<CustomAction Id="MapGuideIIS7_I_CreateAppPool" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
<!-- Set up FastCGI -->
@@ -40,9 +40,14 @@
Value="[AppCmd] add app /site.name:"[MG_WEBSITE]" /path:"/[VIRTUALDIR]" /physicalPath:"[WEBEXTENSIONSLOCATION]www"" />
<CustomAction Id="MapGuideIIS7_I_CreateMapGuideApp" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
+ <!-- ASP.net compatibility setting to allow selection XML strings to be passed in .net -->
+ <CustomAction Id="MapGuideIIS7_I_SelectXmlCompat_Cmd" Property="MapGuideIIS7_I_SelectXmlCompat" Execute="immediate"
+ Value="[AppCmd] set config "[MG_WEBSITE]/[VIRTUALDIR]" /section:system.web/httpRuntime /requestValidationMode:2.0" />
+ <CustomAction Id="MapGuideIIS7_I_SelectXmlCompat" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
+
<!-- Set up the PHP script mapping to FastCGI -->
<CustomAction Id="MapGuideIIS7_I_CreatePhpScriptMapping_Cmd" Property="MapGuideIIS7_I_CreatePhpScriptMapping" Execute="immediate"
- Value="[AppCmd] set config "[MG_WEBSITE]/[VIRTUALDIR]" /section:handlers /+[\[]name='"PHP_via_FastCGI"',path='*.php',verb='*',scriptProcessor='"[PHPLOCATION]php-cgi.exe"',modules='FastCgiModule',resourceType='File',requireAccess='Script'[\]]" />
+ Value="[AppCmd] set config "[MG_WEBSITE]/[VIRTUALDIR]" /section:handlers /+[\[]name='"[PHP_FCGI_HANDLER_NAME]"',path='*.php',verb='*',scriptProcessor='"[PHPLOCATION]php-cgi.exe"',modules='FastCgiModule',resourceType='File',requireAccess='Script'[\]]" />
<CustomAction Id="MapGuideIIS7_I_CreatePhpScriptMapping" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
<!-- Create the MapAgent application -->
@@ -57,12 +62,12 @@
<!-- Set up the MapAgent script mapping -->
<CustomAction Id="MapGuideIIS7_I_CreateMapAgentScriptHandling_Cmd" Property="MapGuideIIS7_I_CreateMapAgentScriptHandling" Execute="immediate"
- Value="[AppCmd] set config "[MG_WEBSITE]/[VIRTUALDIR]/mapagent" /section:handlers /+[\[]name='"MapGuide MapAgent ISAPI handler"',path='mapagent.fcgi',verb='*',scriptProcessor='"[WEBEXTENSIONSLOCATION]www\mapagent\isapi_MapAgent.dll"',modules='IsapiModule'[\]]" />
+ Value="[AppCmd] set config "[MG_WEBSITE]/[VIRTUALDIR]/mapagent" /section:handlers /+[\[]name='"[MAPAGENT_ISAPI_NAME]"',path='mapagent.fcgi',verb='*',scriptProcessor='"[WEBEXTENSIONSLOCATION]www\mapagent\isapi_MapAgent.dll"',modules='IsapiModule'[\]]" />
<CustomAction Id="MapGuideIIS7_I_CreateMapAgentScriptHandling" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
<!-- Allow access to the MapAgent ISAPI -->
<CustomAction Id="MapGuideIIS7_I_EnableMapAgentExtension_Cmd" Property="MapGuideIIS7_I_EnableMapAgentExtension" Execute="immediate"
- Value="[AppCmd] set config /section:isapiCgiRestriction /+[\[]path='"[WEBEXTENSIONSLOCATION]www\mapagent\isapi_MapAgent.dll"',allowed='True',description='"MapGuide MapAgent ISAPI handler"'[\]]" />
+ Value="[AppCmd] set config /section:isapiCgiRestriction /+[\[]path='"[WEBEXTENSIONSLOCATION]www\mapagent\isapi_MapAgent.dll"',allowed='True',description='"[MAPAGENT_ISAPI_NAME]"'[\]]" />
<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) -->
@@ -193,6 +198,13 @@
<CustomAction Id="MapGuideIIS7_U_AppCmd_Cmd" Property="AppCmd" Execute="immediate" Value=""[WindowsFolder]system32\inetsrv\APPCMD.EXE"" />
+ <!--
+ FIXME: If [VIRTUALDIR] changes at install-time. That same value is not used again at uninstall-time.
+ ie. If you install with VIRTUALDIR=mapguide24 it will still uninstall with VIRTUALDIR=mapguide
+
+ Obviously, we need to persist this value somewhere upon installation, which can be read when we uninstall
+ -->
+
<!-- Remove entry in ISAPI/CGI Restrictions for the MapAgent -->
<CustomAction Id="MapGuideIIS7_U_ClearMapAgentRestriction_Cmd" Property="MapGuideIIS7_U_ClearMapAgentRestriction" Execute="immediate"
Value="[AppCmd] set config /section:isapiCgiRestriction /-[\[]path='"[WEBEXTENSIONSLOCATION]www\mapagent\isapi_MapAgent.dll"'[\]]" />
More information about the mapguide-commits
mailing list