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

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-10-04 08:43:34 -0700 (Tue, 04 Oct 2011)
New Revision: 48617

Added:
   grass-addons/tools/wingrass-packager/grass_osgeo4w.sh
Modified:
   grass-addons/tools/wingrass-packager/grass_compile.sh
   grass-addons/tools/wingrass-packager/grass_packager.bat
Log:
winGRASS update support scripts for daily builds

Modified: grass-addons/tools/wingrass-packager/grass_compile.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_compile.sh	2011-10-04 13:36:04 UTC (rev 48616)
+++ grass-addons/tools/wingrass-packager/grass_compile.sh	2011-10-04 15:43:34 UTC (rev 48617)
@@ -2,7 +2,7 @@
 # Compile GRASS 6.4, 6.5 and 7.0 (update source code from SVN repository)
 
 SRC=/osgeo4w/usr/src
-PACKAGEDIR="mswindows/osgeo4w/package"
+PACKAGEDIR=mswindows/osgeo4w/package
 
 function update {
     echo "Updating $1..."     
@@ -16,12 +16,6 @@
     done
 }
 
-function rsync_package {
-    dst="/c/Users/landa/grass_packager/grass$1"
-    rm -rf $dst/package
-    cp -r $PACKAGEDIR $dst
-}
-
 function compile {
     cd $SRC/$1
     rm_package_7 
@@ -35,7 +29,6 @@
     rm -f mswindows/osgeo4w/configure-stamp
     svn up || (svn cleanup && svn up)
     ./mswindows/osgeo4w/package.sh $package
-    rsync_package $2
 }
 
 export PATH=$PATH:/c/OSGeo4W/apps/msys/bin

Added: grass-addons/tools/wingrass-packager/grass_osgeo4w.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_osgeo4w.sh	                        (rev 0)
+++ grass-addons/tools/wingrass-packager/grass_osgeo4w.sh	2011-10-04 15:43:34 UTC (rev 48617)
@@ -0,0 +1,24 @@
+#!/bin/sh
+# Copy GRASS OSGeo4W package
+
+HOME=/c/Users/landa/grass_packager
+
+function rsync_package {
+    dir=$HOME/grass$1/osgeo4w/package
+    curr=`ls -t $dir/ 2>/dev/null | head -n1 | cut -d'-' -f3 | cut -d'.' -f1`
+    if [ $? -eq 0 ]; then
+	package=$curr
+    else
+	package=1
+    fi
+
+    cp $dir/grass*-$package-*.tar.bz2 $HOME/grass$1
+}
+
+export PATH=$PATH:/c/OSGeo4W/apps/msys/bin
+
+rsync_package 64
+rsync_package 65
+rsync_package 70
+
+exit 0

Modified: grass-addons/tools/wingrass-packager/grass_packager.bat
===================================================================
--- grass-addons/tools/wingrass-packager/grass_packager.bat	2011-10-04 13:36:04 UTC (rev 48616)
+++ grass-addons/tools/wingrass-packager/grass_packager.bat	2011-10-04 15:43:34 UTC (rev 48617)
@@ -34,6 +34,7 @@
 copy .\msys.bat .\grass65\GRASS-65-Dev-Package\msys\
 copy .\msys.bat .\grass70\GRASS-70-Dev-Package\msys\
 
+C:\OSGeo4W\apps\msys\bin\sh.exe .\grass_osgeo4w.sh
 C:\OSGeo4W\apps\msys\bin\sh.exe .\grass_svn_info.sh
 
 C:\DevTools\makensis.exe .\grass64\GRASS-Installer.nsi
@@ -43,8 +44,8 @@
 C:\OSGeo4W\apps\msys\bin\sh.exe .\grass_md5sum.sh
 
 pscp.exe -i .\ssh\id_dsa.ppk .\grass64\WinGRASS*.exe* landa at geo102:/work/wingrass/grass64
-pscp.exe -i .\ssh\id_dsa.ppk .\grass64\osgeo4w\package\grass*.tar.bz2 landa at geo102:/work/wingrass/grass64/osgeo4w
+pscp.exe -i .\ssh\id_dsa.ppk .\grass64\grass*.tar.bz2 landa at geo102:/work/wingrass/grass64/osgeo4w
 pscp.exe -i .\ssh\id_dsa.ppk .\grass65\WinGRASS*.exe* landa at geo102:/work/wingrass/grass65
-pscp.exe -i .\ssh\id_dsa.ppk .\grass65\osgeo4w\package\grass*.tar.bz2 landa at geo102:/work/wingrass/grass65/osgeo4w
+pscp.exe -i .\ssh\id_dsa.ppk .\grass65\grass*.tar.bz2 landa at geo102:/work/wingrass/grass65/osgeo4w
 pscp.exe -i .\ssh\id_dsa.ppk .\grass70\WinGRASS*.exe* landa at geo102:/work/wingrass/grass70
-pscp.exe -i .\ssh\id_dsa.ppk .\grass70\osgeo4w\package\grass*.tar.bz2 landa at geo102:/work/wingrass/grass70/osgeo4w
+pscp.exe -i .\ssh\id_dsa.ppk .\grass70\grass*.tar.bz2 landa at geo102:/work/wingrass/grass70/osgeo4w