[mapguide-commits] r4694 - in trunk/Installer: .
Custom/apache_actions Installers/MapGuide
Installers/MapGuide/Lang Libraries/MapGuide Web Extensions
Libraries/MapGuide Web Extensions/Lang Support/Web/Apache2/conf
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Mar 25 08:33:32 EDT 2010
Author: jng
Date: 2010-03-25 08:33:29 -0400 (Thu, 25 Mar 2010)
New Revision: 4694
Modified:
trunk/Installer/Custom/apache_actions/apache_actions.cpp
trunk/Installer/Custom/apache_actions/apache_actions.vcproj
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 Web Extensions/Apache.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl
trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_es-ES.wxl
trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs
trunk/Installer/Support/Web/Apache2/conf/httpd.conf
trunk/Installer/Support/Web/Apache2/conf/tomcat.conf
trunk/Installer/build.bat
Log:
This submission includes the following changes that should make side-by-side installation with previous versions of MGOS easier:
- Add viewer API shortcut to installer
- Default start menu folder is now "MapGuide Open Source 2.2"
- build.bat now defines a custom registry root, that is passed as the wix variable: MgRegKey
- Make the virtual directory name configurable from the installer. This completes ticket #1297
- Add the %MG_VIRTUAL_DIR% placeholder to httpd.conf and tomcat.conf
- Make MgHttpHandler.dll load first in tomcat.conf, this allowed the 2.2 Apache service to start and co-exist with a 2.1 Apache service.
- Fix some IIS virtual directories which were hardcoded to "mapguide" and not using the VIRTUALDIR property
- Make the product ID an auto-generated value, instead of a static GUID. This allows this installer to be installed on a machine which already has an existing MGOS 2.1 installation. Otherwise, MSI will assume the product is already installed.
Modified: trunk/Installer/Custom/apache_actions/apache_actions.cpp
===================================================================
--- trunk/Installer/Custom/apache_actions/apache_actions.cpp 2010-03-25 12:23:55 UTC (rev 4693)
+++ trunk/Installer/Custom/apache_actions/apache_actions.cpp 2010-03-25 12:33:29 UTC (rev 4694)
@@ -248,6 +248,7 @@
CHAR szApacheDir[MAX_BUFFER];
CHAR szPhpDir[MAX_BUFFER];
CHAR szWebDir[MAX_BUFFER];
+ CHAR szVirtualDir[MAX_BUFFER];
CHAR szApiType[MAX_BUFFER];
CHAR szServerPort[MAX_BUFFER];
CHAR szFile[MAX_BUFFER];
@@ -305,7 +306,13 @@
if(tok)
{
strcpy(szWebDir, tok);
+ tok = strtok(NULL, ";");
}
+ //[VIRTUALDIR]
+ if(tok)
+ {
+ strcpy(szVirtualDir, tok);
+ }
}
bJava = ( strcmp(szApiType,"JAVA") == 0 );
@@ -363,6 +370,11 @@
strcpy(szReplace, szApacheDir);
csBuff.Replace(szFind, szReplace);
+ // Replace %MG_VIRTUAL_DIR%
+ strcpy(szFind, "%MG_VIRTUAL_DIR%");
+ strcpy(szReplace, szVirtualDir);
+ csBuff.Replace(szFind, szReplace);
+
// If java, then include the tomcat configuration
strcpy(szFind, "%MG_INCLUDE_TOMCAT%");
csBuff.Replace(szFind, bJava ? "Include conf/tomcat.conf" : "#Uncomment to enable the Java API\n#Include conf/tomcat.conf");
@@ -388,6 +400,7 @@
cfOutFile.Close();
}
+ //Check if the tomcat.conf file was included in httpd.conf, if so we need to do placeholder substitution there too.
strcpy(szFile, szApacheDir);
strcat(szFile, "\\conf\\tomcat.conf");
@@ -410,6 +423,11 @@
strcpy(szReplace, szApacheDir);
csBuff.Replace(szFind,szReplace);
+ // Replace %MG_VIRTUAL_DIR%
+ strcpy(szFind, "%MG_VIRTUAL_DIR%");
+ strcpy(szReplace, szVirtualDir);
+ csBuff.Replace(szFind, szReplace);
+
CFile cfOutFile(szFile, CFile::modeWrite);
// Write and modify the contents.
Modified: trunk/Installer/Custom/apache_actions/apache_actions.vcproj
===================================================================
--- trunk/Installer/Custom/apache_actions/apache_actions.vcproj 2010-03-25 12:23:55 UTC (rev 4693)
+++ trunk/Installer/Custom/apache_actions/apache_actions.vcproj 2010-03-25 12:33:29 UTC (rev 4694)
@@ -49,7 +49,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;APACHE_ACTIONS_EXPORTS"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;APACHE_ACTIONS_EXPORTS;_CRT_SECURE_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
Modified: trunk/Installer/Installers/MapGuide/Lang/MapGuide_en-US.wxl
===================================================================
--- trunk/Installer/Installers/MapGuide/Lang/MapGuide_en-US.wxl 2010-03-25 12:23:55 UTC (rev 4693)
+++ trunk/Installer/Installers/MapGuide/Lang/MapGuide_en-US.wxl 2010-03-25 12:33:29 UTC (rev 4694)
@@ -41,12 +41,14 @@
<String Id="ApacheConfigDlg_Title">Bundled Configuration Settings</String>
<String Id="ApacheConfigDlg_Description">Set up the development environment</String>
- <String Id="ApacheConfigDlg_PortNo">Web Server Port Number:</String>
- <String Id="ApacheConfigDlg_DevEnv">Development Environment:</String>
+ <String Id="ApacheConfigDlg_PortNo">Web Server Port Number</String>
+ <String Id="ApacheConfigDlg_DevEnv">Development Environment</String>
+ <String Id="ApacheConfigDlg_VDirName">Virtual Directory Name</String>
<String Id="IISLangConfigDlg_Title">IIS Configuration Settings</String>
<String Id="IISLangConfigDlg_Description">Set up the development environment</String>
- <String Id="IISLangConfigDlg_DevEnv">Development Environment:</String>
+ <String Id="IISLangConfigDlg_DevEnv">Development Environment</String>
+ <String Id="IISLangConfigDlg_VDirName">Virtual Directory Name</String>
<String Id="IIS6ConfigDlg_Title">IIS 6.0 Configuration</String>
<String Id="IIS6ConfigDlg_Description">Configure IIS 6.0 Settings</String>
Modified: trunk/Installer/Installers/MapGuide/Lang/MapGuide_es-ES.wxl
===================================================================
--- trunk/Installer/Installers/MapGuide/Lang/MapGuide_es-ES.wxl 2010-03-25 12:23:55 UTC (rev 4693)
+++ trunk/Installer/Installers/MapGuide/Lang/MapGuide_es-ES.wxl 2010-03-25 12:33:29 UTC (rev 4694)
@@ -41,12 +41,14 @@
<String Id="ApacheConfigDlg_Title">Paquete de ajustes de configuración</String>
<String Id="ApacheConfigDlg_Description">Configure el entorno de desarrollo</String>
- <String Id="ApacheConfigDlg_PortNo">número de puerto del servidor web:</String>
- <String Id="ApacheConfigDlg_DevEnv">Entorno de desarrollo:</String>
+ <String Id="ApacheConfigDlg_PortNo">número de puerto del servidor web</String>
+ <String Id="ApacheConfigDlg_DevEnv">Entorno de desarrollo</String>
+ <String Id="ApacheConfigDlg_VDirName">Nombre del directorio virtual</String>
<String Id="IISLangConfigDlg_Title">Ajustes de configuración de IIS</String>
<String Id="IISLangConfigDlg_Description">Configure el entorno de desarrollo</String>
- <String Id="IISLangConfigDlg_DevEnv">Entorno de desarrollo:</String>
+ <String Id="IISLangConfigDlg_DevEnv">Entorno de desarrollo</String>
+ <String Id="IISLangConfigDlg_VDirName">Nombre del directorio virtual</String>
<String Id="IIS6ConfigDlg_Title">Configuración de IIS 6.0</String>
<String Id="IIS6ConfigDlg_Description">Configurar IIS 6.0 Configuración</String>
Modified: trunk/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wxs 2010-03-25 12:23:55 UTC (rev 4693)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs 2010-03-25 12:33:29 UTC (rev 4694)
@@ -5,7 +5,7 @@
xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension"
>
<Product
- Id="47B770BA-1591-415D-A7AE-33D4C522FCEA"
+ Id="*"
UpgradeCode="5D9A7D8D-485E-43E0-A4C8-3582E4D80051"
Name="$(var.MgTitle)"
Version="$(var.MgVersion)"
@@ -275,16 +275,17 @@
<!--
Set up the development environment
- Web Server Port Number:
- _______________________
-
+ Web Server Port Number: _______________________
+ Virtual Directory Name: _______________________
Development Environment:
( ) PHP
( ) Java
-->
<Control Id="LblServerPort" Type="Text" Text="{\WixUI_Font_Title}!(loc.ApacheConfigDlg_PortNo)" X="20" Y="60" Width="120" Height="15" />
- <Control Id="TxtServerPort" Type="Edit" Property="APACHE_PORT" X="30" Y="80" Width="120" Height="15" />
+ <Control Id="TxtServerPort" Type="Edit" Property="APACHE_PORT" X="150" Y="60" Width="120" Height="15" />
+ <Control Id="LblVdirName" Type="Text" Text="{\WixUI_Font_Title}!(loc.ApacheConfigDlg_VDirName)" X="20" Y="80" Width="120" Height="15" />
+ <Control Id="TxtVdirName" Type="Edit" Property="VIRTUALDIR" X="150" Y="80" Width="120" Height="15" />
<Control Id="LblDevEnv" Type="Text" Text="{\WixUI_Font_Title}!(loc.ApacheConfigDlg_DevEnv)" X="20" Y="110" Width="120" Height="15" />
<Control Id="RdApacheApiType" Property="APACHE_API_TYPE" Type="RadioButtonGroup" X="20" Y="130" Height="100" Width="290">
<RadioButtonGroup Property="APACHE_API_TYPE">
@@ -305,13 +306,16 @@
<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" />
<!--
- Set up the development environment
+ Virtual Directory Name: __________________________________
+ Development environment:
( ) PHP
( ) .NET
-->
- <Control Id="LblDevEnv" Type="Text" Text="{\WixUI_Font_Title}!(loc.IISLangConfigDlg_DevEnv)" X="20" Y="60" Width="120" Height="15" />
- <Control Id="RdIIsApiType" Property="IIS_API_TYPE" Type="RadioButtonGroup" Text="{\WixUI_Font_Title}!(loc.IISLangConfigDlg_DevEnv)" X="30" Y="70" Height="100" Width="290">
+ <Control Id="LblVDirName" Type="Text" Text="{\WixUI_Font_Title}!(loc.IISLangConfigDlg_VDirName)" X="20" Y="60" Width="120" Height="15" />
+ <Control Id="TxtVDirName" Type="Edit" Property="VIRTUALDIR" X="150" Y="60" Width="120" Height="15" />
+ <Control Id="LblDevEnv" Type="Text" Text="{\WixUI_Font_Title}!(loc.IISLangConfigDlg_DevEnv)" X="20" Y="80" Width="120" Height="15" />
+ <Control Id="RdIIsApiType" Property="IIS_API_TYPE" Type="RadioButtonGroup" Text="{\WixUI_Font_Title}!(loc.IISLangConfigDlg_DevEnv)" X="30" Y="90" Height="100" Width="290">
<RadioButtonGroup Property="IIS_API_TYPE">
<RadioButton Text="PHP" Value="PHP" X="25" Y="10" Width="200" Height="45" />
<RadioButton Text=".NET" Value="DOTNET" X="25" Y="40" Width="200" Height="45" />
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs 2010-03-25 12:23:55 UTC (rev 4693)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs 2010-03-25 12:33:29 UTC (rev 4694)
@@ -2,14 +2,10 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<Binary Id="ApacheActions" SourceFile="..\..\Custom\bin\apache_actions.dll" />
- <CustomAction Id="UpdateApacheConfig.SetValues" Property="UpdateApacheConfig" Value="[WEBEXTENSIONSLOCATION];[APACHE_API_TYPE];[APACHE_PORT];[APACHELOCATION];[PHPLOCATION];[WEBROOTLOCATION]" />
+ <CustomAction Id="UpdateApacheConfig.SetValues" Property="UpdateApacheConfig" Value="[WEBEXTENSIONSLOCATION];[APACHE_API_TYPE];[APACHE_PORT];[APACHELOCATION];[PHPLOCATION];[WEBROOTLOCATION];[VIRTUALDIR]" />
<CustomAction Id="UpdateApacheConfig" Return="check" BinaryKey="ApacheActions" Execute="deferred" DllEntry="UpdateApacheConfig" />
<CustomAction Id="UpdatePhpIni.SetValues" Property="UpdatePhpIni" Value='[PHPLOCATION];2;[WEBTEMPLOCATION]' />
<CustomAction Id="UpdatePhpIni" Return="check" BinaryKey="ApacheActions" Execute="deferred" DllEntry="UpdatePhpIni" />
- <!--
- <CustomAction Id="GetApacheDir.SetValues" Property="GetApacheDir" Value="[APACHE_VERSION]" />
- <CustomAction Id="GetApacheDir" Return="check" BinaryKey="ApacheActions" Execute="deferred" DllEntry="GetApacheDir" />
- -->
<CustomAction Id="RemoveApacheServiceCA" Execute="immediate" Return="ignore" FileKey="file_APACHEFILES_13" ExeCommand="-k uninstall -n "ApacheMapGuide[MG_VERSION_MAJOR_MINOR]"" />
<CustomAction Id="InstallApacheServiceCA" Execute="deferred" Return="ignore" FileKey="file_APACHEFILES_13" ExeCommand="-k install -n "ApacheMapGuide[MG_VERSION_MAJOR_MINOR]"" />
</Fragment>
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs 2010-03-25 12:23:55 UTC (rev 4693)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs 2010-03-25 12:33:29 UTC (rev 4694)
@@ -67,7 +67,7 @@
<Component Id="IIS5PhpViewerComponent" Guid="1E56B410-1305-4406-BDFB-1252E159B746" Directory="WEBEXTENSIONSLOCATION">
<Condition>MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR="#5"</Condition>
<CreateFolder />
- <iis:WebVirtualDir Id="IIS5PhpViewerVDir" Alias="mapguide/mapviewerajax" Directory="dir_mapviewerphp_0" WebSite="IISDefaultWebSite">
+ <iis:WebVirtualDir Id="IIS5PhpViewerVDir" Alias="[VIRTUALDIR]/mapviewerajax" Directory="dir_mapviewerphp_0" WebSite="IISDefaultWebSite">
<iis:WebDirProperties Id="IIS5PhpViewerDocument" DefaultDocuments="ajaxviewer.php" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no"/>
</iis:WebVirtualDir>
</Component>
@@ -76,7 +76,7 @@
<Component Id="IIS5DotNetViewerComponent" Guid="EC460125-D5D4-4596-BD03-B8D920F02E7F" Directory="WEBEXTENSIONSLOCATION">
<Condition>NETFRAMEWORK20 AND MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#5"</Condition>
<CreateFolder />
- <iis:WebVirtualDir Id="IIS5DotNetViewerVDir" Alias="mapguide/mapviewerajax" Directory="dir_mapviewernet_0" WebSite="IISDefaultWebSite">
+ <iis:WebVirtualDir Id="IIS5DotNetViewerVDir" Alias="[VIRTUALDIR]/mapviewerajax" Directory="dir_mapviewernet_0" WebSite="IISDefaultWebSite">
<iis:WebDirProperties Id="IIS5DotNetViewerDocument" DefaultDocuments="ajaxviewer.aspx" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
<iis:WebApplication Id="IIS5MapViewerWebApp" Name="mapviewerajax" />
</iis:WebVirtualDir>
@@ -125,7 +125,7 @@
<Component Id="IIS6PhpViewerComponent" Guid="6CDC8E73-B6B1-4A2E-98E3-953C399D1D0D" Directory="WEBEXTENSIONSLOCATION">
<Condition>MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND IISVERSIONMAJOR="#6"</Condition>
<CreateFolder />
- <iis:WebVirtualDir Id="IIS6PhpViewerVDir" Alias="mapguide/mapviewerajax" Directory="dir_mapviewerphp_0" WebSite="IISDefaultWebSite">
+ <iis:WebVirtualDir Id="IIS6PhpViewerVDir" Alias="[VIRTUALDIR]/mapviewerajax" Directory="dir_mapviewerphp_0" WebSite="IISDefaultWebSite">
<iis:WebDirProperties Id="IIS6PhpViewerDocument" DefaultDocuments="ajaxviewer.php" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
</iis:WebVirtualDir>
</Component>
@@ -134,7 +134,7 @@
<Component Id="IIS6DotNetViewerComponent" Guid="357E1C68-9E29-474F-A783-6F8FD8BCEAB4" Directory="WEBEXTENSIONSLOCATION">
<Condition>NETFRAMEWORK20 AND MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND IISVERSIONMAJOR="#6"</Condition>
<CreateFolder />
- <iis:WebVirtualDir Id="IIS6DotNetViewerVDir" Alias="mapguide/mapviewerajax" Directory="dir_mapviewernet_0" WebSite="IISDefaultWebSite">
+ <iis:WebVirtualDir Id="IIS6DotNetViewerVDir" Alias="[VIRTUALDIR]/mapviewerajax" Directory="dir_mapviewernet_0" WebSite="IISDefaultWebSite">
<iis:WebDirProperties Id="IIS6DotNetViewerDocument" DefaultDocuments="ajaxviewer.aspx" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
<iis:WebApplication Id="IIS6MapViewerWebApp" Name="mapviewerajax" WebAppPool="IIS6MapGuideAppPool" />
</iis:WebVirtualDir>
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl 2010-03-25 12:23:55 UTC (rev 4693)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl 2010-03-25 12:33:29 UTC (rev 4694)
@@ -37,7 +37,8 @@
<String Id="WebTempFeature">Temp Directory</String>
<String Id="WebTempFeature_Description">You may choose a location where MapGuide will store temporary files.</String>
- <String Id="Shortcut_WebAPI">Web API Documentation</String>
+ <String Id="Shortcut_WebAPI">Web API Documentation</String>
+ <String Id="Shortcut_ViewerAPI">Viewer API Documentation</String>
<String Id="Shortcut_SiteAdmin">MapGuide Site Administrator</String>
<String Id="Shortcut_MapAgent">MapAgent Test Pages</String>
<String Id="Shortcut_GetMaestro">Get MapGuide Maestro</String>
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_es-ES.wxl
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_es-ES.wxl 2010-03-25 12:23:55 UTC (rev 4693)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_es-ES.wxl 2010-03-25 12:33:29 UTC (rev 4694)
@@ -38,6 +38,7 @@
<String Id="WebTempFeature_Description">Usted puede elegir un lugar donde MapGuide almacenará los archivos temporales</String>
<String Id="Shortcut_WebAPI">Web de documentación de la API</String>
+ <String Id="Shortcut_ViewerAPI">Visor de Documentación de la API</String>
<String Id="Shortcut_SiteAdmin">MapGuide administrador del sitio</String>
<String Id="Shortcut_MapAgent">MapAgent Páginas de prueba</String>
<String Id="Shortcut_GetMaestro">Obtener MapGuide Maestro</String>
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs 2010-03-25 12:23:55 UTC (rev 4693)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs 2010-03-25 12:33:29 UTC (rev 4694)
@@ -145,6 +145,8 @@
<ComponentGroupRef Id="group_HELPFILES" />
<ComponentRef Id="ApacheWebApiShortcutComponent"/>
<ComponentRef Id="IISWebApiShortcutComponent"/>
+ <ComponentRef Id="ApacheViewerApiShortcutComponent"/>
+ <ComponentRef Id="IISViewerApiShortcutComponent"/>
</Feature>
<Feature Id="WebExtMapViewerFeature" Title="!(loc.WebExtMapViewerFeature)" Display="hidden" Level="1" Description="!(loc.WebExtMapViewerFeature_Description)" AllowAdvertise="no" TypicalDefault="install" InstallDefault="local" >
<ComponentGroupRef Id="group_MAPVIEWERFILES"/>
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs 2010-03-25 12:23:55 UTC (rev 4693)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs 2010-03-25 12:33:29 UTC (rev 4694)
@@ -3,7 +3,8 @@
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<Fragment>
<DirectoryRef Id="ProgramMenuFolder">
- <Directory Id="MapGuideOpenSourceMenuLocation" Name="MapGuide Open Source">
+ <!-- HACK: For some reason the MG_VERSION_MAJOR_MINOR property doesn't evaluate, so hardcode it for now -->
+ <Directory Id="MapGuideOpenSourceMenuLocation" Name="MapGuide Open Source 2.2">
<Component Id="GenericShortcutComponent" Guid="243CE0F3-D6BC-476B-910E-6F34DA54A2E2">
<CreateFolder />
<RegistryKey Root="HKCU" Key="$(var.MgRegKey)\GenericShortcut">
@@ -20,7 +21,7 @@
<util:InternetShortcut Id="ApacheWebApi"
Directory="MapGuideOpenSourceMenuLocation"
Name="!(loc.Shortcut_WebAPI)"
- Target="http://localhost:[APACHE_PORT]/mapguide/help/index.htm" />
+ Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/help/webapi/index.htm" />
<RegistryKey Root="HKCU" Key="$(var.MgRegKey)\ApacheWebApiShortcut">
<RegistryValue
Value="Installed"
@@ -28,16 +29,30 @@
KeyPath="yes" />
</RegistryKey>
</Component>
+ <Component Id="ApacheViewerApiShortcutComponent" Guid="4AABF916-33FC-440D-9D6F-8CE95F2ADE7A">
+ <Condition>MGWEB_CONFIG="APACHE"</Condition>
+ <CreateFolder />
+ <util:InternetShortcut Id="ApacheViewerApi"
+ Directory="MapGuideOpenSourceMenuLocation"
+ Name="!(loc.Shortcut_ViewerAPI)"
+ Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/help/viewerapi/index.htm" />
+ <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\ApacheViewerApiShortcut">
+ <RegistryValue
+ Value="Installed"
+ Type="string"
+ KeyPath="yes" />
+ </RegistryKey>
+ </Component>
<Component Id="WebApacheShortcutComponent" Guid="2EBC8176-07C5-40A9-97F9-C3E83836637E">
<Condition>MGWEB_CONFIG="APACHE"</Condition>
<util:InternetShortcut Id="ApacheSiteAdmin"
Directory="MapGuideOpenSourceMenuLocation"
Name="!(loc.Shortcut_SiteAdmin)"
- Target="http://localhost:[APACHE_PORT]/mapguide/mapadmin/login.php" />
+ Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/mapadmin/login.php" />
<util:InternetShortcut Id="ApacheMapAgent"
Directory="MapGuideOpenSourceMenuLocation"
Name="!(loc.Shortcut_MapAgent)"
- Target="http://localhost:[APACHE_PORT]/mapguide/mapagent/index.html" />
+ Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/mapagent/index.html" />
<util:InternetShortcut Id="ApacheGetMaestro"
Directory="MapGuideOpenSourceMenuLocation"
Name="!(loc.Shortcut_GetMaestro)"
@@ -55,7 +70,7 @@
<util:InternetShortcut Id="IISWebApi"
Directory="MapGuideOpenSourceMenuLocation"
Name="!(loc.Shortcut_WebAPI)"
- Target="http://localhost/mapguide/help/index.htm" />
+ Target="http://localhost/[VIRTUALDIR]/help/webapi/index.htm" />
<RegistryKey Root="HKCU" Key="$(var.MgRegKey)\IISWebApiShortcut">
<RegistryValue
Value="Installed"
@@ -63,16 +78,30 @@
KeyPath="yes" />
</RegistryKey>
</Component>
+ <Component Id="IISViewerApiShortcutComponent" Guid="F2CCA279-4C99-48CE-9F79-7465449E2B33">
+ <Condition>MGWEB_CONFIG="IIS"</Condition>
+ <CreateFolder />
+ <util:InternetShortcut Id="IISViewerApi"
+ Directory="MapGuideOpenSourceMenuLocation"
+ Name="!(loc.Shortcut_ViewerAPI)"
+ Target="http://localhost/[VIRTUALDIR]/help/viewerapi/index.htm" />
+ <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\IISViewerApiShortcut">
+ <RegistryValue
+ Value="Installed"
+ Type="string"
+ KeyPath="yes" />
+ </RegistryKey>
+ </Component>
<Component Id="WebIISShortcutComponent" Guid="F59A450A-84DE-4E2E-B942-BD416CDEBBF3">
<Condition>MGWEB_CONFIG="IIS"</Condition>
<util:InternetShortcut Id="IISSiteAdmin"
Directory="MapGuideOpenSourceMenuLocation"
Name="!(loc.Shortcut_SiteAdmin)"
- Target="http://localhost/mapguide/mapadmin/login.php" />
+ Target="http://localhost/[VIRTUALDIR]/mapadmin/login.php" />
<util:InternetShortcut Id="IISMapAgent"
Directory="MapGuideOpenSourceMenuLocation"
Name="!(loc.Shortcut_MapAgent)"
- Target="http://localhost/mapguide/mapagent/index.html" />
+ Target="http://localhost/[VIRTUALDIR]/mapagent/index.html" />
<util:InternetShortcut Id="IISGetMaestro"
Directory="MapGuideOpenSourceMenuLocation"
Name="!(loc.Shortcut_GetMaestro)"
Modified: trunk/Installer/Support/Web/Apache2/conf/httpd.conf
===================================================================
--- trunk/Installer/Support/Web/Apache2/conf/httpd.conf 2010-03-25 12:23:55 UTC (rev 4693)
+++ trunk/Installer/Support/Web/Apache2/conf/httpd.conf 2010-03-25 12:33:29 UTC (rev 4694)
@@ -122,9 +122,9 @@
LoadFile "%MG_WEB_PHP%php5ts.dll"
LoadFile "%MG_WEB_PHP%ACE.dll"
+LoadFile "%MG_WEB_PHP%MgHttpHandler.dll"
LoadFile "%MG_WEB_PHP%MgFoundation.dll"
LoadFile "%MG_WEB_PHP%MgGeometry.dll"
-LoadFile "%MG_WEB_PHP%MgHttpHandler.dll"
LoadFile "%MG_WEB_PHP%MgMapGuideCommon.dll"
LoadFile "%MG_WEB_PHP%MgMdfModel.dll"
LoadFile "%MG_WEB_PHP%MgMdfParser.dll"
@@ -981,17 +981,17 @@
# MapViewer to MapViewerPhp aliases. Comment out Alias and AliasMatch for Java API.
-ScriptAlias /mapguide/mapagent/mapagent.fcgi "%MG_WEB_ROOT%mapagent/mapagent.fcgi"
-%MG_PHP_API%AliasMatch ^/mapguide/mapviewerajax/([^\?])(.*)$ "%MG_WEB_ROOT%mapviewerphp/$1$2"
-%MG_PHP_API%AliasMatch ^/mapguide/mapviewerajax/(.*)$ "%MG_WEB_ROOT%mapviewerphp/ajaxviewer.php$1"
-%MG_PHP_API%AliasMatch ^/mapguide/mapviewerdwf/([^\?])(.*)$ "%MG_WEB_ROOT%mapviewerphp/$1$2"
-%MG_PHP_API%AliasMatch ^/mapguide/mapviewerdwf/(.*)$ "%MG_WEB_ROOT%mapviewerphp/dwfviewer.php$1"
+ScriptAlias /%MG_VIRTUAL_DIR%/mapagent/mapagent.fcgi "%MG_WEB_ROOT%mapagent/mapagent.fcgi"
+%MG_PHP_API%AliasMatch ^/%MG_VIRTUAL_DIR%/mapviewerajax/([^\?])(.*)$ "%MG_WEB_ROOT%mapviewerphp/$1$2"
+%MG_PHP_API%AliasMatch ^/%MG_VIRTUAL_DIR%/mapviewerajax/(.*)$ "%MG_WEB_ROOT%mapviewerphp/ajaxviewer.php$1"
+%MG_PHP_API%AliasMatch ^/%MG_VIRTUAL_DIR%/mapviewerdwf/([^\?])(.*)$ "%MG_WEB_ROOT%mapviewerphp/$1$2"
+%MG_PHP_API%AliasMatch ^/%MG_VIRTUAL_DIR%/mapviewerdwf/(.*)$ "%MG_WEB_ROOT%mapviewerphp/dwfviewer.php$1"
# MapViewer to MapViewerJava Redirect. Uncomment Redirect for Java API.
-%MG_JAVA_API%Redirect /mapguide/mapviewerajax/ http://localhost:8008/mapguide/mapviewerjava/ajaxviewer.jsp
-%MG_JAVA_API%Redirect /mapguide/mapviewerdwf/ http://localhost:8008/mapguide/mapviewerjava/dwfviewer.jsp
+%MG_JAVA_API%Redirect /%MG_VIRTUAL_DIR%/mapviewerajax/ http://localhost:8008/%MG_VIRTUAL_DIR%/mapviewerjava/ajaxviewer.jsp
+%MG_JAVA_API%Redirect /%MG_VIRTUAL_DIR%/mapviewerdwf/ http://localhost:8008/%MG_VIRTUAL_DIR%/mapviewerjava/dwfviewer.jsp
-Alias /mapguide "%MG_WEB_ROOT%"
+Alias /%MG_VIRTUAL_DIR% "%MG_WEB_ROOT%"
<Directory "%MG_WEB_ROOT%">
AllowOverride All
Options All -Indexes
Modified: trunk/Installer/Support/Web/Apache2/conf/tomcat.conf
===================================================================
--- trunk/Installer/Support/Web/Apache2/conf/tomcat.conf 2010-03-25 12:23:55 UTC (rev 4693)
+++ trunk/Installer/Support/Web/Apache2/conf/tomcat.conf 2010-03-25 12:33:29 UTC (rev 4694)
@@ -18,4 +18,4 @@
# JkRequestLogFormat set the request format
JkRequestLogFormat "%w %V %T"
# Send everything for context /examples to worker named worker1 (ajp13)
-JkMount /mapguide/mapviewerjava/* worker1
\ No newline at end of file
+JkMount /%MG_VIRTUAL_DIR%/mapviewerjava/* worker1
\ No newline at end of file
Modified: trunk/Installer/build.bat
===================================================================
--- trunk/Installer/build.bat 2010-03-25 12:23:55 UTC (rev 4693)
+++ trunk/Installer/build.bat 2010-03-25 12:33:29 UTC (rev 4694)
@@ -43,9 +43,11 @@
SET TYPEACTION=build
SET TYPEBUILD=Release
SET CULTURE=en-US
-SET INSTALLER_NAME=MapGuideOpenSource-2.2.0-Trunk-%CULTURE%-%TYPEBUILD%
-SET INSTALLER_VERSION=2.2.0.0
+SET INSTALLER_VERSION_MAJOR_MINOR_REV=2.2.0
+SET INSTALLER_NAME=MapGuideOpenSource-%INSTALLER_VERSION_MAJOR_MINOR_REV%-Trunk-%CULTURE%-%TYPEBUILD%
+SET INSTALLER_VERSION=%INSTALLER_VERSION_MAJOR_MINOR_REV%.0
SET INSTALLER_TITLE="MapGuide Open Source 2.2 Trunk (%TYPEBUILD%)"
+SET MG_REG_KEY=Software\OSGeo\MapGuide\%INSTALLER_VERSION_MAJOR_MINOR_REV%
SET MG_SOURCE=%CD%\..\MgDev\%TYPEBUILD%
SET MG_SOURCE_INC=
rem Set to NO to build installers quicker (at the expense of file size)
@@ -176,6 +178,7 @@
echo Installer Output Directory: %INSTALLER_OUTPUT%
echo MG Source Directory: %MG_SOURCE%
echo Locale: %CULTURE%
+echo Registry Root: %MG_REG_KEY%
echo ===================================================
if "%TYPEACTION%"=="build" goto build
@@ -394,7 +397,7 @@
:build
echo [build]: Installer
-SET RUN_BUILD=%MSBUILD% /p:OutputName=%INSTALLER_NAME%;MgCulture=%CULTURE%;MgTitle=%INSTALLER_TITLE%;MgVersion=%INSTALLER_VERSION%
+SET RUN_BUILD=%MSBUILD% /p:OutputName=%INSTALLER_NAME%;MgCulture=%CULTURE%;MgTitle=%INSTALLER_TITLE%;MgVersion=%INSTALLER_VERSION%;MgRegKey=%MG_REG_KEY%
if not ""=="%MG_SOURCE_INC%" set RUN_BUILD=%RUN_BUILD%;MgSource=%MG_SOURCE_INC%
set RUN_BUILD=%RUN_BUILD% Installer.sln
%RUN_BUILD%
More information about the mapguide-commits
mailing list