[GRASS-SVN] r49449 - grass-addons/tools/wingrass-packager

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-11-30 16:47:43 -0800 (Wed, 30 Nov 2011)
New Revision: 49449

Modified:
   grass-addons/tools/wingrass-packager/grass_addons.sh
Log:
wingrass packager support scripts - update grass_addons

Modified: grass-addons/tools/wingrass-packager/grass_addons.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_addons.sh	2011-11-30 23:58:22 UTC (rev 49448)
+++ grass-addons/tools/wingrass-packager/grass_addons.sh	2011-12-01 00:47:43 UTC (rev 49449)
@@ -6,15 +6,15 @@
 ADDON_PREFIX=/c/Users/landa/grass_packager
 
 cd $SVN_PATH
-svn up
-cp -r database display general gui imagery misc postscript raster \
+svn up || svn cleanup && svn up
+cp -rf database display general gui imagery misc postscript raster \
     vector grass6/
 
 function compile {
     path=`echo $PATH`
     export PATH=$PATH:/c/OSGeo4W/apps/msys/bin:$2/bin:$2/scripts
     rm -rf $3
-    ./tools/addons/compile.sh $1 $2 $3 1
+    $SVN_PATH/tools/addons/compile.sh $1 $2 $3 1
     cd $3
     for d in `ls -d */`; do
 	mod=${d%%/}
@@ -36,6 +36,7 @@
     $GISBASE_PREFIX/grass6_devel/dist.i686-pc-mingw32/lib/gis/OBJ.i686-pc-mingw32
 
 compile $SVN_PATH/grass6 $GISBASE_PREFIX/grass6_devel/dist.i686-pc-mingw32 $ADDON_PREFIX/grass65/addons
-compile $SVN_PATH/grass7 $GISBASE_PREFIX/grass_trunk/dist.i686-pc-mingw32 $ADDON_PREFIX/grass70/addons
 
+compile $SVN_PATH/grass7 $GISBASE_PREFIX/grass_trunk/dist.i686-pc-mingw32  $ADDON_PREFIX/grass70/addons
+
 exit 0