[GRASS-SVN] r52277 - grass-addons/tools/wingrass-packager
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Jul 2 03:27:19 PDT 2012
Author: martinl
Date: 2012-07-02 03:27:19 -0700 (Mon, 02 Jul 2012)
New Revision: 52277
Modified:
grass-addons/tools/wingrass-packager/grass_packager.bat
grass-addons/tools/wingrass-packager/grass_packager_release.bat
grass-addons/tools/wingrass-packager/grass_svn_info.sh
Log:
wingrass: release-related update
Modified: grass-addons/tools/wingrass-packager/grass_packager.bat
===================================================================
--- grass-addons/tools/wingrass-packager/grass_packager.bat 2012-07-01 17:09:55 UTC (rev 52276)
+++ grass-addons/tools/wingrass-packager/grass_packager.bat 2012-07-02 10:27:19 UTC (rev 52277)
@@ -38,21 +38,21 @@
C:\OSGeo4W\apps\msys\bin\sh.exe .\grass_addons.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\grass*.tar.bz2 landa at geo102:/work/wingrass/grass64/osgeo4w
-pscp.exe -r -i .\ssh\id_dsa.ppk .\grass64\log-r* landa at geo102:/work/wingrass/grass64/logs/
+# pscp.exe -i .\ssh\id_dsa.ppk .\grass64\WinGRASS*.exe* landa at geo102:/work/wingrass/grass64
+# pscp.exe -i .\ssh\id_dsa.ppk .\grass64\grass*.tar.bz2 landa at geo102:/work/wingrass/grass64/osgeo4w
+# pscp.exe -r -i .\ssh\id_dsa.ppk .\grass64\log-r* landa at geo102:/work/wingrass/grass64/logs/
-pscp.exe -i .\ssh\id_dsa.ppk .\grass65\WinGRASS*.exe* landa at geo102:/work/wingrass/grass65
-pscp.exe -i .\ssh\id_dsa.ppk .\grass65\grass*.tar.bz2 landa at geo102:/work/wingrass/grass65/osgeo4w
-pscp.exe -r -i .\ssh\id_dsa.ppk .\grass65\log-r* landa at geo102:/work/wingrass/grass65/logs
+# pscp.exe -i .\ssh\id_dsa.ppk .\grass65\WinGRASS*.exe* landa at geo102:/work/wingrass/grass65
+# pscp.exe -i .\ssh\id_dsa.ppk .\grass65\grass*.tar.bz2 landa at geo102:/work/wingrass/grass65/osgeo4w
+# pscp.exe -r -i .\ssh\id_dsa.ppk .\grass65\log-r* landa at geo102:/work/wingrass/grass65/logs
-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 .\grass70\log-r* landa at geo102:/work/wingrass/grass70/logs/
+# 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 .\grass70\log-r* landa at geo102:/work/wingrass/grass70/logs/
-pscp.exe -r -i .\ssh\id_dsa.ppk .\grass64\addons\*.zip .\grass64\addons\*.md5sum landa at geo102:/work/wingrass/grass64/addons/grass-6.4.3svn
-pscp.exe -r -i .\ssh\id_dsa.ppk .\grass64\addons\logs landa at geo102:/work/wingrass/grass64/addons/grass-6.4.3svn
-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\logs 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
-pscp.exe -r -i .\ssh\id_dsa.ppk .\grass70\addons\logs landa at geo102:/work/wingrass/grass70/addons
+# pscp.exe -r -i .\ssh\id_dsa.ppk .\grass64\addons\*.zip .\grass64\addons\*.md5sum landa at geo102:/work/wingrass/grass64/addons/grass-6.4.3svn
+# pscp.exe -r -i .\ssh\id_dsa.ppk .\grass64\addons\logs landa at geo102:/work/wingrass/grass64/addons/grass-6.4.3svn
+# 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\logs 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
+# pscp.exe -r -i .\ssh\id_dsa.ppk .\grass70\addons\logs landa at geo102:/work/wingrass/grass70/addons
Modified: grass-addons/tools/wingrass-packager/grass_packager_release.bat
===================================================================
--- grass-addons/tools/wingrass-packager/grass_packager_release.bat 2012-07-01 17:09:55 UTC (rev 52276)
+++ grass-addons/tools/wingrass-packager/grass_packager_release.bat 2012-07-02 10:27:19 UTC (rev 52277)
@@ -5,12 +5,12 @@
set MAJOR=6
set MINOR=4
set PATCH=2
-set REV=1
+set REV=2
rem Compile GRASS versions
-rmdir /s /q C:\OSGeo4W\apps\grass\grass-%MAJOR%.%MINOR%.%PATCH%
+rem rmdir /s /q C:\OSGeo4W\apps\grass\grass-%MAJOR%.%MINOR%.%PATCH%
rem native & osgeo4w
-C:\OSGeo4W\apps\msys\bin\bash.exe C:\Users\landa\grass_packager\grass_compile.sh %MAJOR%%MINOR%%PATCH%
+rem C:\OSGeo4W\apps\msys\bin\bash.exe C:\Users\landa\grass_packager\grass_compile.sh %MAJOR%%MINOR%%PATCH%
rem Preparation
if exist .\grass%MAJOR%%MINOR%%PATCH% rmdir /S/Q .\grass%MAJOR%%MINOR%%PATCH%
@@ -21,8 +21,10 @@
cd ..
C:\OSGeo4W\apps\msys\bin\sh.exe .\grass_osgeo4w.sh %MAJOR%%MINOR%%PATCH% %MAJOR%.%MINOR%.%PATCH% %REV%
-C:\OSGeo4W\apps\msys\bin\sh.exe .\grass_svn_info.sh %MAJOR%%MINOR%%PATCH%
+C:\OSGeo4W\apps\msys\bin\sh.exe .\grass_svn_info.sh %MAJOR%%MINOR%%PATCH% %REV%
+pause
+
C:\DevTools\makensis.exe .\grass%MAJOR%%MINOR%%PATCH%\GRASS-Installer.nsi
C:\OSGeo4W\apps\msys\bin\sh.exe .\grass_md5sum.sh %MAJOR%%MINOR%%PATCH%
Modified: grass-addons/tools/wingrass-packager/grass_svn_info.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_svn_info.sh 2012-07-01 17:09:55 UTC (rev 52276)
+++ grass-addons/tools/wingrass-packager/grass_svn_info.sh 2012-07-02 10:27:19 UTC (rev 52277)
@@ -8,9 +8,13 @@
function update {
cd $SRC/$1
REV=`svn info | grep 'Last Changed Rev:' | cut -d':' -f2 | tr -d ' '`
- NUM=`ls -t $PACKAGEDIR/ 2>/dev/null | head -n1 | cut -d'-' -f5 | cut -d'.' -f1`
- if [ "x$NUM" = "x" ]; then
- NUM=1
+ if test -z $3 ; then
+ NUM=`ls -t $PACKAGEDIR/ 2>/dev/null | head -n1 | cut -d'-' -f5 | cut -d'.' -f1`
+ if [ "x$NUM" = "x" ]; then
+ NUM=1
+ fi
+ else
+ NUM=$3
fi
exec 3<include/VERSION
@@ -48,7 +52,7 @@
update grass6_devel grass65
update grass_trunk grass70
else
- update grass$1 grass$1
+ update grass$1 grass$1 $2
fi
exit 0
More information about the grass-commit
mailing list