osgeo4w: support GRASS 7.6

jef-n · jef-n · commit aa30730ac607 · 2019-01-25T21:03:28.000+01:00
diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd
@@ -91,8 +91,8 @@ set CMAKE_OPT=^
 
 :devenv
 set GRASS7=
-if exist %OSGEO4W_ROOT%\bin\grass72.bat set GRASS7=%OSGEO4W_ROOT%\bin\grass72.bat
 if exist %OSGEO4W_ROOT%\bin\grass74.bat set GRASS7=%OSGEO4W_ROOT%\bin\grass74.bat
+if exist %OSGEO4W_ROOT%\bin\grass76.bat set GRASS7=%OSGEO4W_ROOT%\bin\grass76.bat
 if "%GRASS7%"=="" (echo GRASS7 not found & goto error)
 
 for /f "usebackq tokens=1" %%a in (`%GRASS7% --config path`) do set GRASS7_PATH=%%a
diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -87,8 +87,8 @@ set CMAKE_OPT=^
 
 :devenv
 set GRASS7=
-if exist %OSGEO4W_ROOT%\bin\grass72.bat set GRASS7=%OSGEO4W_ROOT%\bin\grass72.bat
 if exist %OSGEO4W_ROOT%\bin\grass74.bat set GRASS7=%OSGEO4W_ROOT%\bin\grass74.bat
+if exist %OSGEO4W_ROOT%\bin\grass76.bat set GRASS7=%OSGEO4W_ROOT%\bin\grass76.bat
 if "%GRASS7%"=="" (echo GRASS7 not found & goto error)
 
 for /f "usebackq tokens=1" %%a in (`%GRASS7% --config path`) do set GRASS7_PATH=%%a
diff --git a/python/plugins/processing/algs/grass7/Grass7Utils.py b/python/plugins/processing/algs/grass7/Grass7Utils.py
@@ -84,7 +84,7 @@ def installedVersion(run=False):
         if Grass7Utils.grassPath() is None:
             return None
 
-        for command in ["grass74", "grass72", "grass71", "grass70", "grass"]:
+        for command in ["grass76", "grass74", "grass72", "grass71", "grass70", "grass"]:
             proc = subprocess.Popen(
                 ["{} -v".format(command)],
                 shell=True,
