[GRASS] remove GRASS 6 support

Author: blazek

CMakeLists.txt

@@ -38,19 +38,16 @@ SET (WITH_CORE TRUE CACHE BOOL "Determines whether QGIS core should be built.")
 MARK_AS_ADVANCED(WITH_CORE)
 
 IF(WITH_CORE)
-  # try to configure and build GRASS plugin by default
-  FOREACH (GRASS_SEARCH_VERSION 6 7)
-    # For GRASS 6 are used cached variables without version suffix so that existing caches don't have to be reconfigured.
-    # Cached variables: WITH_GRASS, WITH_GRASS7, GRASS_PREFIX, GRASS_PREFIX7, GRASS_INCLUDE_DIR, GRASS_INCLUDE_DIR7
+  # Only GRASS 7 is currently supported but we keep dual version support in cmake for possible future switch to GRASS 8.
+  # Try to configure and build GRASS plugin by default
+  FOREACH (GRASS_SEARCH_VERSION 7)
+    # Legacy note:
+    # For GRASS 6 there were used cached variables without version suffix so that existing caches didn't have to be reconfigured.
+    # Cached variables were: WITH_GRASS, WITH_GRASS7, GRASS_PREFIX, GRASS_PREFIX7, GRASS_INCLUDE_DIR, GRASS_INCLUDE_DIR7
     # Everywhere else each variable has version major appended.
-    # Normal variables: GRASS_FOUND6, GRASS_FOUND7, GRASS_MAJOR_VERSION6, GRASS_MAJOR_VERSION7, etc.
+    # Normal variables were: GRASS_FOUND6, GRASS_FOUND7, GRASS_MAJOR_VERSION6, GRASS_MAJOR_VERSION7, etc.
     # In addition there is also GRASS_FOUND, which is TRUE if at least one version of GRASS was found
-    IF (GRASS_SEARCH_VERSION EQUAL 6)
-      SET (GRASS_CACHE_VERSION "")
-    ELSE (GRASS_SEARCH_VERSION EQUAL 6)
-      SET (GRASS_CACHE_VERSION ${GRASS_SEARCH_VERSION})
-    ENDIF (GRASS_SEARCH_VERSION EQUAL 6)
-
+    SET (GRASS_CACHE_VERSION ${GRASS_SEARCH_VERSION})
     SET (WITH_GRASS${GRASS_CACHE_VERSION} TRUE CACHE BOOL "Determines whether GRASS ${GRASS_SEARCH_VERSION} plugin should be built")
     IF (WITH_GRASS${GRASS_CACHE_VERSION})
       FIND_PACKAGE(GRASS ${GRASS_SEARCH_VERSION})

cmake/FindGRASS.cmake

@@ -137,12 +137,6 @@ MACRO (CHECK_GRASS G_PREFIX)
           SET(GRASS_FOUND TRUE) # GRASS_FOUND is true if at least one version was found
           SET(GRASS_PREFIX${GRASS_CACHE_VERSION} ${G_PREFIX})
           CHECK_GRASS_EXTRA_INCLUDE_DIRS(${GRASS_FIND_VERSION})
-          IF(GRASS_FIND_VERSION EQUAL 6)
-            # Set also normal variable with number
-            SET(GRASS_INCLUDE_DIR${GRASS_FIND_VERSION} ${GRASS_INCLUDE_DIR${GRASS_CACHE_VERSION}})
-            SET(GRASS_PREFIX${GRASS_FIND_VERSION} ${G_PREFIX})
-            CHECK_GRASS_EXTRA_INCLUDE_DIRS(${GRASS_FIND_VERSION})
-          ENDIF(GRASS_FIND_VERSION EQUAL 6)
         ENDIF(GRASS_LIBRARIES_FOUND${GRASS_FIND_VERSION})
     ENDIF(GRASS_MAJOR_VERSION${GRASS_FIND_VERSION} EQUAL GRASS_FIND_VERSION)
   ENDIF(GRASS_INCLUDE_DIR${GRASS_CACHE_VERSION} AND EXISTS ${GRASS_INCLUDE_DIR${GRASS_CACHE_VERSION}}/grass/version.h)
@@ -164,20 +158,13 @@ IF (WIN32)
 ENDIF (WIN32)
 
 IF (UNIX)
-  IF (GRASS_FIND_VERSION EQUAL 6)
-    LIST(APPEND GRASS_PATHS /usr/lib64/grass64 /usr/lib/grass64)
-  ELSEIF (GRASS_FIND_VERSION EQUAL 7)
+  IF (GRASS_FIND_VERSION EQUAL 7)
     LIST(APPEND GRASS_PATHS /usr/lib64/grass70 /usr/lib/grass70 /usr/lib64/grass71 /usr/lib/grass71 /usr/lib64/grass72 /usr/lib/grass72)
   ENDIF ()
 ENDIF (UNIX)
 
 IF (APPLE)
