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

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-12-07 04:18:11 -0800 (Wed, 07 Dec 2011)
New Revision: 49605

Modified:
   grass-addons/tools/wingrass-packager/grass_addons.sh
   grass-addons/tools/wingrass-packager/grass_packager.bat
Log:
wingrass-addons: provide pre-build addons also for G64

Modified: grass-addons/tools/wingrass-packager/grass_addons.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_addons.sh	2011-12-07 12:06:04 UTC (rev 49604)
+++ grass-addons/tools/wingrass-packager/grass_addons.sh	2011-12-07 12:18:11 UTC (rev 49605)
@@ -20,6 +20,10 @@
 	    continue
 	fi
 	cd $mod
+	if [ -f bin/${mod}.bat ] ; then
+	    sed "s/GISBASE/GRASS_ADDON_PATH/" bin/${mod}.bat > tmp
+	    mv tmp bin/${mod}.bat
+	fi
 	zip -r $mod.zip *
 	mv $mod.zip ..
 	cd ..
@@ -31,8 +35,8 @@
 export PATH=$PATH:/c/OSGeo4W/apps/msys/bin:/c/OSGeo4W/bin
 export PYTHONHOME=/c/OSGeo4W/apps/Python25
 
-compile $SVN_PATH/grass6 $GISBASE_PREFIX/grass6_devel $ADDON_PREFIX/grass65/addons
+compile $SVN_PATH/grass6 $GISBASE_PREFIX/grass64_release $ADDON_PREFIX/grass64/addons
+compile $SVN_PATH/grass6 $GISBASE_PREFIX/grass6_devel    $ADDON_PREFIX/grass65/addons
+compile $SVN_PATH/grass7 $GISBASE_PREFIX/grass_trunk     $ADDON_PREFIX/grass70/addons
 
-compile $SVN_PATH/grass7 $GISBASE_PREFIX/grass_trunk  $ADDON_PREFIX/grass70/addons
-
 exit 0

Modified: grass-addons/tools/wingrass-packager/grass_packager.bat
===================================================================
--- grass-addons/tools/wingrass-packager/grass_packager.bat	2011-12-07 12:06:04 UTC (rev 49604)
+++ grass-addons/tools/wingrass-packager/grass_packager.bat	2011-12-07 12:18:11 UTC (rev 49605)
@@ -52,6 +52,8 @@
 pscp.exe -i    .\ssh\id_dsa.ppk .\grass70\WinGRASS*.exe* landa at geo102:/work/wingrass/grass70
 pscp.exe -i    .\ssh\id_dsa.ppk .\grass70\grass*.tar.bz2 landa at geo102:/work/wingrass/grass70/osgeo4w
 
+pscp.exe -r -i .\ssh\id_dsa.ppk .\grass64\addons\*.zip .\grass64\addons\*.md5sum landa at geo102:/work/wingrass/grass65/addons
+pscp.exe -r -i .\ssh\id_dsa.ppk .\grass64\addons\log                             landa at geo102:/work/wingrass/grass65/addons
 pscp.exe -r -i .\ssh\id_dsa.ppk .\grass65\addons\*.zip .\grass65\addons\*.md5sum landa at geo102:/work/wingrass/grass65/addons
 pscp.exe -r -i .\ssh\id_dsa.ppk .\grass65\addons\log                             landa at geo102:/work/wingrass/grass65/addons
 pscp.exe -r -i .\ssh\id_dsa.ppk .\grass70\addons\*.zip .\grass70\addons\*.md5sum landa at geo102:/work/wingrass/grass70/addons