[Commits] r1169 - in apps/opengeo/geoexplorer/trunk: build src/script/app/GeoExplorer
commits at geoext.org
commits at geoext.org
Tue Jun 30 01:21:56 CEST 2009
Author: tschaub
Date: 2009-06-30 01:21:55 +0200 (Tue, 30 Jun 2009)
New Revision: 1169
Modified:
apps/opengeo/geoexplorer/trunk/build/build.xml
apps/opengeo/geoexplorer/trunk/build/geoexplorer-all.cfg
apps/opengeo/geoexplorer/trunk/src/script/app/GeoExplorer/CapabilitiesGrid.js
Log:
Update jsbuild config and complete dist build target.
Modified: apps/opengeo/geoexplorer/trunk/build/build.xml
===================================================================
--- apps/opengeo/geoexplorer/trunk/build/build.xml 2009-06-29 22:52:41 UTC (rev 1168)
+++ apps/opengeo/geoexplorer/trunk/build/build.xml 2009-06-29 23:21:55 UTC (rev 1169)
@@ -6,6 +6,7 @@
</description>
<property name="src" location="../src"/>
+ <property name="externals" location="../externals"/>
<property name="build" location="GeoExplorer"/>
<target name="init">
@@ -16,7 +17,7 @@
<target name="dev" depends="clean, init" description="set up development build">
<echo>Setting up development build.</echo>
- <filterset id="debug-replacements">
+ <filterset id="dev-replacements">
<filter token="title" value="GeoExplorer (debug)"/>
<!-- Ext Resources -->
<filter token="ext-all.js" value="ext-all-debug.js"/>
@@ -35,26 +36,78 @@
<filter token="ux.js" value="../../src/script/ux/RowExpander.js"/>
</filterset>
- <copy file="${src}/html/index.html" toFile="${build}/index.html">
- <filterset refid="debug-replacements"/>
+ <copy file="${src}/html/index.html" todir="${build}">
+ <filterset refid="dev-replacements"/>
</copy>
- <copy file="${src}/html/embed.html" toFile="${build}/embed.html">
- <filterset refid="debug-replacements"/>
+ <copy file="${src}/html/embed.html" todir="${build}">
+ <filterset refid="dev-replacements"/>
</copy>
- <copy file="${src}/html/about.html" toFile="${build}/about.html">
- <filterset refid="debug-replacements"/>
+ <copy file="${src}/html/about.html" todir="${build}">
+ <filterset refid="dev-replacements"/>
</copy>
</target>
+
+ <target name="jsbuild" depends="init" description="concatenate JavaScript source">
+ <echo>Concatenating JavaScript.</echo>
+ <mkdir dir="${build}/script"/>
+ <exec executable="jsbuild" failonerror="true">
+ <arg line="geoexplorer-all.cfg -v"/>
+ <arg value="-o"/>
+ <arg path="${build}/script"/>
+ </exec>
+ </target>
- <target name="dist" depends="clean, init" description="prepare app for distribution">
+ <target name="dist" depends="clean, init, jsbuild" description="prepare app for distribution">
<echo>Preparing for distribution.</echo>
- <copy file="${src}/html/index.html" toFile="${build}/index.html">
- <filterset>
- <filter token="body_content" value="Hello world!"/>
- </filterset>
+
+ <copy todir="${build}/theme/app">
+ <fileset dir="${src}/theme/app">
+ <!-- .svn excluded by default -->
+ </fileset>
</copy>
- <echo>Not yet implemented.</echo>
+
+ <copy todir="${build}/theme/ol">
+ <fileset dir="${externals}/openlayers/theme/default">
+ <!-- .svn excluded by default -->
+ </fileset>
+ </copy>
+
+ <copy todir="${build}/theme/gx">
+ <fileset dir="${externals}/geoext/resources">
+ <!-- .svn excluded by default -->
+ </fileset>
+ </copy>
+
+ <filterset id="dist-replacements">
+ <filter token="title" value="GeoExplorer"/>
+ <!-- Ext Resources -->
+ <filter token="ext-all.js" value="ext-all.js"/>
+ <!-- OpenLayers Resources -->
+ <filter token="ol-style.css" value="theme/ol/style.css"/>
+ <filter token="OpenLayers.js" value="script/OpenLayers.js"/>
+ <!-- GeoExt Resources -->
+ <filter token="geoext-all.css" value="theme/gx/css/geoext-all-debug.css"/>
+ <filter token="gxtheme-gray.css" value="theme/gx/css/gxtheme-gray.css"/>
+ <filter token="GeoExt.js" value="script/GeoExt.js"/>
+ <!-- GeoExplorer Resources -->
+ <filter token="geoexplorer.css" value="theme/app/geoexplorer.css"/>
+ <filter token="ie.css" value="theme/app/ie.css"/>
+ <filter token="about.css" value="theme/app/about.css"/>
+ <filter token="GeoExplorer.js" value="script/GeoExplorer.js"/>
+ <filter token="ux.js" value="script/ux.js"/>
+ </filterset>
+
+ <copy file="${src}/html/index.html" todir="${build}">
+ <filterset refid="dist-replacements"/>
+ </copy>
+ <copy file="${src}/html/embed.html" todir="${build}">
+ <filterset refid="dist-replacements"/>
+ </copy>
+ <copy file="${src}/html/about.html" todir="${build}">
+ <filterset refid="dist-replacements"/>
+ </copy>
+
</target>
<target name="zip" depends="dist" description="create zip archive of app">
Modified: apps/opengeo/geoexplorer/trunk/build/geoexplorer-all.cfg
===================================================================
--- apps/opengeo/geoexplorer/trunk/build/geoexplorer-all.cfg 2009-06-29 22:52:41 UTC (rev 1168)
+++ apps/opengeo/geoexplorer/trunk/build/geoexplorer-all.cfg 2009-06-29 23:21:55 UTC (rev 1169)
@@ -8,6 +8,7 @@
GeoExt/data/LayerRecord.js
include =
+ GeoExt/widgets/Action.js
GeoExt/widgets/MapPanel.js
GeoExt/widgets/ZoomSlider.js
GeoExt/widgets/tips/ZoomSliderTip.js
@@ -16,27 +17,14 @@
GeoExt/widgets/tree/OverlayLayerContainer.js
GeoExt/widgets/Popup.js
GeoExt/data/ScaleStore.js
-
-exclude =
- GeoExt.js
- GeoExt/SingleFile.js
-
-[GeoExt-LegendPanel.js]
-root = ../externals/geoext/lib
-license = geoext-license.js
-
-first =
GeoExt/widgets/LegendPanel.js
GeoExt/widgets/LegendImage.js
GeoExt/widgets/LegendWMS.js
-include =
-
exclude =
GeoExt.js
GeoExt/SingleFile.js
-
[OpenLayers.js]
root = ../externals/openlayers/lib
license = ../externals/openlayers/build/license.txt
@@ -82,7 +70,7 @@
[GeoExplorer.js]
-root = ../lib
+root = ../src/script/app
license = license.js
first =
@@ -90,3 +78,7 @@
GeoExplorer/Full.js
GeoExplorer/Embed.js
+[ux.js]
+root = ../src/script/ux
+license = ext-license.js
+
Modified: apps/opengeo/geoexplorer/trunk/src/script/app/GeoExplorer/CapabilitiesGrid.js
===================================================================
--- apps/opengeo/geoexplorer/trunk/src/script/app/GeoExplorer/CapabilitiesGrid.js 2009-06-29 22:52:41 UTC (rev 1168)
+++ apps/opengeo/geoexplorer/trunk/src/script/app/GeoExplorer/CapabilitiesGrid.js 2009-06-29 23:21:55 UTC (rev 1169)
@@ -3,10 +3,6 @@
*
*/
-/*
- * @requires Ext/grid/RowExpander.js
- */
-
/**
* api: (define)
* module = GeoExplorer
More information about the Commits
mailing list