[GRASS-SVN] r59522 - grass-addons/tools/wingrass-packager
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Mar 30 11:51:43 PDT 2014
Author: martinl
Date: 2014-03-30 11:51:43 -0700 (Sun, 30 Mar 2014)
New Revision: 59522
Modified:
grass-addons/tools/wingrass-packager/grass_addons.sh
grass-addons/tools/wingrass-packager/grass_compile.sh
grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh
grass-addons/tools/wingrass-packager/grass_md5sum.sh
grass-addons/tools/wingrass-packager/grass_osgeo4w.sh
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: update packager scripts, add relbr70, remove devbr65
Modified: grass-addons/tools/wingrass-packager/grass_addons.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_addons.sh 2014-03-30 10:29:43 UTC (rev 59521)
+++ grass-addons/tools/wingrass-packager/grass_addons.sh 2014-03-30 18:51:43 UTC (rev 59522)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Compile AddOns GRASS 6.4, 6.5 and 7.0
+# Compile AddOns GRASS versions
SVN_PATH=/c/osgeo4w/usr/src/grass_addons
GISBASE_PATH=/c/osgeo4w/usr/src
@@ -56,8 +56,10 @@
# dev packages
compile $SVN_PATH/grass6 $GISBASE_PATH/grass643 $ADDON_PATH/grass643/addons
compile $SVN_PATH/grass6 $GISBASE_PATH/grass64_release $ADDON_PATH/grass64/addons
- compile $SVN_PATH/grass6 $GISBASE_PATH/grass6_devel $ADDON_PATH/grass65/addons
- compile $SVN_PATH/grass7 $GISBASE_PATH/grass_trunk $ADDON_PATH/grass70/addons
+ ### compile $SVN_PATH/grass6 $GISBASE_PATH/grass6_devel $ADDON_PATH/grass65/addons
+ compile $SVN_PATH/grass7 $GISBASE_PATH/grass700beta1 $ADDON_PATH/grass700beta1/addons
+ compile $SVN_PATH/grass7 $GISBASE_PATH/grass70_release $ADDON_PATH/grass70/addons
+ compile $SVN_PATH/grass7 $GISBASE_PATH/grass_trunk $ADDON_PATH/grass71/addons
else
compile $SVN_PATH/grass6 $GISBASE_PATH/grass$1 $ADDON_PATH/grass$1/addons
fi
Modified: grass-addons/tools/wingrass-packager/grass_compile.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_compile.sh 2014-03-30 10:29:43 UTC (rev 59521)
+++ grass-addons/tools/wingrass-packager/grass_compile.sh 2014-03-30 18:51:43 UTC (rev 59522)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Compile GRASS 6.4, 6.5 and 7.0 (update source code from SVN repository)
+# Compile GRASS versions (update source code from SVN repository)
SRC=/usr/src
PACKAGEDIR=mswindows/osgeo4w/package
@@ -37,8 +37,9 @@
if test -z $1 ; then
# dev packages
compile grass64_release 64-dev
- compile grass6_devel 65-dev
- compile grass_trunk 70-dev
+ ### compile grass6_devel 65-dev
+ compile grass70_release 70-dev
+ compile grass_trunk 71-dev
else
compile grass$1 $1
fi
Modified: grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh 2014-03-30 10:29:43 UTC (rev 59521)
+++ grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh 2014-03-30 18:51:43 UTC (rev 59522)
@@ -48,10 +48,12 @@
if test -z $1 ; then
# daily builds
copy 64 6.4.4svn
- copy 65
- copy 70
+ ### copy 65
+ copy 70 7.0.0svn
+ copy 71
# releases
copy_addon 643 6.4.3
+ copy_addon 700beta1 7.0.0
else
copy $1 $2
fi
Modified: grass-addons/tools/wingrass-packager/grass_md5sum.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_md5sum.sh 2014-03-30 10:29:43 UTC (rev 59521)
+++ grass-addons/tools/wingrass-packager/grass_md5sum.sh 2014-03-30 18:51:43 UTC (rev 59522)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Create mdb5sum files for GRASS 6.4, 6.5 and 7.0
+# Create mdb5sum files for GRASS versions
HOME=/c/Users/landa/grass_packager
@@ -15,8 +15,9 @@
if test -z $1 ; then
# dev packages
create_md5sum grass64
- create_md5sum grass65
+ ### create_md5sum grass65
create_md5sum grass70
+ create_md5sum grass71
else
create_md5sum grass$1
fi
Modified: grass-addons/tools/wingrass-packager/grass_osgeo4w.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_osgeo4w.sh 2014-03-30 10:29:43 UTC (rev 59521)
+++ grass-addons/tools/wingrass-packager/grass_osgeo4w.sh 2014-03-30 18:51:43 UTC (rev 59522)
@@ -24,8 +24,9 @@
if test -z $1 ; then
# dev packages
rsync_package 64
- rsync_package 65
+ ### rsync_package 65
rsync_package 70
+ rsync_package 71
else
rsync_package $1 $2 $3
fi
Modified: grass-addons/tools/wingrass-packager/grass_packager.bat
===================================================================
--- grass-addons/tools/wingrass-packager/grass_packager.bat 2014-03-30 10:29:43 UTC (rev 59521)
+++ grass-addons/tools/wingrass-packager/grass_packager.bat 2014-03-30 18:51:43 UTC (rev 59522)
@@ -2,42 +2,69 @@
cd C:\Users\landa\grass_packager
-rem Compile GRASS versions
+REM
+REM Clean-up
+REM
rmdir /s /q C:\OSGeo4W\apps\grass\grass-6.4.4svn
-rmdir /s /q C:\OSGeo4W\apps\grass\grass-6.5.svn
-rmdir /s /q C:\OSGeo4W\apps\grass\grass-7.0.svn
-rem native & osgeo4w
+REM rmdir /s /q C:\OSGeo4W\apps\grass\grass-6.5.svn
+rmdir /s /q C:\OSGeo4W\apps\grass\grass-7.0.0svn
+rmdir /s /q C:\OSGeo4W\apps\grass\grass-7.1.svn
+
+REM
+REM Compile GRASS versions
+REM
C:\OSGeo4W\apps\msys\bin\bash.exe C:\Users\landa\grass_packager\grass_compile.sh
-rem Preparation
+REM
+REM Clean-up
+REM
if exist .\grass64 rmdir /S/Q .\grass64
xcopy C:\OSGeo4W\usr\src\grass64_release\mswindows\* .\grass64 /S/V/F/I
-if exist .\grass65 rmdir /S/Q .\grass65
-xcopy C:\OSGeo4W\usr\src\grass6_devel\mswindows\* .\grass65 /S/V/F/I
+REM if exist .\grass65 rmdir /S/Q .\grass65
+REM xcopy C:\OSGeo4W\usr\src\grass6_devel\mswindows\* .\grass65 /S/V/F/I
if exist .\grass70 rmdir /S/Q .\grass70
xcopy C:\OSGeo4W\usr\src\grass_trunk\mswindows\* .\grass70 /S/V/F/I
+if exist .\grass71 rmdir /S/Q .\grass71
+xcopy C:\OSGeo4W\usr\src\grass_trunk\mswindows\* .\grass71 /S/V/F/I
+REM
+REM Prepare packages
+REM
cd .\grass64
call .\GRASS-Packager.bat
cd ..
-cd .\grass65
+REM cd .\grass65
+REM call .\GRASS-Packager.bat
+REM cd ..
+cd .\grass70
call .\GRASS-Packager.bat
cd ..
-cd .\grass70
+cd .\grass71
call .\GRASS-Packager.bat
cd ..
C:\OSGeo4W\apps\msys\bin\sh.exe .\grass_osgeo4w.sh
C:\OSGeo4W\apps\msys\bin\sh.exe .\grass_svn_info.sh
+REM
+REM Create standalone installer
+REM
C:\DevTools\makensis.exe .\grass64\GRASS-Installer.nsi
-
-C:\DevTools\makensis.exe .\grass65\GRASS-Installer.nsi
-
+REM C:\DevTools\makensis.exe .\grass65\GRASS-Installer.nsi
C:\DevTools\makensis.exe .\grass70\GRASS-Installer.nsi
+C:\DevTools\makensis.exe .\grass71\GRASS-Installer.nsi
+REM
+REM Create md5sum files
+REM
C:\OSGeo4W\apps\msys\bin\sh.exe .\grass_md5sum.sh
+REM
+REM Build Addons
+REM
C:\OSGeo4W\apps\msys\bin\sh.exe .\grass_addons.sh
+REM
+REM Copy packages
+REM
C:\OSGeo4W\apps\msys\bin\sh.exe .\grass_copy_wwwroot.sh
Modified: grass-addons/tools/wingrass-packager/grass_packager_release.bat
===================================================================
--- grass-addons/tools/wingrass-packager/grass_packager_release.bat 2014-03-30 10:29:43 UTC (rev 59521)
+++ grass-addons/tools/wingrass-packager/grass_packager_release.bat 2014-03-30 18:51:43 UTC (rev 59522)
@@ -8,10 +8,10 @@
cd C:\Users\landa\grass_packager
-set MAJOR=6
-set MINOR=4
-set PATCH=3
-set REV=4
+set MAJOR=7
+set MINOR=0
+set PATCH=0beta1
+set REV=1
rem Compile GRASS versions
rmdir /s /q C:\OSGeo4W\apps\grass\grass-%MAJOR%.%MINOR%.%PATCH%
@@ -32,4 +32,3 @@
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 2014-03-30 10:29:43 UTC (rev 59521)
+++ grass-addons/tools/wingrass-packager/grass_svn_info.sh 2014-03-30 18:51:43 UTC (rev 59522)
@@ -62,8 +62,9 @@
if test -z $VERSION ; then
# dev packages
update grass64_release grass64
- update grass6_devel grass65
- update grass_trunk grass70
+ ### update grass6_devel grass65
+ update grass70_release grass70
+ update grass_trunk grass71
else
update grass$VERSION grass$VERSION $NUM
fi
More information about the grass-commit
mailing list