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

[svn_grass at osgeo.org]

Author: martinl
Date: 2016-02-10 08:48:32 -0800 (Wed, 10 Feb 2016)
New Revision: 67803

Modified:
   grass-addons/tools/wingrass-packager/grass_compile.sh
   grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh
   grass-addons/tools/wingrass-packager/grass_packager_release.bat
Log:
wingrass: fix addons 70 daily builds

Modified: grass-addons/tools/wingrass-packager/grass_compile.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_compile.sh	2016-02-10 15:32:31 UTC (rev 67802)
+++ grass-addons/tools/wingrass-packager/grass_compile.sh	2016-02-10 16:48:32 UTC (rev 67803)
@@ -29,7 +29,7 @@
     cd /c/msys${PLATFORM}/$SRC_DIR/$GRASS_DIR
     svn up || (svn cleanup && svn up)
 
-    rm d*.o # remove obj dumps
+    rm -f d*.o # remove obj dumps
     rm_package_7
     curr=`ls -t $PACKAGEDIR/ 2>/dev/null | head -n1 | cut -d'-' -f5 | cut -d'.' -f1`
     if [ $? -eq 0 ]; then

Modified: grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh	2016-02-10 15:32:31 UTC (rev 67802)
+++ grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh	2016-02-10 16:48:32 UTC (rev 67803)
@@ -78,7 +78,7 @@
     # daily builds
     ### copy 64 6.4.5svn
     ### copy 65
-    copy        70       7.0.3svn
+    copy        70       `ls ${HOME}/grass70/x86/grass*.bz2 | cut -d'-' -f 3`
     copy        71       7.1.svn
     # releases (TODO: enable later)
     #copy_addon 644      6.4.4

Modified: grass-addons/tools/wingrass-packager/grass_packager_release.bat
===================================================================
--- grass-addons/tools/wingrass-packager/grass_packager_release.bat	2016-02-10 15:32:31 UTC (rev 67802)
+++ grass-addons/tools/wingrass-packager/grass_packager_release.bat	2016-02-10 16:48:32 UTC (rev 67803)
@@ -14,7 +14,7 @@
 set MAJOR=7
 set MINOR=0
 set PATCH=3
-set REV=1
+set REV=2
 
 set GVERSION=%MAJOR%%MINOR%%PATCH%