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

[svn_grass at osgeo.org]

Author: martinl
Date: 2013-01-07 23:18:36 -0800 (Mon, 07 Jan 2013)
New Revision: 54564

Modified:
   grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh
   grass-addons/tools/wingrass-packager/grass_packager_release.bat
   grass-addons/tools/wingrass-packager/grass_svn_info.sh
Log:
update wingrass packaging scripts

Modified: grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh	2013-01-07 21:03:16 UTC (rev 54563)
+++ grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh	2013-01-08 07:18:36 UTC (rev 54564)
@@ -33,8 +33,13 @@
 
 export PATH=$PATH:/c/OSGeo4W/apps/msys/bin
 
-copy 64 6.4.3svn
-copy 65
-copy 70
+if test -z $1 ; then
+    # dev packages
+    copy 64 6.4.3svn
+    copy 65
+    copy 70
+else
+    copy $1 $2
+fi
 
 exit 0

Modified: grass-addons/tools/wingrass-packager/grass_packager_release.bat
===================================================================
--- grass-addons/tools/wingrass-packager/grass_packager_release.bat	2013-01-07 21:03:16 UTC (rev 54563)
+++ grass-addons/tools/wingrass-packager/grass_packager_release.bat	2013-01-08 07:18:36 UTC (rev 54564)
@@ -9,7 +9,7 @@
 
 set MAJOR=6
 set MINOR=4
-set PATCH=3RC1
+set PATCH=3RC2
 set REV=1
 
 rem Compile GRASS versions
@@ -17,6 +17,8 @@
 rem native & osgeo4w
 C:\OSGeo4W\apps\msys\bin\bash.exe C:\Users\landa\grass_packager\grass_compile.sh %MAJOR%%MINOR%%PATCH%
 
+pause 
+
 rem Preparation
 if exist .\grass%MAJOR%%MINOR%%PATCH% rmdir /S/Q .\grass%MAJOR%%MINOR%%PATCH%
 xcopy C:\OSGeo4W\usr\src\grass%MAJOR%%MINOR%%PATCH%\mswindows\* .\grass%MAJOR%%MINOR%%PATCH% /S/V/F/I
@@ -34,6 +36,8 @@
 
 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% 
+
 rem pscp.exe -r -i .\ssh\id_dsa.ppk .\grass%MAJOR%%MINOR%%PATCH%\addons\*.zip    landa at geo102:/work/wingrass/grass%MAJOR%%MINOR%/addons/grass-%MAJOR%.%MINOR%.%PATCH%
 rem pscp.exe -r -i .\ssh\id_dsa.ppk .\grass%MAJOR%%MINOR%%PATCH%\addons\*.md5sum landa at geo102:/work/wingrass/grass%MAJOR%%MINOR%/addons/grass-%MAJOR%.%MINOR%.%PATCH%
 rem pscp.exe -r -i .\ssh\id_dsa.ppk .\grass%MAJOR%%MINOR%%PATCH%\addons\logs     landa at geo102:/work/wingrass/grass%MAJOR%%MINOR%/addons/grass-%MAJOR%.%MINOR%.%PATCH%

Modified: grass-addons/tools/wingrass-packager/grass_svn_info.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_svn_info.sh	2013-01-07 21:03:16 UTC (rev 54563)
+++ grass-addons/tools/wingrass-packager/grass_svn_info.sh	2013-01-08 07:18:36 UTC (rev 54564)
@@ -46,7 +46,7 @@
     LOG_DIR=log-r$3-$4
     mkdir -p $LOG_DIR
     cp osgeo4w/package.log $LOG_DIR/
-    cp $1/error.log $LOG_DIR/
+    cp error.log $LOG_DIR/
 }
 
 export PATH=$PATH:/c/OSGeo4W/apps/msys/bin