[fusion-commits] r2580 - in trunk: . docs_config
svn_fusion at osgeo.org
svn_fusion at osgeo.org
Fri Sep 7 04:04:46 PDT 2012
Author: jng
Date: 2012-09-07 04:04:46 -0700 (Fri, 07 Sep 2012)
New Revision: 2580
Modified:
trunk/build.xml
trunk/docs_config/
trunk/docs_config/Menu.txt
Log:
#540: The reason NaturalDocs completely trashes our Menu.txt file on each build is because the file paths it's looking for doesn't match. So what we do instead is use a %WORKING_COPY% placeholder for the paths in Menu.txt, which we replace with the actual working copy path via a replace ant task. This is done before NaturalDocs is executed
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2012-09-07 09:20:12 UTC (rev 2579)
+++ trunk/build.xml 2012-09-07 11:04:46 UTC (rev 2580)
@@ -147,9 +147,13 @@
<mkdir dir="${build.home}/docs"/>
<mkdir dir="${build.home}/docs/NaturalDocs"/>
+ <!-- Dirty hack to avoid NaturalDoc's penchant for completely disregarding our Menu.txt -->
+ <echo message="Prepareing Menu.txt" />
+ <replace file="${basedir}/docs_config/Menu.txt" token="%WORKING_COPY%" value="${basedir}" />
+
<echo message="Generating documentation"/>
<exec executable="cmd" os="Windows Vista, Windows XP, Windows 7" dir="${basedir}/utils/NaturalDocs-1.4">
- <arg line="/c NaturalDocs -i ${build.home}/lib -i ${build.home}/widgets -xi ${build.home}/lib/OpenLayers/Lang -o html ${build.home}/docs/NaturalDocs -p ${basedir}/docs_config -ro" />
+ <arg line="/c NaturalDocs -i ${build.home}/lib -i ${build.home}/widgets -xi ${build.home}/lib/OpenLayers/Lang -o html ${build.home}/docs/NaturalDocs -p ${basedir}/docs_config -nag -r" />
</exec>
</target>
Property changes on: trunk/docs_config
___________________________________________________________________
Added: svn:ignore
+ Data
Modified: trunk/docs_config/Menu.txt
===================================================================
--- trunk/docs_config/Menu.txt 2012-09-07 09:20:12 UTC (rev 2579)
+++ trunk/docs_config/Menu.txt 2012-09-07 11:04:46 UTC (rev 2580)
@@ -1,4 +1,4 @@
-Format: 1.4
+Format: 1.52
Title: Fusion
@@ -51,87 +51,87 @@
Group: Core {
- File: Fusion (C:\Workspace\fusion-trunk\build\lib\fusion.js)
- File: Fusion.Error (C:\Workspace\fusion-trunk\build\lib\Error.js)
- File: Fusion.Lib.ApplicationDefinition (C:\Workspace\fusion-trunk\build\lib\ApplicationDefinition.js)
- File: Fusion.Lib.EventMgr (C:\Workspace\fusion-trunk\build\lib\EventMgr.js)
- File: Fusion.Lib.MGBroker (C:\Workspace\fusion-trunk\build\lib\MGBroker.js)
- File: Fusion.MapMessage (C:\Workspace\fusion-trunk\build\lib\MapMessage.js)
- File: Fusion.Tool.Rectangle (C:\Workspace\fusion-trunk\build\lib\RectTool.js)
- File: Fusion.Tool.Search (C:\Workspace\fusion-trunk\build\lib\Search.js)
- File: Fusion.Widget (C:\Workspace\fusion-trunk\build\lib\Widget.js)
- File: Fusion.Widget.Map (no auto-title, C:\Workspace\fusion-trunk\build\lib\Map.js)
+ File: Fusion (%WORKING_COPY%\build\lib\fusion.js)
+ File: Fusion.Error (%WORKING_COPY%\build\lib\Error.js)
+ File: Fusion.Lib.ApplicationDefinition (%WORKING_COPY%\build\lib\ApplicationDefinition.js)
+ File: Fusion.Lib.EventMgr (%WORKING_COPY%\build\lib\EventMgr.js)
+ File: Fusion.Lib.MGBroker (%WORKING_COPY%\build\lib\MGBroker.js)
+ File: Fusion.MapMessage (%WORKING_COPY%\build\lib\MapMessage.js)
+ File: Fusion.Tool.Rectangle (%WORKING_COPY%\build\lib\RectTool.js)
+ File: Fusion.Tool.Search (%WORKING_COPY%\build\lib\Search.js)
+ File: Fusion.Widget (%WORKING_COPY%\build\lib\Widget.js)
+ File: Fusion.Widget.map (no auto-title, %WORKING_COPY%\build\lib\Map.js)
} # Group: Core
Group: External {
- File: jxLib (no auto-title, C:\Workspace\fusion-trunk\build\lib\jxLib\jxlib.uncompressed.js)
- File: OpenLayers (no auto-title, C:\Workspace\fusion-trunk\build\lib\OpenLayers\OpenLayers.js)
- File: Proj4js (C:\Workspace\fusion-trunk\build\lib\Proj4js\proj4js-combined.js)
- File: isValidLonLat (C:\Workspace\fusion-trunk\build\lib\OLpatch.js)
- File: OpenLayers.Control.DragFeature (C:\Workspace\fusion-trunk\build\lib\DragFeature.js)
+ File: isValidLonLat (%WORKING_COPY%\build\lib\OLpatch.js)
+ File: JxLib (no auto-title, %WORKING_COPY%\build\lib\jxLib\jxlib.uncompressed.js)
+ File: OpenLayers.Control.DragFeature (%WORKING_COPY%\build\lib\DragFeature.js)
+ File: OpenLayers\OpenLayers.js (%WORKING_COPY%\build\lib\OpenLayers\OpenLayers.js)
+ File: Proj4js (%WORKING_COPY%\build\lib\Proj4js\proj4js-combined.js)
} # Group: External
Group: Widgets {
- File: Fusion.Widget.About (C:\Workspace\fusion-trunk\build\widgets\About.js)
- File: Fusion.Widget.ActivityIndicator (C:\Workspace\fusion-trunk\build\widgets\ActivityIndicator.js)
- File: Fusion.Widget.AddWMSLayer (C:\Workspace\fusion-trunk\build\widgets\AddWMSLayer.js)
- File: Fusion.Widget.BasemapSwitcher (C:\Workspace\fusion-trunk\build\widgets\BasemapSwitcher.js)
- File: Fusion.Widget.Buffer (C:\Workspace\fusion-trunk\build\widgets\Buffer.js)
- File: Fusion.Widget.BufferPanel (C:\Workspace\fusion-trunk\build\widgets\BufferPanel.js)
- File: Fusion.Widget.CenterSelection (C:\Workspace\fusion-trunk\build\widgets\CenterSelection.js)
- File: Fusion.Widget.ClearSelection (C:\Workspace\fusion-trunk\build\widgets\ClearSelection.js)
- File: Fusion.Widget.ColorPicker (C:\Workspace\fusion-trunk\build\widgets\ColorPicker.js)
- File: Fusion.Widget.CursorPosition (C:\Workspace\fusion-trunk\build\widgets\CursorPosition.js)
- File: Fusion.Widget.EditableScale (C:\Workspace\fusion-trunk\build\widgets\EditableScale.js)
- File: Fusion.Widget.ExtentHistory (C:\Workspace\fusion-trunk\build\widgets\ExtentHistory.js)
- File: Fusion.Widget.FeatureInfo (C:\Workspace\fusion-trunk\build\widgets\FeatureInfo.js)
- File: Fusion.Widget.GetFeatureInfo (C:\Workspace\fusion-trunk\build\widgets\GetFeatureInfo.js)
- File: Fusion.Widget.GoogleStreetViewer (C:\Workspace\fusion-trunk\build\widgets\GoogleStreetViewer.js)
- File: Fusion.Widget.Help (C:\Workspace\fusion-trunk\build\widgets\Help.js)
- File: Fusion.Widget.InitialMapView (C:\Workspace\fusion-trunk\build\widgets\InitialMapView.js)
- File: Fusion.Widget.InvokeScript (C:\Workspace\fusion-trunk\build\widgets\InvokeScript.js)
- File: Fusion.Widget.InvokeURL (C:\Workspace\fusion-trunk\build\widgets\InvokeURL.js)
- File: Fusion.Widget.LayerManager (C:\Workspace\fusion-trunk\build\widgets\LayerManager.js)
- File: Fusion.Widget.Legend (C:\Workspace\fusion-trunk\build\widgets\Legend.js)
- File: Fusion.Widget.LinkToView (C:\Workspace\fusion-trunk\build\widgets\LinkToView.js)
- File: Fusion.Widget.MapMenu (C:\Workspace\fusion-trunk\build\widgets\MapMenu.js)
- File: Fusion.Widget.MapMetadata (C:\Workspace\fusion-trunk\build\widgets\MapMetadata.js)
- File: Fusion.Widget.Maptip (C:\Workspace\fusion-trunk\build\widgets\Maptip.js)
- File: Fusion.Widget.Measure (C:\Workspace\fusion-trunk\build\widgets\Measure.js)
- File: Fusion.Widget.Navigator (C:\Workspace\fusion-trunk\build\widgets\Navigator.js)
- File: Fusion.Widget.OverviewMap (C:\Workspace\fusion-trunk\build\widgets\OverviewMap.js)
- File: Fusion.Widget.Pan (C:\Workspace\fusion-trunk\build\widgets\Pan.js)
- File: Fusion.Widget.PanOnClick (C:\Workspace\fusion-trunk\build\widgets\PanOnClick.js)
- File: Fusion.Widget.PanQuery (C:\Workspace\fusion-trunk\build\widgets\PanQuery.js)
- File: Fusion.Widget.Print (C:\Workspace\fusion-trunk\build\widgets\Print.js)
- File: Fusion.Widget.Query (C:\Workspace\fusion-trunk\build\widgets\Query.js)
- File: Fusion.Widget.QuickPlot (C:\Workspace\fusion-trunk\build\widgets\QuickPlot.js)
- File: Fusion.Widget.Redline (C:\Workspace\fusion-trunk\build\widgets\Redline.js)
- File: Fusion.Widget.RefreshMap (C:\Workspace\fusion-trunk\build\widgets\RefreshMap.js)
- File: Fusion.Widget.SaveMap (C:\Workspace\fusion-trunk\build\widgets\SaveMap.js)
- File: Fusion.Widget.SaveMapImage (C:\Workspace\fusion-trunk\build\widgets\SaveMapImage.js)
- File: Fusion.Widget.SaveSession (C:\Workspace\fusion-trunk\build\widgets\SaveSession.js)
- File: Fusion.Widget.Scalebar (C:\Workspace\fusion-trunk\build\widgets\Scalebar.js)
- File: Fusion.Widget.ScalebarDual (C:\Workspace\fusion-trunk\build\widgets\ScalebarDual.js)
- File: Fusion.Widget.Search (C:\Workspace\fusion-trunk\build\widgets\Search.js)
- File: Fusion.Widget.Select (C:\Workspace\fusion-trunk\build\widgets\Select.js)
- File: Fusion.Widget.SelectionInfo (C:\Workspace\fusion-trunk\build\widgets\SelectionInfo.js)
- File: Fusion.Widget.SelectionPanel (C:\Workspace\fusion-trunk\build\widgets\SelectionPanel.js)
- File: Fusion.Widget.SelectPolygon (C:\Workspace\fusion-trunk\build\widgets\SelectPolygon.js)
- File: Fusion.Widget.SelectRadius (C:\Workspace\fusion-trunk\build\widgets\SelectRadius.js)
- File: Fusion.Widget.SelectRadius (C:\Workspace\fusion-trunk\build\widgets\SelectAttribute.js)
- File: Fusion.Widget.SelectRadiusValue (C:\Workspace\fusion-trunk\build\widgets\SelectRadiusValue.js)
- File: Fusion.Widget.SelectWithin (C:\Workspace\fusion-trunk\build\widgets\SelectWithin.js)
- File: Fusion.Widget.TaskPane (C:\Workspace\fusion-trunk\build\widgets\TaskPane.js)
- File: Fusion.Widget.Theme (C:\Workspace\fusion-trunk\build\widgets\Theme.js)
- File: Fusion.Widget.ViewOptions (C:\Workspace\fusion-trunk\build\widgets\ViewOptions.js)
- File: Fusion.Widget.ViewSize (C:\Workspace\fusion-trunk\build\widgets\ViewSize.js)
- File: Fusion.Widget.Zoom (C:\Workspace\fusion-trunk\build\widgets\Zoom.js)
- File: Fusion.Widget.ZoomOnClick (C:\Workspace\fusion-trunk\build\widgets\ZoomOnClick.js)
- File: Fusion.Widget.ZoomToSelection (C:\Workspace\fusion-trunk\build\widgets\ZoomToSelection.js)
- File: OpenLayers.Control.MapCapturer (C:\Workspace\fusion-trunk\build\widgets\QuickPlot\MapCapturer.js)
+ File: Fusion.Widget.About (%WORKING_COPY%\build\widgets\About.js)
+ File: Fusion.Widget.ActivityIndicator (%WORKING_COPY%\build\widgets\ActivityIndicator.js)
+ File: Fusion.Widget.AddWMSLayer (%WORKING_COPY%\build\widgets\AddWMSLayer.js)
+ File: Fusion.Widget.BasemapSwitcher (%WORKING_COPY%\build\widgets\BasemapSwitcher.js)
+ File: Fusion.Widget.Buffer (%WORKING_COPY%\build\widgets\Buffer.js)
+ File: Fusion.Widget.BufferPanel (%WORKING_COPY%\build\widgets\BufferPanel.js)
+ File: Fusion.Widget.CenterSelection (%WORKING_COPY%\build\widgets\CenterSelection.js)
+ File: Fusion.Widget.ClearSelection (%WORKING_COPY%\build\widgets\ClearSelection.js)
+ File: Fusion.Widget.ColorPicker (%WORKING_COPY%\build\widgets\ColorPicker.js)
+ File: Fusion.Widget.CursorPosition (%WORKING_COPY%\build\widgets\CursorPosition.js)
+ File: Fusion.Widget.EditableScale (%WORKING_COPY%\build\widgets\EditableScale.js)
+ File: Fusion.Widget.ExtentHistory (%WORKING_COPY%\build\widgets\ExtentHistory.js)
+ File: Fusion.Widget.FeatureInfo (%WORKING_COPY%\build\widgets\FeatureInfo.js)
+ File: Fusion.Widget.GetFeatureInfo (%WORKING_COPY%\build\widgets\GetFeatureInfo.js)
+ File: Fusion.Widget.GoogleStreetViewer (%WORKING_COPY%\build\widgets\GoogleStreetViewer.js)
+ File: Fusion.Widget.Help (%WORKING_COPY%\build\widgets\Help.js)
+ File: Fusion.Widget.InitialMapView (%WORKING_COPY%\build\widgets\InitialMapView.js)
+ File: Fusion.Widget.InvokeScript (%WORKING_COPY%\build\widgets\InvokeScript.js)
+ File: Fusion.Widget.InvokeURL (%WORKING_COPY%\build\widgets\InvokeURL.js)
+ File: Fusion.Widget.LayerManager (%WORKING_COPY%\build\widgets\LayerManager.js)
+ File: Fusion.Widget.Legend (%WORKING_COPY%\build\widgets\Legend.js)
+ File: Fusion.Widget.LinkToView (%WORKING_COPY%\build\widgets\LinkToView.js)
+ File: Fusion.Widget.MapMenu (%WORKING_COPY%\build\widgets\MapMenu.js)
+ File: Fusion.Widget.MapMetadata (%WORKING_COPY%\build\widgets\MapMetadata.js)
+ File: Fusion.Widget.Maptip (%WORKING_COPY%\build\widgets\Maptip.js)
+ File: Fusion.Widget.Measure (%WORKING_COPY%\build\widgets\Measure.js)
+ File: Fusion.Widget.Navigator (%WORKING_COPY%\build\widgets\Navigator.js)
+ File: Fusion.Widget.OverviewMap (%WORKING_COPY%\build\widgets\OverviewMap.js)
+ File: Fusion.Widget.Pan (%WORKING_COPY%\build\widgets\Pan.js)
+ File: Fusion.Widget.PanOnClick (%WORKING_COPY%\build\widgets\PanOnClick.js)
+ File: Fusion.Widget.PanQuery (%WORKING_COPY%\build\widgets\PanQuery.js)
+ File: Fusion.Widget.Print (%WORKING_COPY%\build\widgets\Print.js)
+ File: Fusion.Widget.Query (%WORKING_COPY%\build\widgets\Query.js)
+ File: Fusion.Widget.QuickPlot (%WORKING_COPY%\build\widgets\QuickPlot.js)
+ File: Fusion.Widget.Redline (%WORKING_COPY%\build\widgets\Redline.js)
+ File: Fusion.Widget.RefreshMap (%WORKING_COPY%\build\widgets\RefreshMap.js)
+ File: Fusion.Widget.SaveMap (%WORKING_COPY%\build\widgets\SaveMap.js)
+ File: Fusion.Widget.SaveMapImage (%WORKING_COPY%\build\widgets\SaveMapImage.js)
+ File: Fusion.Widget.SaveSession (%WORKING_COPY%\build\widgets\SaveSession.js)
+ File: Fusion.Widget.Scalebar (%WORKING_COPY%\build\widgets\Scalebar.js)
+ File: Fusion.Widget.ScalebarDual (%WORKING_COPY%\build\widgets\ScalebarDual.js)
+ File: Fusion.Widget.Search (%WORKING_COPY%\build\widgets\Search.js)
+ File: Fusion.Widget.Select (%WORKING_COPY%\build\widgets\Select.js)
+ File: Fusion.Widget.SelectionInfo (%WORKING_COPY%\build\widgets\SelectionInfo.js)
+ File: Fusion.Widget.SelectionPanel (%WORKING_COPY%\build\widgets\SelectionPanel.js)
+ File: Fusion.Widget.SelectPolygon (%WORKING_COPY%\build\widgets\SelectPolygon.js)
+ File: Fusion.Widget.SelectRadius (%WORKING_COPY%\build\widgets\SelectAttribute.js)
+ File: Fusion.Widget.SelectRadius (%WORKING_COPY%\build\widgets\SelectRadius.js)
+ File: Fusion.Widget.SelectRadiusValue (%WORKING_COPY%\build\widgets\SelectRadiusValue.js)
+ File: Fusion.Widget.SelectWithin (%WORKING_COPY%\build\widgets\SelectWithin.js)
+ File: Fusion.Widget.TaskPane (%WORKING_COPY%\build\widgets\TaskPane.js)
+ File: Fusion.Widget.Theme (%WORKING_COPY%\build\widgets\Theme.js)
+ File: Fusion.Widget.ViewOptions (%WORKING_COPY%\build\widgets\ViewOptions.js)
+ File: Fusion.Widget.ViewSize (%WORKING_COPY%\build\widgets\ViewSize.js)
+ File: Fusion.Widget.Zoom (%WORKING_COPY%\build\widgets\Zoom.js)
+ File: Fusion.Widget.ZoomOnClick (%WORKING_COPY%\build\widgets\ZoomOnClick.js)
+ File: Fusion.Widget.ZoomToSelection (%WORKING_COPY%\build\widgets\ZoomToSelection.js)
+ File: OpenLayers.Control.MapCapturer (%WORKING_COPY%\build\widgets\QuickPlot\MapCapturer.js)
} # Group: Widgets
Group: Index {
@@ -148,5 +148,5 @@
##### Do not change or remove these lines. #####
-Data: 1(D3330wb_uHA6Ip9GbcN68u\ztHN\AbYN8ofbo8Y)
-Data: 1(h3330wb_uHA6Ip9GbcN68u\ztHN\AbYN8ofb78f`Gt6)
+Data: 1(D3330wbgHu`HpEXm8oG6bFrWGubPpIWN8fGb_GYb777bcN68u\ztHN\AbYN8ofbo8Y)
+Data: 1(h3330wbgHu`HpEXm8oG6bFrWGubPpIWN8fGb_GYb777bcN68u\ztHN\AbYN8ofb78f`Gt6)
More information about the fusion-commits
mailing list