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

[svn_grass at osgeo.org]

Author: martinl
Date: 2017-11-12 13:32:53 -0800 (Sun, 12 Nov 2017)
New Revision: 71723

Modified:
   grass-addons/tools/wingrass-packager/grass_addons.sh
   grass-addons/tools/wingrass-packager/grass_compile.sh
   grass-addons/tools/wingrass-packager/grass_md5sum.sh
   grass-addons/tools/wingrass-packager/grass_packager.bat
   grass-addons/tools/wingrass-packager/grass_svn_info.sh
Log:
wingrass: prepare for G74 and G75 daily builds

Modified: grass-addons/tools/wingrass-packager/grass_addons.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_addons.sh	2017-11-12 20:32:28 UTC (rev 71722)
+++ grass-addons/tools/wingrass-packager/grass_addons.sh	2017-11-12 21:32:53 UTC (rev 71723)
@@ -75,7 +75,8 @@
     compile ${SVN_PATH}/grass7 ${GISBASE_PATH}/grass721        ${ADDON_PATH}/grass721/${PLATFORM_DIR}/addons
     compile ${SVN_PATH}/grass7 ${GISBASE_PATH}/grass722        ${ADDON_PATH}/grass722/${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
+    compile ${SVN_PATH}/grass7 ${GISBASE_PATH}/grass74_release ${ADDON_PATH}/grass74/${PLATFORM_DIR}/addons    
+    compile ${SVN_PATH}/grass7 ${GISBASE_PATH}/grass_trunk     ${ADDON_PATH}/grass75/${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	2017-11-12 20:32:28 UTC (rev 71722)
+++ grass-addons/tools/wingrass-packager/grass_compile.sh	2017-11-12 21:32:53 UTC (rev 71723)
@@ -55,6 +55,7 @@
     ### compile grass64_release 64-dev 
     compile grass70_release -daily
     compile grass72_release -daily
+    compile grass74_release -daily    
     compile grass_trunk     -daily
 else
     compile grass$2         $3 

Modified: grass-addons/tools/wingrass-packager/grass_md5sum.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_md5sum.sh	2017-11-12 20:32:28 UTC (rev 71722)
+++ grass-addons/tools/wingrass-packager/grass_md5sum.sh	2017-11-12 21:32:53 UTC (rev 71723)
@@ -34,7 +34,8 @@
     ### create_md5sum grass64
     create_md5sum grass70
     create_md5sum grass72
-    create_md5sum grass73
+    create_md5sum grass74
+    create_md5sum grass75
 else
     create_md5sum grass$2
 fi

Modified: grass-addons/tools/wingrass-packager/grass_packager.bat
===================================================================
--- grass-addons/tools/wingrass-packager/grass_packager.bat	2017-11-12 20:32:28 UTC (rev 71722)
+++ grass-addons/tools/wingrass-packager/grass_packager.bat	2017-11-12 21:32:53 UTC (rev 71723)
@@ -73,9 +73,12 @@
 	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
+	if not exist "grass74" mkdir grass74
+	if exist .\grass74\%~1 rmdir /S/Q .\grass74\%~1
+	xcopy C:\msys%~2\usr\src\grass74_release\mswindows\* .\grass74\%~1 /S/V/I > NUL
+	if not exist "grass75" mkdir grass75
+	if exist .\grass75\%~1 rmdir /S/Q .\grass75\%~1
+	xcopy C:\msys%~2\usr\src\grass_trunk\mswindows\*     .\grass75\%~1 /S/V/I > NUL
 exit /b 0
 
 :preparePkg
@@ -86,14 +89,18 @@
 	cd .\grass72\%~1
 	call .\GRASS-Packager.bat %~2 > .\GRASS-Packager.log
 	cd ..\..
-	cd .\grass73\%~1
+	cd .\grass74\%~1
 	call .\GRASS-Packager.bat %~2 > .\GRASS-Packager.log
 	cd ..\..
+	cd .\grass75\%~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 .\grass72\%~1\GRASS-Installer.nsi > .\grass72\%~1\GRASS-Installer.log
-        C:\DevTools\makensis.exe .\grass73\%~1\GRASS-Installer.nsi > .\grass73\%~1\GRASS-Installer.log
+	C:\DevTools\makensis.exe .\grass74\%~1\GRASS-Installer.nsi > .\grass74\%~1\GRASS-Installer.log        
+        C:\DevTools\makensis.exe .\grass75\%~1\GRASS-Installer.nsi > .\grass75\%~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	2017-11-12 20:32:28 UTC (rev 71722)
+++ grass-addons/tools/wingrass-packager/grass_svn_info.sh	2017-11-12 21:32:53 UTC (rev 71723)
@@ -82,7 +82,8 @@
     ### update grass64_release grass64
     update grass70_release grass70
     update grass72_release grass72
-    update grass_trunk     grass73
+    update grass74_release grass74    
+    update grass_trunk     grass75
 else
     update grass$2         grass$2 $3
 fi