[mapguide-commits] r6367 - in trunk/Installer: .
Installers/MapGuide Installers/MapGuide/Lang
Libraries/MapGuide Server Libraries/MapGuide Web Extensions
Support/Web/x64/configs/Php Support/Web/x86/configs/Php
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Dec 27 13:23:21 EST 2011
Author: jng
Date: 2011-12-27 10:23:21 -0800 (Tue, 27 Dec 2011)
New Revision: 6367
Modified:
trunk/Installer/Installers/MapGuide/Lang/MapGuide_en-US.wxl
trunk/Installer/Installers/MapGuide/Lang/MapGuide_es-ES.wxl
trunk/Installer/Installers/MapGuide/MapGuide.wxs
trunk/Installer/Libraries/MapGuide Server/FDO.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/IIS7.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs
trunk/Installer/Support/Web/x64/configs/Php/php.ini
trunk/Installer/Support/Web/x86/configs/Php/php.ini
trunk/Installer/build.bat
Log:
#1805: Installer updates:
- Update build.bat to unpack from our previously submitted zip files into the staging area as part of the "prepare" step
- Remove all references to the (non-existent) PHP ISAPI module in the installer
- Update the IIS configuration components to properly handle FastCGI registration for PHP. Currently only IIS6 has been successfully tested
- Update the stock php.ini configurations to include a default timezone
- Add a new installer dialog in IIS configuration mode that tells the user about the need to install FastCGI for IIS first. The installer doesn't do any checks here. It assumes FastCGI has been installed.
- Remove the reboot requirement (yay!) as MENTOR_DICTIONARY_PATH is now externalised to a serverconfig.ini variable as a result of RFC122.
- Add a conditional Have_ArcSde preprocessor variable (default = "no") which allows us to conditionally disable the ArcSDE provider from being bundled into the installer. Frankly, FDO (3.7) has moved to VS2010, so we can't use the FDO SDK binaries, meaning we have to build from source because we're still building with VS2008, and you can't build the ArcSDE provider without a licence for the ArcSDE SDK
Modified: trunk/Installer/Installers/MapGuide/Lang/MapGuide_en-US.wxl
===================================================================
--- trunk/Installer/Installers/MapGuide/Lang/MapGuide_en-US.wxl 2011-12-25 16:14:39 UTC (rev 6366)
+++ trunk/Installer/Installers/MapGuide/Lang/MapGuide_en-US.wxl 2011-12-27 18:23:21 UTC (rev 6367)
@@ -23,6 +23,13 @@
<String Id="DisabledFeaturesDialog_DotNet">The .NET Framework 2.0 was not found, so the .NET Web Extensions for IIS will not be available</String>
<String Id="DisabledFeaturesDialog_Instructions">If you want to use these features, click on cancel and correct the problem before proceeding with installation</String>
+ <String Id="FastCgiDialog_Title">FastCGI is required</String>
+ <String Id="FastCgiDialog_Description">FastCGI needs to be installed</String>
+ <String Id="FastCgiDialog_Instructions">MapGuide IIS Configuration requires FastCGI to be installed on this system</String>
+ <String Id="FastCgiDialog_Instructions2">You can download FastCGI from this link</String>
+ <String Id="FastCgiDialog_Link">http://www.iis.net/download/FastCGI</String>
+ <String Id="FastCgiDialog_Instructions3">You can ignore this message if FastCGI for IIS is already installed. Otherwise you must cancel this installation and install FastCGI first</String>
+
<String Id="ServerConfigDlg_Title">Server Port Configuration</String>
<String Id="ServerConfigDlg_Description">Set up the listening ports for MapGuide Server</String>
<String Id="ServerConfigDlg_Prompt">MapGuide Server will be installed using the following port numbers. The Server and Web Tier configuration files will be set to use the specified port numbers below.</String>
Modified: trunk/Installer/Installers/MapGuide/Lang/MapGuide_es-ES.wxl
===================================================================
--- trunk/Installer/Installers/MapGuide/Lang/MapGuide_es-ES.wxl 2011-12-25 16:14:39 UTC (rev 6366)
+++ trunk/Installer/Installers/MapGuide/Lang/MapGuide_es-ES.wxl 2011-12-27 18:23:21 UTC (rev 6367)
@@ -23,6 +23,13 @@
<String Id="DisabledFeaturesDialog_DotNet">Dot Net Framework 2.0 no se ha encontrado, por lo que el Asp.Net Web Extensiones no estará disponible</String>
<String Id="DisabledFeaturesDialog_Instructions">Si desea utilizar estas funciones, haga clic en cancelar y corregir el problema antes de proceder con la instalación</String>
+ <String Id="FastCgiDialog_Title">FastCGI es necesario</String>
+ <String Id="FastCgiDialog_Description">FastCGI es necesario instalar</String>
+ <String Id="FastCgiDialog_Instructions">MapGuide de configuración de IIS FastCGI requiere ser instalado en este sistema</String>
+ <String Id="FastCgiDialog_Instructions2">Usted puede descargar desde este enlace FastCGI</String>
+ <String Id="FastCgiDialog_Link">http://www.iis.net/download/FastCGI</String>
+ <String Id="FastCgiDialog_Instructions3">Puede ignorar este mensaje si FastCGI para IIS ya está instalado. De lo contrario, debe cancelar la instalación e instalar FastCGI primero</String>
+
<String Id="ServerConfigDlg_Title">Puerto del servidor de configuración</String>
<String Id="ServerConfigDlg_Description">Configurar los puertos de escucha para MapGuide Server</String>
<String Id="ServerConfigDlg_Prompt">MapGuide Server se instala utilizando los números de puerto siguiente. El servidor de Web y los archivos de configuración de nivel se establece para utilizar los números de puerto se especifica a continuación.</String>
Modified: trunk/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wxs 2011-12-25 16:14:39 UTC (rev 6366)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs 2011-12-27 18:23:21 UTC (rev 6367)
@@ -96,6 +96,13 @@
<Icon Id="OSGeo.ico" SourceFile="..\..\Support\Graphics\OSGeo.ico" />
<Directory Id="TARGETDIR" Name="SourceDir">
+ <Directory Id="WindowsFolder">
+ <Directory Id="System32Folder" Name="System32">
+ <Directory Id="IISROOTLOCATION" Name="inetsrv">
+
+ </Directory>
+ </Directory>
+ </Directory>
<Directory Id="ProgramMenuFolder" Name="Programs"/>
<Directory Id="DesktopFolder" Name="Desktop"/>
<Directory Id="$(var.PlatformProgramFilesFolder)">
@@ -182,6 +189,32 @@
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.CancelButtonText)" />
</Dialog>
+ <Dialog Id="FastCgiWarningDlg" Width="370" Height="270" Title="!(loc.InstallerTitle)">
+ <!--
+ MapGuide IIS Configuration requires FastCGI to be installed on this system
+
+ You can download FastCGI from this link
+
+ http://www.iis.net/download/FastCGI
+
+ You can ignore this message if FastCGI for IIS is already installed. Otherwise
+ you must cancel this installation and install FastCGI first
+ -->
+ <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="{\WixUI_Font_Title}!(loc.FastCgiDialog_Title)" />
+ <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.FastCgiDialog_Description)" />
+ <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.InstallDirDlgBannerBitmap)" />
+ <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
+
+ <Control Id="TxtInstructions" Type="Text" Width="316" Height="30" X="25" Y="60" Text="!(loc.FastCgiDialog_Instructions)" />
+ <Control Id="TxtInstructions2" Type="Text" Width="316" Height="17" X="25" Y="100" Text="!(loc.FastCgiDialog_Instructions2)" />
+ <Control Id="TxtLink" Type="Text" Width="318" Height="17" X="30" Y="120" Text="!(loc.FastCgiDialog_Link)" />
+ <Control Id="TxtInstructions3" Type="Text" Width="318" Height="34" X="25" Y="140" Text="!(loc.FastCgiDialog_Instructions3)" />
+
+ <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.NextButtonText)" />
+ <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.BackButtonText)" />
+ <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.CancelButtonText)" />
+ </Dialog>
+
<!-- Dialog to choose web server configuration: IIS / Apache / Manual -->
<Dialog Id="WebServerConfigDlgIIS" Width="370" Height="270" Title="!(loc.InstallerTitle)">
<!--
@@ -449,18 +482,23 @@
<!-- If Apache, or IIS and the .Net Framework is not installed, set feature default for the ASPX viewer to not install -->
<Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtMapViewerASPXFeature" Order="7">(MGWEB_CONFIG="APACHE") OR (MGWEB_CONFIG="IIS" AND NOT NETFRAMEWORK20)</Publish>
<Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="NewDialog" Value="ApacheConfigDlg" Order="8">MGWEB_CONFIG="APACHE"</Publish>
- <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="NewDialog" Value="IISLangConfigDlg" Order="9">MGWEB_CONFIG="IIS" AND NETFRAMEWORK20</Publish>
- <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="NewDialog" Value="IPConfigDlg" Order="10">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#5" AND (NOT NETFRAMEWORK20)</Publish>
- <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="NewDialog" Value="IIS6ConfigDlg" Order="11">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#6" AND (NOT NETFRAMEWORK20)</Publish>
- <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="NewDialog" Value="IIS7ConfigDlg" Order="12">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND (NOT NETFRAMEWORK20)</Publish>
+ <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="NewDialog" Value="FastCgiWarningDlg" Order="9">MGWEB_CONFIG="IIS"</Publish>
<!-- If IIS, set feature defaults for Apache, Tomcat, and JSP viewer to not install -->
- <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtApacheFeature" Order="13">MGWEB_CONFIG="IIS"</Publish>
- <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtTomcatFeature" Order="14">MGWEB_CONFIG="IIS"</Publish>
- <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtMapViewerJSPFeature" Order="15">MGWEB_CONFIG="IIS"</Publish>
- <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="NewDialog" Value="IPConfigDlg" Order="16">MGWEB_CONFIG="MANUAL"</Publish>
+ <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtApacheFeature" Order="10">MGWEB_CONFIG="IIS"</Publish>
+ <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtTomcatFeature" Order="11">MGWEB_CONFIG="IIS"</Publish>
+ <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="Remove" Value="WebExtMapViewerJSPFeature" Order="12">MGWEB_CONFIG="IIS"</Publish>
+ <Publish Dialog="WebServerConfigDlgIIS" Control="Next" Event="NewDialog" Value="IPConfigDlg" Order="13">MGWEB_CONFIG="MANUAL"</Publish>
<Publish Dialog="WebServerConfigDlgIIS" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
<Publish Dialog="WebServerConfigDlgIIS" Control="Cancel" Event="SpawnDialog" Value="CancelDlg">1</Publish>
+ <!-- Show the FastCGI warning before advancing to any IIS configuration dialog -->
+ <Publish Dialog="FastCgiWarningDlg" Control="Next" Event="NewDialog" Value="IISLangConfigDlg" Order="1">MGWEB_CONFIG="IIS" AND NETFRAMEWORK20</Publish>
+ <Publish Dialog="FastCgiWarningDlg" Control="Next" Event="NewDialog" Value="IPConfigDlg" Order="2">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#5" AND (NOT NETFRAMEWORK20)</Publish>
+ <Publish Dialog="FastCgiWarningDlg" Control="Next" Event="NewDialog" Value="IIS6ConfigDlg" Order="3">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#6" AND (NOT NETFRAMEWORK20)</Publish>
+ <Publish Dialog="FastCgiWarningDlg" Control="Next" Event="NewDialog" Value="IIS7ConfigDlg" Order="4">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND (NOT NETFRAMEWORK20)</Publish>
+ <Publish Dialog="FastCgiWarningDlg" Control="Back" Event="NewDialog" Value="WebServerConfigDlgIIS">1</Publish>
+ <Publish Dialog="FastCgiWarningDlg" Control="Cancel" Event="SpawnDialog" Value="CancelDlg">1</Publish>
+
<Publish Dialog="WebServerConfigDlgNoIIS" Control="Next" Event="DoAction" Value="MgWeb_Config_From_NoIIS_CA" Order="1">1</Publish>
<!-- This "resets" the feature tree in case someone starts down a path then changes their mind -->
<Publish Dialog="WebServerConfigDlgNoIIS" Control="Next" Event="AddLocal" Value="ALL" Order="2">1</Publish>
@@ -581,8 +619,7 @@
<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_EnablePhpExtension_Cmd" After="MapGuideIIS7_I_CreatePhpScriptMapping_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_CreateMapAgentApp_Cmd" After="MapGuideIIS7_I_EnablePhpExtension_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>
<Custom Action="MapGuideIIS7_I_EnableMapAgentExtension_Cmd" After="MapGuideIIS7_I_CreateMapAgentScriptHandling_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
@@ -618,8 +655,7 @@
<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_EnablePhpExtension" After="MapGuideIIS7_I_CreatePhpScriptMapping">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
- <Custom Action="MapGuideIIS7_I_CreateMapAgentApp" After="MapGuideIIS7_I_EnablePhpExtension">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>
<Custom Action="MapGuideIIS7_I_EnableMapAgentExtension" After="MapGuideIIS7_I_CreateMapAgentScriptHandling">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature>2</Custom>
@@ -644,16 +680,14 @@
<!-- 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_ClearPhpRestriction_Cmd" After="MapGuideIIS7_U_ClearMapAgentRestriction_Cmd">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
- <Custom Action="MapGuideIIS7_U_RemoveViewer_Cmd" After="MapGuideIIS7_U_ClearPhpRestriction_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_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_ClearPhpRestriction" After="MapGuideIIS7_U_ClearMapAgentRestriction">MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#7" AND &WebExtensionsFeature=2</Custom>
- <Custom Action="MapGuideIIS7_U_RemoveViewer" After="MapGuideIIS7_U_ClearPhpRestriction">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_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>
@@ -755,27 +789,6 @@
<Custom
Action="RemoveApacheServiceCA"
Before="RemoveFiles">MGWEB_CONFIG="APACHE" AND &WebExtApacheFeature=2</Custom>
-
- <!--
- 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 Server/FDO.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/FDO.wxs 2011-12-25 16:14:39 UTC (rev 6366)
+++ trunk/Installer/Libraries/MapGuide Server/FDO.wxs 2011-12-27 18:23:21 UTC (rev 6367)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <?define Have_ArcSde = "no" ?>
<?if "$(var.MgPlatform)" = "x64" ?>
<?define Win64 = "yes" ?>
<?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
@@ -9,7 +10,7 @@
<?endif ?>
<Fragment>
<CustomAction Id="FdoRegCmd" Property="FdoReg" Execute="immediate" Value=""[FDOLOCATION]FdoRegUtil.exe"" />
-
+
<CustomAction Execute="immediate" Id="FdoRegArcSdeCmd" Property="FdoRegArcSde" Value="[FdoReg] -r ".\ArcSDEProvider.dll"" />
<CustomAction Execute="immediate" Id="FdoRegSdfCmd" Property="FdoRegSdf" Value="[FdoReg] -r ".\SDFProvider.dll"" />
<CustomAction Execute="immediate" Id="FdoRegShpCmd" Property="FdoRegShp" Value="[FdoReg] -r ".\SHPProvider.dll"" />
@@ -109,9 +110,13 @@
</Component>
<!-- ArcSDE Provider -->
<Component Id="FdoArcSdeComponent" Win64="$(var.Win64)" Guid="73E0719B-243F-49E9-BF74-F1B7CF7EA35F">
+ <?if Have_ArcSde = "yes" ?>
<File Id="ArcSdeMessage" Checksum="yes" Source="$(var.MgSource)\Server\FDO\ArcSDEMessage.dll" />
<File Id="ArcSdeProvider92" Checksum="yes" Source="$(var.MgSource)\Server\FDO\ArcSdeProvider92.dll" />
<File Id="ArcSdeProvider" Checksum="yes" Source="$(var.MgSource)\Server\FDO\ArcSdeProvider.dll" />
+ <?else ?>
+ <CreateFolder />
+ <?endif ?>
</Component>
<!-- GDAL Provider -->
<Component Id="FdoGdalProviderComponent" Win64="$(var.Win64)" Guid="B1D7539F-865E-4A32-B82A-96E76012780B">
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs 2011-12-25 16:14:39 UTC (rev 6366)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs 2011-12-27 18:23:21 UTC (rev 6367)
@@ -12,7 +12,8 @@
<!-- isapi_MapAgent.dll -->
<?define FCGI_MAP = "[!file_MAPAGENTFILES_100]" ?>
<!-- php5isapi.dll -->
- <?define PHP_MAP = "[WindowsFolder]\system32\inetsrv\fcgiext.dll" ?>
+ <?define PHP_MAP = "[WindowsFolder]system32\inetsrv\fcgiext.dll" ?>
+ <?define PHP_CGI_EXE = "[!file_PHPFILES_41]" ?>
<Fragment>
<Property Id="FRAMEWORKDIR">
<RegistrySearch
@@ -51,7 +52,25 @@
<!-- End Trac Ticket #361 stuff -->
<Feature Id="IISSetupFeature" Level="1" Display="hidden" >
-
+ <Component Id="IISFastCgiConfigComponent" Win64="$(var.Win64)" Guid="2C29D170-15B0-41E6-AD72-91DA094A28CC" Directory="IISROOTLOCATION">
+ <Condition>MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#5" OR IISVERSIONMAJOR="#6"</Condition>
+ <CreateFolder />
+ <IniFile Id="IniRegPhpType"
+ Action="addLine"
+ Directory="IISROOTLOCATION"
+ Key="php"
+ Name="fcgiext.ini"
+ Section="Types"
+ Value="PHP"/>
+ <IniFile Id="IniSetPhpExe"
+ Action="addLine"
+ Directory="IISROOTLOCATION"
+ Key="ExePath"
+ Name="fcgiext.ini"
+ Section="PHP"
+ Value="$(var.PHP_CGI_EXE)"/>
+ </Component>
+
<!-- IIS5 Base component -->
<!--
NOTE: Always check the file offsets whenever PHP is updated and/or the mapagent is updated, because we may be creating script
@@ -63,7 +82,7 @@
<iis:WebVirtualDir Id="IIS5MapGuideVDir" Alias="[VIRTUALDIR]" Directory="WEBROOTLOCATION" WebSite="IISDefaultWebSite">
<iis:WebDirProperties Id="IIS5MapGuideDocuments" DefaultDocuments="index.php,index.html,index.htm,default.aspx,index.aspx,default.htm,default.html" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no"/>
<iis:WebApplication Id="IIS5MapGuideWebApp" Name="[VIRTUALDIR]">
- <iis:WebApplicationExtension Extension="php" Script="yes" Verbs="GET,POST" CheckPath="no" Executable="$(var.PHP_MAP)" />
+ <iis:WebApplicationExtension Extension="php" Script="yes" Verbs="GET,POST,HEAD" CheckPath="yes" Executable="$(var.PHP_MAP)" />
</iis:WebApplication>
<iis:WebVirtualDir Id="IIS5MapAgentVDir" Alias="mapagent" Directory="dir_mapagent_0" >
<iis:WebDirProperties Id="IIS5MapAgentProperties" DefaultDocuments="index.html" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no"/>
@@ -128,7 +147,7 @@
<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" />
<iis:WebApplication Id="IIS6MapGuideWebApp" Name="[VIRTUALDIR]" WebAppPool="IIS6MapGuideAppPool" >
- <iis:WebApplicationExtension Extension="php" Script="yes" Verbs="GET,POST" CheckPath="no" Executable="$(var.PHP_MAP)" />
+ <iis:WebApplicationExtension Extension="php" Script="yes" Verbs="GET,POST,HEAD" CheckPath="yes" Executable="$(var.PHP_MAP)" />
</iis:WebApplication>
<iis:WebVirtualDir Id="IIS6MapAgentVDir" Alias="mapagent" Directory="dir_mapagent_0" >
<iis:WebDirProperties Id="IIS6MapAgentProperties" DefaultDocuments="index.html" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/IIS7.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/IIS7.wxs 2011-12-25 16:14:39 UTC (rev 6366)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/IIS7.wxs 2011-12-27 18:23:21 UTC (rev 6367)
@@ -17,7 +17,7 @@
<!-- Set up FastCGI -->
<CustomAction Id="MapGuideIIS7_I_CreateFastCgi_Cmd" Property="MapGuideIIS7_I_CreateFastCgi" Execute="immediate"
- Value="[AppCmd] add apppool set config /section:system.webServer/fastCGI /+[\[]fullPath="[WEBEXTENSIONSLOCATION]Php\php-cgi.exe"[\]]" />
+ Value="[AppCmd] add apppool set config /section:system.webServer/fastCGI /+[\[]fullPath="[PHPLOCATION]\php-cgi.exe"[\]]" />
<CustomAction Id="MapGuideIIS7_I_CreateFastCgi" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
<!-- Set the application pool's properties -->
@@ -42,14 +42,9 @@
<!-- 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='"[WEBEXTENSIONSLOCATION]Php\php-cgi.exe"',modules='FastCgiModule',resourceType='Unspecified'[\]]" />
+ Value="[AppCmd] set config "[MG_WEBSITE]/[VIRTUALDIR]" /section:handlers /+[\[]name='"PHP_via_FastCGI"',path='*.php',verb='*',scriptProcessor='"[PHPLOCATION]\php-cgi.exe"',modules='FastCgiModule',resourceType='Unspecified'[\]]" />
<CustomAction Id="MapGuideIIS7_I_CreatePhpScriptMapping" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
- <!-- Allow access to the PHP ISAPI -->
- <CustomAction Id="MapGuideIIS7_I_EnablePhpExtension_Cmd" Property="MapGuideIIS7_I_EnablePhpExtension" Execute="immediate"
- Value="[AppCmd] set config /section:isapiCgiRestriction /+[\[]path='"[WEBEXTENSIONSLOCATION]Php\php5isapi.dll"',allowed='True',description='"MapGuide PHP ISAPI handler"'[\]]" />
- <CustomAction Id="MapGuideIIS7_I_EnablePhpExtension" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
<!-- Create the MapAgent application -->
<CustomAction Id="MapGuideIIS7_I_CreateMapAgentApp_Cmd" Property="MapGuideIIS7_I_CreateMapAgentApp" Execute="immediate"
Value="[AppCmd] add app /site.name:"[MG_WEBSITE]" /path:"/[VIRTUALDIR]/mapagent" /physicalPath:"[WEBEXTENSIONSLOCATION]www\mapagent"" />
@@ -153,11 +148,6 @@
Value="[AppCmd] set config /section:isapiCgiRestriction /-[\[]path='"[WEBEXTENSIONSLOCATION]www\mapagent\isapi_MapAgent.dll"'[\]]" />
<CustomAction Id="MapGuideIIS7_U_ClearMapAgentRestriction" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
- <!-- Remove entry in ISAPI/CGI Restrictions for PHP -->
- <CustomAction Id="MapGuideIIS7_U_ClearPhpRestriction_Cmd" Property="MapGuideIIS7_U_ClearPhpRestriction" Execute="immediate"
- Value="[AppCmd] set config /section:isapiCgiRestriction /-[\[]path='"[WEBEXTENSIONSLOCATION]Php\php5isapi.dll"'[\]]" />
- <CustomAction Id="MapGuideIIS7_U_ClearPhpRestriction" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
<!-- Remove MapViewerAjax application -->
<CustomAction Id="MapGuideIIS7_U_RemoveViewer_Cmd" Property="MapGuideIIS7_U_RemoveViewer" Execute="immediate"
Value="[AppCmd] delete app "[MG_WEBSITE]/[VIRTUALDIR]/mapviewerajax"" />
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs 2011-12-25 16:14:39 UTC (rev 6366)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs 2011-12-27 18:23:21 UTC (rev 6367)
@@ -13,7 +13,7 @@
<PropertyRef Id="NETFRAMEWORK20"/>
<PropertyRef Id="MGWEB_CONFIG"/>
<PropertyRef Id="IIS_API_TYPE"/>
-
+
<DirectoryRef Id="WebParentFolder">
<Directory Id="WEBEXTENSIONSLOCATION" Name="Web">
<Component Id="WebPortConfigComponent" Win64="$(var.Win64)" Guid="3C8FE0E1-3161-423D-9E08-0983B7075C4C" Feature="WebExtensionsFeature">
@@ -65,22 +65,16 @@
Permanent="no"
System="yes"
Value="[PHPLOCATION]" />
- <RegistryKey Action="createAndRemoveOnUninstall"
+ <RegistryKey Id="PhpRegistryKey"
+ Action="createAndRemoveOnUninstall"
Root="HKLM"
Key="Software\PHP\[PHP_VERSION]">
- <RegistryValue Action="write"
- Name="IniFilePath"
- Type="string"
- Value="[PHPLOCATION]" />
+ <RegistryValue Id="PhpRegistryKeyValue"
+ Action="write"
+ Name="IniFilePath"
+ Type="string"
+ Value="[PHPLOCATION]" />
</RegistryKey>
- <RegistryKey Action="createAndRemoveOnUninstall"
- Root="HKLM"
- Key="Software\PHP\5.3.1">
- <RegistryValue Action="write"
- Name="IniFilePath"
- Type="string"
- Value="[PHPLOCATION]" />
- </RegistryKey>
</Component>
</Directory>
<Directory Id="WEBROOTLOCATION" Name="www">
Modified: trunk/Installer/Support/Web/x64/configs/Php/php.ini
===================================================================
--- trunk/Installer/Support/Web/x64/configs/Php/php.ini 2011-12-25 16:14:39 UTC (rev 6366)
+++ trunk/Installer/Support/Web/x64/configs/Php/php.ini 2011-12-27 18:23:21 UTC (rev 6367)
@@ -666,6 +666,11 @@
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
+[Date]
+; Defines the default timezone used by the date functions
+; http://php.net/date.timezone
+date.timezone = 'UTC'
+
[Syslog]
; Whether or not to define the various syslog variables (e.g. $LOG_PID,
; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In
Modified: trunk/Installer/Support/Web/x86/configs/Php/php.ini
===================================================================
--- trunk/Installer/Support/Web/x86/configs/Php/php.ini 2011-12-25 16:14:39 UTC (rev 6366)
+++ trunk/Installer/Support/Web/x86/configs/Php/php.ini 2011-12-27 18:23:21 UTC (rev 6367)
@@ -666,6 +666,11 @@
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
+[Date]
+; Defines the default timezone used by the date functions
+; http://php.net/date.timezone
+date.timezone = 'UTC'
+
[Syslog]
; Whether or not to define the various syslog variables (e.g. $LOG_PID,
; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In
Modified: trunk/Installer/build.bat
===================================================================
--- trunk/Installer/build.bat 2011-12-25 16:14:39 UTC (rev 6366)
+++ trunk/Installer/build.bat 2011-12-27 18:23:21 UTC (rev 6367)
@@ -72,9 +72,20 @@
SET NSIS=%CD%\Support\NSIS
SET PARAFFIN=%CD%
-SET PATH=%PATH%;%PARAFFIN%;%NSIS%;%WIX%\bin\
+SET PATH=%PATH%;%PARAFFIN%;%NSIS%;%WIX%\bin\;%CD%\..\MgDev\BuildTools\WebTools\7-Zip
rem ==================================================
+rem Web dependencies
+rem ==================================================
+SET HTTPD_VERSION=2.2.21
+SET PHP_VERSION=5.3.8
+SET TOMCAT_VERSION=7.0.23
+SET HTTPD_PACKAGE=httpd-%HTTPD_VERSION%-win32-x86-ssl.zip
+SET TOMCAT_PACKAGE=apache-tomcat-%TOMCAT_VERSION%-windows-x86.zip
+SET PHP_TS_PACKAGE=php-%PHP_VERSION%-Win32-VC9-x86.zip
+SET PHP_NTS_PACKAGE=php-%PHP_VERSION%-nts-Win32-VC9-x86.zip
+
+rem ==================================================
rem MSBuild Settings
rem ==================================================
@@ -206,18 +217,34 @@
%MSBUILD% InstallerPreReq.sln
copy %INSTALLER_FDO_REG_UTIL%\%TYPEBUILD%\FdoRegUtil.exe %MG_SOURCE%\Server\FDO
popd
-rem copy support files into server and web directories
-echo [prepare] Tomcat
-%XCOPY% "%INSTALLER_DEV%\Support\Web\%CPUTYPE%\Tomcat" "%MG_SOURCE%\Web\Tomcat" /EXCLUDE:svn_excludes.txt
-echo [prepare] Php
-%XCOPY% "%INSTALLER_DEV%\Support\Web\%CPUTYPE%\Php" "%MG_SOURCE%\Web\Php" /EXCLUDE:svn_excludes.txt
-echo [prepare] Apache2
-%XCOPY% "%INSTALLER_DEV%\Support\Web\%CPUTYPE%\Apache2" "%MG_SOURCE%\Web\Apache2" /EXCLUDE:svn_excludes.txt
+pushd "%INSTALLER_DEV_SUPPORT%\Web\%CPUTYPE%"
+echo [prepare] Unpack Apache httpd
+7z x %HTTPD_PACKAGE% -o"%MG_SOURCE%\Web\Apache2"
+REM the zip does not package the root dir, so we need to move everything to this level
+pushd "%MG_SOURCE%\Web\Apache2"
+move Apache2\*.* .
+rd Apache2
+rd readme.txt
+popd
+echo [prepare] Unpack Tomcat
+REM the zip does not package the root dir, so we need to move everything to this level
+7z x %TOMCAT_PACKAGE% -o"%MG_SOURCE%\Web\Tomcat"
+pushd "%MG_SOURCE%\Web\Tomcat"
+move apache-tomcat-7.0.23\*.* .
+rd apache-tomcat-7.0.23
+popd
+echo [prepare] Unpack PHP (Thread Safe)
+7z x %PHP_TS_PACKAGE% -o"%MG_SOURCE%\Web\Php"
+rem echo [prepare] Unpack PHP (Non-Thread Safe)
+rem 7z x %PHP_NTS_PACKAGE% -o"%MG_SOURCE%\Web\PHP_NTS"
+popd
rem copy template configs on top
echo [prepare] Tomcat config
%XCOPY% "%INSTALLER_DEV%\Support\Web\%CPUTYPE%\configs\Tomcat" "%MG_SOURCE%\Web\Tomcat" /EXCLUDE:svn_excludes.txt
echo [prepare] Php config
%XCOPY% "%INSTALLER_DEV%\Support\Web\%CPUTYPE%\configs\Php" "%MG_SOURCE%\Web\Php" /EXCLUDE:svn_excludes.txt
+rem echo [prepare] Php config
+rem %XCOPY% "%INSTALLER_DEV%\Support\Web\%CPUTYPE%\configs\Php" "%MG_SOURCE%\Web\PHP_NTS" /EXCLUDE:svn_excludes.txt
echo [prepare] Apache2 config
%XCOPY% "%INSTALLER_DEV%\Support\Web\%CPUTYPE%\configs\Apache2" "%MG_SOURCE%\Web\Apache2" /EXCLUDE:svn_excludes.txt
echo [prepare] FDO providers.xml
@@ -270,6 +297,10 @@
%PARAFFIN% %WIX_INC_WEB%\incPhpFiles.wxs
move /Y %WIX_INC_WEB%\incPhpFiles.PARAFFIN %WIX_INC_WEB%\incPhpFiles.wxs
+rem echo [regen]: Web - Php NTS
+rem %PARAFFIN% %WIX_INC_WEB%\incPhpNtsFiles.wxs
+rem move /Y %WIX_INC_WEB%\incPhpNtsFiles.PARAFFIN %WIX_INC_WEB%\incPhpNtsFiles.wxs
+
echo [regen]: Web - Tomcat
%PARAFFIN% %WIX_INC_WEB%\incTomcatFiles.wxs
move /Y %WIX_INC_WEB%\incTomcatFiles.PARAFFIN %WIX_INC_WEB%\incTomcatFiles.wxs
@@ -353,9 +384,12 @@
echo [generate]: Web - Apache
%PARAFFIN% -dir %MG_SOURCE%\Web\Apache2 -alias $(var.MgSource)\Web\Apache2 -custom APACHEFILES -dirref WEBEXTENSIONSLOCATION %WIX_INC_WEB%\incApacheFiles.wxs
-echo [generate]: Web - Php
+echo [generate]: Web - Php TS
%PARAFFIN% -dir %MG_SOURCE%\Web\Php -alias $(var.MgSource)\Web\Php -custom PHPFILES -dirref WEBEXTENSIONSLOCATION %WIX_INC_WEB%\incPhpFiles.wxs
+rem echo [generate]: Web - Php NTS
+rem %PARAFFIN% -dir %MG_SOURCE%\Web\PHP_NTS -alias $(var.MgSource)\Web\PHP_NTS -custom PHPNTSFILES -dirref WEBEXTENSIONSLOCATION %WIX_INC_WEB%\incPhpNtsFiles.wxs
+
echo [generate]: Web - Tomcat
%PARAFFIN% -dir %MG_SOURCE%\Web\Tomcat -alias $(var.MgSource)\Web\Tomcat -custom TOMCATFILES -dirref WEBEXTENSIONSLOCATION %WIX_INC_WEB%\incTomcatFiles.wxs
More information about the mapguide-commits
mailing list