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

svn_grass at osgeo.org svn_grass at osgeo.org
Mon Nov 13 00:05:04 PST 2017


Author: martinl
Date: 2017-11-13 00:05:04 -0800 (Mon, 13 Nov 2017)
New Revision: 71727

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: disable grass70 daily builds

Modified: grass-addons/tools/wingrass-packager/grass_addons.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_addons.sh	2017-11-12 22:57:22 UTC (rev 71726)
+++ grass-addons/tools/wingrass-packager/grass_addons.sh	2017-11-13 08:05:04 UTC (rev 71727)
@@ -64,13 +64,13 @@
     ### compile ${SVN_PATH}/grass6 ${GISBASE_PATH}/grass644        ${ADDON_PATH}/grass644/addons
     ### compile ${SVN_PATH}/grass6 ${GISBASE_PATH}/grass64_release ${ADDON_PATH}/grass64/addons
     # TODO: enable later
-    #compile ${SVN_PATH}/grass7 ${GISBASE_PATH}/grass700        ${ADDON_PATH}/grass700/addons
-    #compile ${SVN_PATH}/grass7 ${GISBASE_PATH}/grass701        ${ADDON_PATH}/grass701/addons
-    #compile ${SVN_PATH}/grass7 ${GISBASE_PATH}/grass702        ${ADDON_PATH}/grass702/addons
-    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}/grass700        ${ADDON_PATH}/grass700/addons
+    # compile ${SVN_PATH}/grass7 ${GISBASE_PATH}/grass701        ${ADDON_PATH}/grass701/addons
+    # compile ${SVN_PATH}/grass7 ${GISBASE_PATH}/grass702        ${ADDON_PATH}/grass702/addons
+    # 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}/grass705        ${ADDON_PATH}/grass705/${PLATFORM_DIR}/addons
-    compile ${SVN_PATH}/grass7 ${GISBASE_PATH}/grass70_release ${ADDON_PATH}/grass70/${PLATFORM_DIR}/addons
+    # compile ${SVN_PATH}/grass7 ${GISBASE_PATH}/grass70_release ${ADDON_PATH}/grass70/${PLATFORM_DIR}/addons
     compile ${SVN_PATH}/grass7 ${GISBASE_PATH}/grass720        ${ADDON_PATH}/grass720/${PLATFORM_DIR}/addons
     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

Modified: grass-addons/tools/wingrass-packager/grass_compile.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_compile.sh	2017-11-12 22:57:22 UTC (rev 71726)
+++ grass-addons/tools/wingrass-packager/grass_compile.sh	2017-11-13 08:05:04 UTC (rev 71727)
@@ -53,7 +53,7 @@
 if test -z $2 ; then
     # dev packages
     ### compile grass64_release 64-dev 
-    compile grass70_release -daily
+    ### compile grass70_release -daily
     compile grass72_release -daily
     compile grass74_release -daily    
     compile grass_trunk     -daily

Modified: grass-addons/tools/wingrass-packager/grass_md5sum.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_md5sum.sh	2017-11-12 22:57:22 UTC (rev 71726)
+++ grass-addons/tools/wingrass-packager/grass_md5sum.sh	2017-11-13 08:05:04 UTC (rev 71727)
@@ -32,7 +32,7 @@
 if test -z $2 ; then
     # dev packages
     ### create_md5sum grass64
-    create_md5sum grass70
+    ### create_md5sum grass70
     create_md5sum grass72
     create_md5sum grass74
     create_md5sum grass75

Modified: grass-addons/tools/wingrass-packager/grass_packager.bat
===================================================================
--- grass-addons/tools/wingrass-packager/grass_packager.bat	2017-11-12 22:57:22 UTC (rev 71726)
+++ grass-addons/tools/wingrass-packager/grass_packager.bat	2017-11-13 08:05:04 UTC (rev 71727)
@@ -67,9 +67,9 @@
 
 :cleanUpPkg
 	echo ...(%~1)
-	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
+	rem if not exist "grass70" mkdir grass70
+	rem if exist .\grass70\%~1 rmdir /S/Q .\grass70\%~1
+	rem xcopy C:\msys%~2\usr\src\grass70_release\mswindows\* .\grass70\%~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
@@ -83,9 +83,9 @@
 
 :preparePkg
 	echo ...(%~1)
-	cd .\grass70\%~1
-	call .\GRASS-Packager.bat %~2 > .\GRASS-Packager.log
-	cd ..\..
+	rem cd .\grass70\%~1
+	rem call .\GRASS-Packager.bat %~2 > .\GRASS-Packager.log
+	rem cd ..\..
 	cd .\grass72\%~1
 	call .\GRASS-Packager.bat %~2 > .\GRASS-Packager.log
 	cd ..\..
@@ -99,7 +99,7 @@
 
 :createPkg
 	echo ...(%~1)
-	C:\DevTools\makensis.exe .\grass70\%~1\GRASS-Installer.nsi > .\grass70\%~1\GRASS-Installer.log
+	rem 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 .\grass74\%~1\GRASS-Installer.nsi > .\grass74\%~1\GRASS-Installer.log        
         C:\DevTools\makensis.exe .\grass75\%~1\GRASS-Installer.nsi > .\grass75\%~1\GRASS-Installer.log

Modified: grass-addons/tools/wingrass-packager/grass_svn_info.sh
===================================================================
--- grass-addons/tools/wingrass-packager/grass_svn_info.sh	2017-11-12 22:57:22 UTC (rev 71726)
+++ grass-addons/tools/wingrass-packager/grass_svn_info.sh	2017-11-13 08:05:04 UTC (rev 71727)
@@ -80,7 +80,7 @@
 if test -z $2 ; then
     # dev packages
     ### update grass64_release grass64
-    update grass70_release grass70
+    ### update grass70_release grass70
     update grass72_release grass72
     update grass74_release grass74    
     update grass_trunk     grass75



More information about the grass-commit mailing list