[Commits] r1158 - in core/trunk/geoext: build lib/GeoExt/data lib/GeoExt/widgets

[commits at geoext.org]

Author: fredj
Date: 2009-06-26 08:59:34 +0200 (Fri, 26 Jun 2009)
New Revision: 1158

Modified:
   core/trunk/geoext/build/Makefile
   core/trunk/geoext/build/readme.txt
   core/trunk/geoext/lib/GeoExt/data/LayerReader.js
   core/trunk/geoext/lib/GeoExt/widgets/LegendImage.js
   core/trunk/geoext/lib/GeoExt/widgets/LegendPanel.js
Log:
fix some minor docstring and add a GeoExt.VERSION_NUMBER in the builded version. r=ahocevar (pullup #103)

Modified: core/trunk/geoext/build/Makefile
===================================================================
--- core/trunk/geoext/build/Makefile	2009-06-25 19:09:15 UTC (rev 1157)
+++ core/trunk/geoext/build/Makefile	2009-06-26 06:59:34 UTC (rev 1158)
@@ -1,7 +1,8 @@
-# Makefile for GeoExplorer apps
+# Makefile for GeoExt
 
+VERSION = r$(shell echo '$$Revision$$' | tr -d "[:alpha:]$$ :")
 LIB_NAME = GeoExt
-ZIP_NAME = $(LIB_NAME).zip
+ZIP_NAME = $(LIB_NAME)-$(VERSION).zip
 
 CSS_DIR = $(LIB_NAME)/resources/css
 CSS_IMPORTS = $(shell cat ../resources/css/geoext-all-debug.css | grep '@import' | sed 's/^@import "\(.*\)";/\1/')
@@ -23,6 +24,7 @@
 	@echo "  make lib LIB_NAME=MyLib"
 	@echo "  make zip"
 	@echo "  make zip ZIP_NAME=MyZip.zip"
+	@echo "  make dist VERSION=0.5-rc1"
 
 clean:
 	-rm -rf $(LIB_NAME)
@@ -35,7 +37,7 @@
 
 examples:
 	mkdir -p $(LIB_NAME)/examples 
-	svn export --force ../examples $(LIB_NAME)/examples
+	rsync -au --exclude=.svn `pwd`/../examples `pwd`/$(LIB_NAME)
 	for file in `find $(LIB_NAME)/examples/ -name "*.html"`; do \
 	    sed -i "s/\.\.\/lib\/GeoExt\.js/\.\.\/script\/GeoExt\.js/g" $${file} ; \
 	    sed -i "s/geoext-all-debug\.css/geoext-all\.css/g" $${file} ; \
@@ -46,8 +48,9 @@
 	mkdir -p $(LIB_NAME)/script $(LIB_NAME)/resources/css
 	
 	jsbuild full.cfg -v -o $(LIB_NAME)/script/ -s GeoExt.js
+	echo "GeoExt.VERSION_NUMBER='$(VERSION)';" >> $(LIB_NAME)/script/GeoExt.js 
 	
-	svn export --force ../resources $(LIB_NAME)/resources
+	rsync -au --exclude=.svn `pwd`/../resources `pwd`/$(LIB_NAME)
 	
 	for file in `find $(CSS_DIR) -name "*.css"`; do \
 	    csstidy $${file} --template=highest $${file} ; \
@@ -65,4 +68,4 @@
 	-rm -f $(ZIP_NAME)
 	zip $(ZIP_NAME) -r $(LIB_NAME)
 
-dist: examples zip
\ No newline at end of file
+dist: examples zip


Property changes on: core/trunk/geoext/build/Makefile
___________________________________________________________________
Name: svn:keywords
   + Revision

Modified: core/trunk/geoext/build/readme.txt
===================================================================
--- core/trunk/geoext/build/readme.txt	2009-06-25 19:09:15 UTC (rev 1157)
+++ core/trunk/geoext/build/readme.txt	2009-06-26 06:59:34 UTC (rev 1158)
@@ -9,7 +9,7 @@
 ------------------
 
 This build dir contains a Makefile, which can be used to build GeoExt. The
-build process requires a bash-like shell, make, sed, find and svn. All this
+build process requires a bash-like shell, make, sed, find and rsync. All this
 should be available on well equipped development *nix and OS X boxes. In
 addition, JSTools and csstidy are required. The latter is available as csstidy
 package on debian-style linux systems.
@@ -52,4 +52,4 @@
     
 The Makefile has even more targets. Invoke make help to see them all.
 
-    $ make help
\ No newline at end of file
+    $ make help

Modified: core/trunk/geoext/lib/GeoExt/data/LayerReader.js
===================================================================
--- core/trunk/geoext/lib/GeoExt/data/LayerReader.js	2009-06-25 19:09:15 UTC (rev 1157)
+++ core/trunk/geoext/lib/GeoExt/data/LayerReader.js	2009-06-26 06:59:34 UTC (rev 1158)
@@ -59,7 +59,7 @@
      *  :return: ``Object``  An object with ``records`` and ``totalRecords``
      *      properties.
      *  
-     *  From an array of {OpenLayers.Layer} objects create a data block
+     *  From an array of ``OpenLayers.Layer`` objects create a data block
      *  containing :class:`GeoExt.data.LayerRecord` objects.
      */
     readRecords : function(layers) {

Modified: core/trunk/geoext/lib/GeoExt/widgets/LegendImage.js
===================================================================
--- core/trunk/geoext/lib/GeoExt/widgets/LegendImage.js	2009-06-25 19:09:15 UTC (rev 1157)
+++ core/trunk/geoext/lib/GeoExt/widgets/LegendImage.js	2009-06-26 06:59:34 UTC (rev 1158)
@@ -99,5 +99,5 @@
 
 });
 
-
+/** api: xtype = gx_legendimage */
 Ext.reg('gx_legendimage', GeoExt.LegendImage);

Modified: core/trunk/geoext/lib/GeoExt/widgets/LegendPanel.js
===================================================================
--- core/trunk/geoext/lib/GeoExt/widgets/LegendPanel.js	2009-06-25 19:09:15 UTC (rev 1157)
+++ core/trunk/geoext/lib/GeoExt/widgets/LegendPanel.js	2009-06-26 06:59:34 UTC (rev 1158)
@@ -286,4 +286,5 @@
     
 });
 
+/** api: xtype = gx_legendpanel */
 Ext.reg('gx_legendpanel', GeoExt.LegendPanel);