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

[svn_grass at osgeo.org]

Author: martinl
Date: 2013-07-29 11:25:29 -0700 (Mon, 29 Jul 2013)
New Revision: 57324

Modified:
   grass-addons/tools/wingrass-packager/grass_packager_release.bat
   grass-addons/tools/wingrass-packager/osgeo4w_upgrade.bat
Log:
wingrass: update support scripts (new environments)

Modified: grass-addons/tools/wingrass-packager/grass_packager_release.bat
===================================================================
--- grass-addons/tools/wingrass-packager/grass_packager_release.bat	2013-07-29 15:55:22 UTC (rev 57323)
+++ grass-addons/tools/wingrass-packager/grass_packager_release.bat	2013-07-29 18:25:29 UTC (rev 57324)
@@ -33,6 +33,3 @@
 
 C:\OSGeo4W\apps\msys\bin\sh.exe .\grass_md5sum.sh %MAJOR%%MINOR%%PATCH%
 
-C:\OSGeo4W\apps\msys\bin\sh.exe .\grass_addons.sh %MAJOR%%MINOR%%PATCH%
-
-C:\OSGeo4W\apps\msys\bin\sh.exe .\grass_copy_wwwroot.sh %MAJOR%%MINOR%%PATCH% %MAJOR%.%MINOR%.%PATCH% 

Modified: grass-addons/tools/wingrass-packager/osgeo4w_upgrade.bat
===================================================================
--- grass-addons/tools/wingrass-packager/osgeo4w_upgrade.bat	2013-07-29 15:55:22 UTC (rev 57323)
+++ grass-addons/tools/wingrass-packager/osgeo4w_upgrade.bat	2013-07-29 18:25:29 UTC (rev 57324)
@@ -1,11 +1,12 @@
 @echo off
 
 rem Upgrade OSGeo4W installations
+rem Requires 'apt' package to be installed
 
 set PATH_ORIG=%PATH%
 
 rem
-rem OSGeo4W (building environment)
+rem OSGeo4W (building environment GRASS 6 & 7)
 rem
 set PATH=C:\OSGeo4W\bin;%PATH_ORIG%
 call o4w_env.bat
@@ -14,7 +15,7 @@
 apt upgrade
 
 rem
-rem OSGeo4W (dev)
+rem OSGeo4W (testing environment for daily builds)
 rem
 
 set PATH=C:\OSGeo4W_dev\bin;%PATH_ORIG%
@@ -22,3 +23,23 @@
 
 apt update
 apt upgrade
+
+rem
+rem OSGeo4W (GRASS 6 packaging)
+rem
+
+set PATH=C:\OSGeo4W_grass6\bin;%PATH_ORIG%
+call o4w_env.bat
+
+apt update
+apt upgrade
+
+rem
+rem OSGeo4W (GRASS 7 packaging)
+rem
+
+set PATH=C:\OSGeo4W_grass7\bin;%PATH_ORIG%
+call o4w_env.bat
+
+apt update
+apt upgrade