[GRASS-SVN] r48794 - grass/branches/releasebranch_6_4/mswindows/osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-10-14 07:22:03 -0700 (Fri, 14 Oct 2011)
New Revision: 48794

Modified:
   grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh
Log:
winGRASS: update for daily builds
         (merge r48792 from devbr6)


Modified: grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh	2011-10-14 14:20:53 UTC (rev 48793)
+++ grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh	2011-10-14 14:22:03 UTC (rev 48794)
@@ -17,7 +17,10 @@
     fi 
 fi 
 
-export PACKAGE=${1:-1} 
+export PACKAGE=${1:-1}
+# package name for osgeo4w
+# eg. 64-dev -> grass64-dev, empty for release
+export PACKAGE_NAME=$2
 export OSGEO4W_ROOT_MSYS="/c/OSGeo4W"
 export OSGEO4W_ROOT="C:\\\OSGeo4W"
 export PATH=.:/c/mingw/bin:/usr/local/bin:/bin:$OSGEO4W_ROOT_MSYS/bin:/c/WINDOWS/system32:/c/WINDOWS:/c/WINDOWS/System32/Wbem:/c/Subversion:$PWD/mswindows/osgeo4w
@@ -62,7 +65,7 @@
 read MINOR <&3 
 read PATCH <&3 
 
-export VERSION=$MAJOR.$MINOR.$PATCH 
+export VERSION=$MAJOR.$MINOR.$PATCH
 
 export GRASS_PYTHON="/c/OSGeo4W/bin/python.exe"
 export PYTHONHOME="/c/OSGeo4W/apps/Python25"
@@ -172,7 +175,7 @@
 	$SRC/mswindows/osgeo4w/grass.tmpl >$OSGEO4W_ROOT_MSYS/bin/grass$MAJOR$MINOR.tmpl
 
     # grass package
-    tar -cjf $PDIR/grass-$VERSION-$PACKAGE.tar.bz2 \
+    tar -cjf $PDIR/grass$PACKAGE_NAME-$VERSION-$PACKAGE.tar.bz2 \
     apps/grass/grass-$VERSION \
     bin/grass$MAJOR$MINOR.bat.tmpl \
     bin/grass$MAJOR$MINOR.tmpl \