-  IF (GRASS_FIND_VERSION EQUAL 6)
-    LIST(APPEND GRASS_PATHS
-      /Applications/GRASS-6.3.app/Contents/MacOS
-      /Applications/GRASS-6.4.app/Contents/MacOS
-    )
-  ELSEIF (GRASS_FIND_VERSION EQUAL 7)
+  IF (GRASS_FIND_VERSION EQUAL 7)
     LIST(APPEND GRASS_PATHS
       /Applications/GRASS-7.0.app/Contents/MacOS
       /Applications/GRASS-7.1.app/Contents/MacOS

debian/rules

@@ -85,11 +85,6 @@ ifeq ($(GRASSVER),7)
 		-DWITH_GRASS=TRUE \
 		-DWITH_GRASS7=TRUE \
 		-DGRASS_PREFIX7=/usr/lib/$(GRASS)
-else
-	CMAKE_OPTS += \
-		-DWITH_GRASS=TRUE \
-		-DWITH_GRASS6=TRUE \
-		-DGRASS_PREFIX=/usr/lib/$(GRASS)
 endif
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))

ms-windows/osgeo4w/package-nightly.cmd

@@ -165,7 +165,6 @@ cmake -G Ninja ^
 	-D WITH_SERVER=TRUE ^
 	-D SERVER_SKIP_ECW=TRUE ^
 	-D WITH_GRASS=TRUE ^
-	-D WITH_GRASS6=FALSE ^
 	-D WITH_GRASS7=TRUE ^
 	-D GRASS_PREFIX7=%GRASS72_PATH:\=/% ^
 	-D WITH_GLOBE=FALSE ^

ms-windows/osgeo4w/package.cmd

@@ -158,7 +158,6 @@ cmake -G Ninja ^
 	-D WITH_SERVER=TRUE ^
 	-D SERVER_SKIP_ECW=TRUE ^
 	-D WITH_GRASS=TRUE ^
-	-D WITH_GRASS6=FALSE ^
 	-D WITH_GRASS7=TRUE ^
 	-D GRASS_PREFIX7=%GRASS72_PATH:\=/% ^
 	-D WITH_GLOBE=FALSE ^

src/plugins/grass/modules/db.in.ogr.qgm

@@ -2,7 +2,6 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Import attribute tables in various formats" module="db.in.ogr">
-	<file key="dsn" type="old" label="Input table" filters="dbf, csv (*.csv *.dbf)" version_max="6.4"/>
-	<file key="input" type="old" label="Input table" filters="dbf, csv (*.csv *.dbf)" version_min="7.0"/>
+  <file key="input" type="old" label="Input table" filters="dbf, csv (*.csv *.dbf)"/>
 	<option key="output"/>
 </qgisgrassmodule>

src/plugins/grass/modules/db.out.ogr.qgm

@@ -3,9 +3,7 @@
 
 <qgisgrassmodule label="Exports attribute tables into various format" module="db.out.ogr">
 	<option key="input" />
-	<file key="dsn" type="new" version_max="6"/>
-	<file key="output" type="new" version_min="7"/>
+  <file key="output" type="new"/>
 	<option key="format" />
-	<option key="db_table" version_max="6"/>
-	<option key="table" version_min="7"/>
+  <option key="table"/>
 </qgisgrassmodule>

src/plugins/grass/modules/db.select.qgm

@@ -6,6 +6,5 @@
 	<option key="database" answer="$GISDBASE/$LOCATION_NAME/$MAPSET/dbf/" />
 	<option key="driver" />
 	<option key="sql" />
-	<option key="fs" answer="|" hidden="yes" version_max="6"/>
-	<option key="separator" answer="|" hidden="yes" version_min="7"/>
+  <option key="separator" answer="|" hidden="yes"/>
 </qgisgrassmodule>

src/plugins/grass/modules/g.region.multiple.raster.qgm

@@ -2,6 +2,5 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Set the region to match multiple rasters" module="g.region">
-	<option key="rast" version_max="6.4"/>
-	<option key="raster" version_min="7.0"/>
+  <option key="raster"/>
 </qgisgrassmodule>

src/plugins/grass/modules/g.region.multiple.vector.qgm

@@ -2,6 +2,5 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Set the region to match multiple vectors" module="g.region">
-	<option key="vect" version_max="6.4"/>
-	<option key="vector" version_min="7.0"/>
+  <option key="vector"/>
 </qgisgrassmodule>