[GRASS-SVN] r65381 - grass-addons/tools/wingrass-packager
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Jun 5 14:17:01 PDT 2015
Author: martinl
Date: 2015-06-05 14:17:01 -0700 (Fri, 05 Jun 2015)
New Revision: 65381
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_svn_info.sh
Log:
wingrass: enable grass70_release daily builds
Modified: grass-addons/tools/wingrass-packager/grass_addons.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_addons.sh 2015-06-05 18:14:04 UTC (rev 65380)
+++ grass-addons/tools/wingrass-packager/grass_addons.sh 2015-06-05 21:17:01 UTC (rev 65381)
@@ -28,6 +28,7 @@
function compile {
export PATH=$PATH:/c/OSGeo4W$4/apps/msys/bin:/c/OSGeo4W$4/bin:$2/dist.i686-pc-mingw32/bin:$2/dist.i686-pc-mingw32/scripts:/c/subversion/bin/svn
export PYTHONHOME=/c/OSGeo4W$4/apps/Python27
+
rm -rf $3
$SVN_PATH/tools/addons/compile.sh $1 $2 $3 1
cd $3
@@ -65,7 +66,7 @@
compile $SVN_PATH/grass6 $GISBASE_PATH/grass644 $ADDON_PATH/grass644/addons
### compile $SVN_PATH/grass6 $GISBASE_PATH/grass64_release $ADDON_PATH/grass64/addons
compile $SVN_PATH/grass7 $GISBASE_PATH/grass700 $ADDON_PATH/grass700/addons
- ### compile $SVN_PATH/grass7 $GISBASE_PATH/grass70_release $ADDON_PATH/grass70/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
Modified: grass-addons/tools/wingrass-packager/grass_compile.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_compile.sh 2015-06-05 18:14:04 UTC (rev 65380)
+++ grass-addons/tools/wingrass-packager/grass_compile.sh 2015-06-05 21:17:01 UTC (rev 65381)
@@ -38,7 +38,7 @@
# dev packages
### compile grass64_release 64-dev
### compile grass6_devel 65-dev
- ### compile grass70_release -dev
+ compile grass70_release -dev
compile grass_trunk -daily
else
compile grass$1 $2
Modified: grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh 2015-06-05 18:14:04 UTC (rev 65380)
+++ grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh 2015-06-05 21:17:01 UTC (rev 65381)
@@ -43,13 +43,19 @@
cp -r addons/logs $ADDONDIR
}
+function create_zip {
+ echo "Creating zip..."
+ cd $WWWDIR
+ zip wingrass.zip grass64 grass70 grass71 -r -q
+}
+
export PATH=$PATH:/c/OSGeo4W/apps/msys/bin
if test -z $1 ; then
# daily builds
### 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
@@ -58,4 +64,6 @@
copy $1 $2
fi
+create_zip
+
exit 0
Modified: grass-addons/tools/wingrass-packager/grass_md5sum.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_md5sum.sh 2015-06-05 18:14:04 UTC (rev 65380)
+++ grass-addons/tools/wingrass-packager/grass_md5sum.sh 2015-06-05 21:17:01 UTC (rev 65381)
@@ -16,7 +16,7 @@
# dev packages
### 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-06-05 18:14:04 UTC (rev 65380)
+++ grass-addons/tools/wingrass-packager/grass_osgeo4w.sh 2015-06-05 21:17:01 UTC (rev 65381)
@@ -25,7 +25,7 @@
# dev packages
### 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-06-05 18:14:04 UTC (rev 65380)
+++ grass-addons/tools/wingrass-packager/grass_packager.bat 2015-06-05 21:17:01 UTC (rev 65381)
@@ -22,8 +22,8 @@
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
-REM if exist .\grass70 rmdir /S/Q .\grass70
-REM xcopy C:\OSGeo4W\usr\src\grass70_release\mswindows\* .\grass70 /S/V/F/I
+if exist .\grass70 rmdir /S/Q .\grass70
+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
@@ -36,9 +36,9 @@
REM cd .\grass65
REM call .\GRASS-Packager.bat
REM cd ..
-REM cd .\grass70
-REM call .\GRASS-Packager.bat > .\GRASS-Packager.log
-REM cd ..
+cd .\grass70
+call .\GRASS-Packager.bat > .\GRASS-Packager.log
+cd ..
cd .\grass71
call .\GRASS-Packager.bat > .\GRASS-Packager.log
cd ..
@@ -51,7 +51,7 @@
REM
REM C:\DevTools\makensis.exe .\grass64\GRASS-Installer.nsi > .\grass64\GRASS-Installer.log
REM C:\DevTools\makensis.exe .\grass65\GRASS-Installer.nsi
-REM C:\DevTools\makensis.exe .\grass70\GRASS-Installer.nsi > .\grass70\GRASS-Installer.log
+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-06-05 18:14:04 UTC (rev 65380)
+++ grass-addons/tools/wingrass-packager/grass_svn_info.sh 2015-06-05 21:17:01 UTC (rev 65381)
@@ -63,7 +63,7 @@
# dev packages
### 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