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

svn_grass at osgeo.org svn_grass at osgeo.org
Mon May 30 04:50:59 PDT 2016 

Author: martinl
Date: 2016-05-30 04:50:59 -0700 (Mon, 30 May 2016)
New Revision: 68534

Modified:
   grass-addons/tools/wingrass-packager/cronjob.sh
   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: updates to respect relbr72

Modified: grass-addons/tools/wingrass-packager/cronjob.sh
===================================================================
--- grass-addons/tools/wingrass-packager/cronjob.sh	2016-05-30 04:42:16 UTC (rev 68533)
+++ grass-addons/tools/wingrass-packager/cronjob.sh	2016-05-30 11:50:59 UTC (rev 68534)
@@ -87,28 +87,31 @@
 # summary.html -> index.html
 ### addons_index 64
 addons_index 70
-addons_index 71
+addons_index 72
+addons_index 73
 
 # remove old packages
 ### rm_7 64
 rm_7 70
-rm_7 71
+rm_7 72
+rm_7 73
 
 # update setup.ini
 ### update_setup 64
 ### update_setup 70
-update_setup 71
+update_setup 73
 
 # geo101 -> upload.osgeo.org
 ### rsync_grass 64
 ### rsync_grass 70
-rsync_grass 71 -daily
+rsync_grass 73 -daily
 
 # promote changes
 ~/cronjobs/osgeo4w-promote.sh
 
 ### report 64
 report 70
-report 71
+report 72
+report 73
 
 exit 0

Modified: grass-addons/tools/wingrass-packager/grass_addons.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_addons.sh	2016-05-30 04:42:16 UTC (rev 68533)
+++ grass-addons/tools/wingrass-packager/grass_addons.sh	2016-05-30 11:50:59 UTC (rev 68534)
@@ -70,7 +70,8 @@
     compile ${SVN_PATH}/grass7 ${GISBASE_PATH}/grass703        ${ADDON_PATH}/grass703/${PLATFORM_DIR}/addons
     compile ${SVN_PATH}/grass7 ${GISBASE_PATH}/grass704        ${ADDON_PATH}/grass704/${PLATFORM_DIR}/addons
     compile ${SVN_PATH}/grass7 ${GISBASE_PATH}/grass70_release ${ADDON_PATH}/grass70/${PLATFORM_DIR}/addons
-    compile ${SVN_PATH}/grass7 ${GISBASE_PATH}/grass_trunk     ${ADDON_PATH}/grass71/${PLATFORM_DIR}/addons
+    compile ${SVN_PATH}/grass7 ${GISBASE_PATH}/grass72_release ${ADDON_PATH}/grass72/${PLATFORM_DIR}/addons
+    compile ${SVN_PATH}/grass7 ${GISBASE_PATH}/grass_trunk     ${ADDON_PATH}/grass73/${PLATFORM_DIR}/addons
 else
     compile ${SVN_PATH}/grass6 ${GISBASE_PATH}/grass$2         ${ADDON_PATH}/grass$2/${PLATFORM_DIR}/addons
 fi

Modified: grass-addons/tools/wingrass-packager/grass_compile.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_compile.sh	2016-05-30 04:42:16 UTC (rev 68533)
+++ grass-addons/tools/wingrass-packager/grass_compile.sh	2016-05-30 11:50:59 UTC (rev 68534)
@@ -48,7 +48,7 @@
 if test -z $2 ; then
     # dev packages
     ### compile grass64_release 64-dev 
-    compile grass70_release -dev
+    compile grass72_release -dev
     compile grass_trunk     -daily
 else
     compile grass$2         $3 

Modified: grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh	2016-05-30 04:42:16 UTC (rev 68533)
+++ grass-addons/tools/wingrass-packager/grass_copy_wwwroot.sh	2016-05-30 11:50:59 UTC (rev 68534)
@@ -79,7 +79,8 @@
     ### copy 64 6.4.5svn
     ### copy 65
     copy        70       `ls ${HOME}/grass70/x86/grass*.bz2 | cut -d'-' -f 3`
-    copy        71       7.1.svn
+    copy        72       7.2.svn
+    copy        73       7.3.svn
     # releases (TODO: enable later)
     #copy_addon 644      6.4.4
     #copy_addon 700      7.0.0

