[mapguide-commits] r7008 - in trunk/Installer: . Libraries/MapGuide Web Extensions Libraries/MapGuide Web Extensions/Lang Support
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Sep 12 10:01:55 PDT 2012
Author: jng
Date: 2012-09-12 10:01:54 -0700 (Wed, 12 Sep 2012)
New Revision: 7008
Modified:
trunk/Installer/
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/
Log:
Merge in 2.4 installer changes (Fusion API shortcuts)
Property changes on: trunk/Installer
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/2.4/Installer:6987-6988
Property changes on: trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl 2012-09-12 16:58:33 UTC (rev 7007)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl 2012-09-12 17:01:54 UTC (rev 7008)
@@ -59,6 +59,7 @@
<String Id="Shortcut_JavaDevGuideSample">Java Developer's Guide Samples</String>
<String Id="Shortcut_WikiHelp">Autodesk WikiHelp</String>
<String Id="Shortcut_ViewerAPI">Viewer API Documentation</String>
+ <String Id="Shortcut_FusionAPI">Fusion 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 2012-09-12 16:58:33 UTC (rev 7007)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_es-ES.wxl 2012-09-12 17:01:54 UTC (rev 7008)
@@ -57,6 +57,7 @@
<String Id="Shortcut_JavaViewerSample">Java Viewer Sample</String>
<String Id="Shortcut_JavaDevGuideSample">Java Developer's Guide Samples</String>
<String Id="Shortcut_ViewerAPI">Visor de Documentación de la API</String>
+ <String Id="Shortcut_FusionAPI">Fusion 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 2012-09-12 16:58:33 UTC (rev 7007)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs 2012-09-12 17:01:54 UTC (rev 7008)
@@ -169,6 +169,8 @@
<ComponentRef Id="IISWebApiShortcutComponent"/>
<ComponentRef Id="ApacheViewerApiShortcutComponent"/>
<ComponentRef Id="IISViewerApiShortcutComponent"/>
+ <ComponentRef Id="ApacheFusionApiShortcutComponent"/>
+ <ComponentRef Id="IISFusionApiShortcutComponent"/>
<ComponentRef Id="ApacheDevGuideShortcutComponent"/>
<ComponentRef Id="IISDevGuideShortcutComponent"/>
</Feature>
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs 2012-09-12 16:58:33 UTC (rev 7007)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs 2012-09-12 17:01:54 UTC (rev 7008)
@@ -50,7 +50,7 @@
KeyPath="yes" />
</RegistryKey>
</Component>
- <Component Id="ApacheViewerApiShortcutComponent" Win64="$(var.Win64)" Guid="4AABF916-33FC-440D-9D6F-8CE95F2ADE7A">
+ <Component Id="ApacheViewerApiShortcutComponent" Win64="$(var.Win64)" Guid="47CD50F1-5961-43F8-8FE8-BF1CDC8AE895">
<Condition>MGWEB_CONFIG="APACHE"</Condition>
<CreateFolder />
<util:InternetShortcut Id="ApacheViewerApi"
@@ -64,6 +64,20 @@
KeyPath="yes" />
</RegistryKey>
</Component>
+ <Component Id="ApacheFusionApiShortcutComponent" Win64="$(var.Win64)" Guid="4AABF916-33FC-440D-9D6F-8CE95F2ADE7A">
+ <Condition>MGWEB_CONFIG="APACHE"</Condition>
+ <CreateFolder />
+ <util:InternetShortcut Id="ApacheFusionApi"
+ Directory="MapGuideOpenSourceMenuLocation"
+ Name="!(loc.Shortcut_FusionAPI)"
+ Target="http://localhost:[APACHE_PORT]/[VIRTUALDIR]/fusion/docs/NaturalDocs/index.html" />
+ <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\ApacheFusionApiShortcut">
+ <RegistryValue
+ Value="Installed"
+ Type="string"
+ KeyPath="yes" />
+ </RegistryKey>
+ </Component>
<Component Id="WebApacheShortcutComponent" Win64="$(var.Win64)" Guid="2EBC8176-07C5-40A9-97F9-C3E83836637E">
<Condition>MGWEB_CONFIG="APACHE"</Condition>
<util:InternetShortcut Id="ApacheSiteAdmin"
@@ -179,6 +193,20 @@
KeyPath="yes" />
</RegistryKey>
</Component>
+ <Component Id="IISFusionApiShortcutComponent" Win64="$(var.Win64)" Guid="8F4A6B97-DEFB-4AA1-859E-3392C5DC30D2">
+ <Condition>MGWEB_CONFIG="IIS"</Condition>
+ <CreateFolder />
+ <util:InternetShortcut Id="IISFusionApi"
+ Directory="MapGuideOpenSourceMenuLocation"
+ Name="!(loc.Shortcut_FusionAPI)"
+ Target="http://localhost/[VIRTUALDIR]/fusion/docs/NaturalDocs/index.html" />
+ <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\IISFusionApiShortcut">
+ <RegistryValue
+ Value="Installed"
+ Type="string"
+ KeyPath="yes" />
+ </RegistryKey>
+ </Component>
<Component Id="WebIISPHPViewerSampleShortcutComponent" Win64="$(var.Win64)" Guid="F1B2C345-52F8-4179-8CDC-34D2D3E22418">
<Condition>MGWEB_CONFIG="IIS"</Condition>
<util:InternetShortcut Id="IISPhpViewerSampleShortcut"
@@ -270,7 +298,7 @@
<util:InternetShortcut Id="AutodeskWikiHelp"
Directory="WebResourcesLocation"
Name="!(loc.Shortcut_WikiHelp)"
- Target="http://wikihelp.autodesk.com/Infr._Map_Server/enu/2012" />
+ Target="http://wikihelp.autodesk.com/Infr._Map_Server/enu/2013" />
<util:InternetShortcut Id="MapGuideCentral"
Directory="WebResourcesLocation"
Name="!(loc.Shortcut_MapGuideCentral)"
Property changes on: trunk/Installer/Support
___________________________________________________________________
Deleted: svn:mergeinfo
-
More information about the mapguide-commits
mailing list