[GRASS-SVN] r64935 - grass-addons/tools/wingrass-packager
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Mar 30 08:47:21 PDT 2015
Author: martinl
Date: 2015-03-30 08:47:21 -0700 (Mon, 30 Mar 2015)
New Revision: 64935
Modified:
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_svn_info.sh
Log:
wingrass: create daily builds only for GRASS 7.1
Modified: grass-addons/tools/wingrass-packager/grass_compile.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_compile.sh 2015-03-30 15:20:18 UTC (rev 64934)
+++ grass-addons/tools/wingrass-packager/grass_compile.sh 2015-03-30 15:47:21 UTC (rev 64935)
@@ -36,10 +36,10 @@
if test -z $1 ; then
# dev packages
- compile grass64_release 64-dev
- ### compile grass6_devel 65-dev
- compile grass70_release 70-dev
- compile grass_trunk 71-dev
+ ### compile grass64_release 64-dev
+ ### compile grass6_devel 65-dev
+ ### compile grass70_release -dev
+ compile grass_trunk -daily
else
compile grass$1 $2
fi
Modified: grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh 2015-03-30 15:20:18 UTC (rev 64934)
+++ grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh 2015-03-30 15:47:21 UTC (rev 64935)
@@ -47,9 +47,9 @@
if test -z $1 ; then
# daily builds
- copy 64 6.4.5svn
+ ### copy 64 6.4.5svn
### copy 65
- copy 70 7.0.1svn
+ ### copy 70 7.0.1svn
copy 71 7.1.svn
# releases
copy_addon 644 6.4.4
Modified: grass-addons/tools/wingrass-packager/grass_md5sum.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_md5sum.sh 2015-03-30 15:20:18 UTC (rev 64934)
+++ grass-addons/tools/wingrass-packager/grass_md5sum.sh 2015-03-30 15:47:21 UTC (rev 64935)
@@ -14,9 +14,9 @@
if test -z $1 ; then
# dev packages
- create_md5sum grass64
+ ### create_md5sum grass64
### create_md5sum grass65
- create_md5sum grass70
+ ### create_md5sum grass70
create_md5sum grass71
else
create_md5sum grass$1
Modified: grass-addons/tools/wingrass-packager/grass_osgeo4w.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_osgeo4w.sh 2015-03-30 15:20:18 UTC (rev 64934)
+++ grass-addons/tools/wingrass-packager/grass_osgeo4w.sh 2015-03-30 15:47:21 UTC (rev 64935)
@@ -23,9 +23,9 @@
if test -z $1 ; then
# dev packages
- rsync_package 64
+ ### rsync_package 64
### rsync_package 65
- rsync_package 70
+ ### rsync_package 70
rsync_package 71
else
rsync_package $1 $2 $3
Modified: grass-addons/tools/wingrass-packager/grass_packager.bat
===================================================================
--- grass-addons/tools/wingrass-packager/grass_packager.bat 2015-03-30 15:20:18 UTC (rev 64934)
+++ grass-addons/tools/wingrass-packager/grass_packager.bat 2015-03-30 15:47:21 UTC (rev 64935)
@@ -5,9 +5,9 @@
REM
REM Clean-up
REM
-rmdir /s /q C:\OSGeo4W\apps\grass\grass-6.4.5svn
+REM rmdir /s /q C:\OSGeo4W\apps\grass\grass-6.4.5svn
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.0.1svn
rmdir /s /q C:\OSGeo4W\apps\grass\grass-7.1.svn
REM
@@ -18,27 +18,27 @@
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
+REM if exist .\grass64 rmdir /S/Q .\grass64
+REM xcopy C:\OSGeo4W\usr\src\grass64_release\mswindows\* .\grass64 /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\grass70_release\mswindows\* .\grass70 /S/V/F/I
+REM if exist .\grass70 rmdir /S/Q .\grass70
+REM xcopy C:\OSGeo4W\usr\src\grass70_release\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 > .\GRASS-Packager.log
-cd ..
+REM cd .\grass64
+REM call .\GRASS-Packager.bat > .\GRASS-Packager.log
+REM cd ..
REM cd .\grass65
REM call .\GRASS-Packager.bat
REM cd ..
-cd .\grass70
-call .\GRASS-Packager.bat > .\GRASS-Packager.log
-cd ..
+REM cd .\grass70
+REM call .\GRASS-Packager.bat > .\GRASS-Packager.log
+REM cd ..
cd .\grass71
call .\GRASS-Packager.bat > .\GRASS-Packager.log
cd ..
@@ -49,9 +49,9 @@
REM
REM Create standalone installer
REM
-C:\DevTools\makensis.exe .\grass64\GRASS-Installer.nsi > .\grass64\GRASS-Installer.log
+REM C:\DevTools\makensis.exe .\grass64\GRASS-Installer.nsi > .\grass64\GRASS-Installer.log
REM C:\DevTools\makensis.exe .\grass65\GRASS-Installer.nsi
-C:\DevTools\makensis.exe .\grass70\GRASS-Installer.nsi > .\grass70\GRASS-Installer.log
+REM C:\DevTools\makensis.exe .\grass70\GRASS-Installer.nsi > .\grass70\GRASS-Installer.log
C:\DevTools\makensis.exe .\grass71\GRASS-Installer.nsi > .\grass71\GRASS-Installer.log
REM
Modified: grass-addons/tools/wingrass-packager/grass_svn_info.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_svn_info.sh 2015-03-30 15:20:18 UTC (rev 64934)
+++ grass-addons/tools/wingrass-packager/grass_svn_info.sh 2015-03-30 15:47:21 UTC (rev 64935)
@@ -54,16 +54,16 @@
cp error.log $LOG_DIR/
}
-export PATH=$PATH:/c/OSGeo4W/apps/msys/bin
+export PATH=$PATH:/c/OSGeo4W/apps/msys/bin:/c/subversion/bin/svn
VERSION=$1
NUM=$2
if test -z $VERSION ; then
# dev packages
- update grass64_release grass64
+ ### update grass64_release grass64
### update grass6_devel grass65
- update grass70_release grass70
+ ### update grass70_release grass70
update grass_trunk grass71
else
update grass$VERSION grass$VERSION $NUM
More information about the grass-commit
mailing list