Modified: grass-addons/tools/wingrass-packager/grass_md5sum.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_md5sum.sh	2016-05-30 04:42:16 UTC (rev 68533)
+++ grass-addons/tools/wingrass-packager/grass_md5sum.sh	2016-05-30 11:50:59 UTC (rev 68534)
@@ -33,7 +33,8 @@
     # dev packages
     ### create_md5sum grass64
     create_md5sum grass70
-    create_md5sum grass71
+    create_md5sum grass72
+    create_md5sum grass73
 else
     create_md5sum grass$2
 fi

Modified: grass-addons/tools/wingrass-packager/grass_osgeo4w.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_osgeo4w.sh	2016-05-30 04:42:16 UTC (rev 68533)
+++ grass-addons/tools/wingrass-packager/grass_osgeo4w.sh	2016-05-30 11:50:59 UTC (rev 68534)
@@ -49,7 +49,8 @@
     # dev packages
     ### rsync_package 64
     rsync_package 70
-    rsync_package 71
+    rsync_package 72
+    rsync_package 73
 else
     rsync_package $2 $3 $4
 fi

Modified: grass-addons/tools/wingrass-packager/grass_packager.bat
===================================================================
--- grass-addons/tools/wingrass-packager/grass_packager.bat	2016-05-30 04:42:16 UTC (rev 68533)
+++ grass-addons/tools/wingrass-packager/grass_packager.bat	2016-05-30 11:50:59 UTC (rev 68534)
@@ -70,9 +70,12 @@
 	if not exist "grass70" mkdir grass70
 	if exist .\grass70\%~1 rmdir /S/Q .\grass70\%~1
 	xcopy C:\msys%~2\usr\src\grass70_release\mswindows\* .\grass70\%~1 /S/V/I > NUL
-	if not exist "grass71" mkdir grass71
-	if exist .\grass71\%~1 rmdir /S/Q .\grass71\%~1
-	xcopy C:\msys%~2\usr\src\grass_trunk\mswindows\*     .\grass71\%~1 /S/V/I > NUL
+	if not exist "grass72" mkdir grass72
+	if exist .\grass72\%~1 rmdir /S/Q .\grass72\%~1
+	xcopy C:\msys%~2\usr\src\grass72_release\mswindows\* .\grass72\%~1 /S/V/I > NUL
+	if not exist "grass73" mkdir grass73
+	if exist .\grass73\%~1 rmdir /S/Q .\grass73\%~1
+	xcopy C:\msys%~2\usr\src\grass_trunk\mswindows\*     .\grass73\%~1 /S/V/I > NUL
 exit /b 0
 
 :preparePkg
@@ -80,13 +83,17 @@
 	cd .\grass70\%~1
 	call .\GRASS-Packager.bat %~2 > .\GRASS-Packager.log
 	cd ..\..
-	cd .\grass71\%~1
+	cd .\grass72\%~1
 	call .\GRASS-Packager.bat %~2 > .\GRASS-Packager.log
 	cd ..\..
+	cd .\grass73\%~1
+	call .\GRASS-Packager.bat %~2 > .\GRASS-Packager.log
+	cd ..\..
 exit /b 0
 
 :createPkg
 	echo ...(%~1)
 	C:\DevTools\makensis.exe .\grass70\%~1\GRASS-Installer.nsi > .\grass70\%~1\GRASS-Installer.log
-	C:\DevTools\makensis.exe .\grass71\%~1\GRASS-Installer.nsi > .\grass71\%~1\GRASS-Installer.log
+	C:\DevTools\makensis.exe .\grass72\%~1\GRASS-Installer.nsi > .\grass72\%~1\GRASS-Installer.log
+        C:\DevTools\makensis.exe .\grass73\%~1\GRASS-Installer.nsi > .\grass73\%~1\GRASS-Installer.log
 exit /b 0

Modified: grass-addons/tools/wingrass-packager/grass_svn_info.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_svn_info.sh	2016-05-30 04:42:16 UTC (rev 68533)
+++ grass-addons/tools/wingrass-packager/grass_svn_info.sh	2016-05-30 11:50:59 UTC (rev 68534)
@@ -81,7 +81,8 @@
     # dev packages
     ### update grass64_release grass64
     update grass70_release grass70
-    update grass_trunk     grass71
+    update grass72_release grass72
+    update grass_trunk     grass73
 else
     update grass$2         grass$2 $3
 fi

More information about the grass-commit mailing list