GRASS GIS 8 dev: version bump to grass81 (OSGeo#2084)

* GRASS GIS 8 dev: version bump to grass81: Completes 029cd8e * grass80 -> grass81 updates in HTML pages, Dockerfiles and other files across the code tree * HTML: change https://grass.osgeo.org/grass81/ to https://grass.osgeo.org/grass-devel/
mabdazzam · Jan 13, 2022 · 15d6526 · 15d6526
1 parent 2194c7d
commit 15d6526
Show file tree

Hide file tree

Showing 27 changed files with 60 additions and 59 deletions.
diff --git a/INSTALL b/INSTALL
@@ -45,16 +45,17 @@ GRASS source code is currently distributed in 2 forms:
   The Full source code version contains all the GRASS source code
   required for compilation. It is distributed as one file (*.tar.gz
   package) and the version is composed of 3 numbers, e.g. 8.0.0, 8.0.1
-  etc.
+  etc. See
+  https://github.com/OSGeo/grass/releases
 
 2) Snapshots of source code (generated from GitHub)
 
   This version of the source code can be acquired either from the GitHub
   repository (https://github.com/OSGeo/grass/) or as a auto-generated snapshot
   (*.tar.gz package) of the GitHub repository. The snapshot name
   contains the date when the snapshot was created (checked out from
-  the GitHub repository), e.g. grass-8.0.git_src_snapshot_2021_06_12.tar.gz
-  from https://grass.osgeo.org/grass80/source/snapshot/
+  the GitHub repository), e.g. grass-8.1.git_src_snapshot_2022_01_12.tar.gz
+  from https://grass.osgeo.org/grass-devel/source/snapshot/
   Further instructions at https://trac.osgeo.org/grass/wiki/DownloadSource
 
 
@@ -276,7 +277,7 @@ https://grasswiki.osgeo.org/wiki/GRASS_Debugging
 
 (K) LARGE FILE SUPPORT (for raster maps)
 
-GRASS >= 7.0.0 includes improved support for reading and writing large files
+GRASS GIS includes improved support for reading and writing large files
 (> 2GB) if it is possible in your operating system. If you compile with
   configure [...] --enable-largefile
 you should be able to have raster and vector maps which are larger than 2GB.
@@ -310,9 +311,9 @@ Please see ./SUBMITTING in this directory, or better,
 https://trac.osgeo.org/grass/wiki/Submitting
 
 
-(O) DRAFT TUTORIAL
+(O) TUTORIALS
 
-https://grass.osgeo.org/documentation/first-time-users/
+https://grass.osgeo.org/learn/newcomers/
 
 ------------------
 (C) 1999-2022 by The GRASS Development Team
diff --git a/display/d.mon/main.c b/display/d.mon/main.c
@@ -20,7 +20,7 @@
 
  [1] display/d.mon/render_cmd.py
  [2] lib/display/r_raster.c
- [3] https://grass.osgeo.org/grass80/manuals/displaydrivers.html
+ [3] https://grass.osgeo.org/grass-devel/manuals/displaydrivers.html
 
 */
 

diff --git a/doc/howto_release.md b/doc/howto_release.md
@@ -309,7 +309,7 @@ Software pages:
 
 #### Only in case of new major release
 
-- update cronjob '[cron_grass_HEAD_src_snapshot.sh](https://github.com/OSGeo/grass-addons/tree/master/utils/cronjobs_osgeo_lxd)' on grass.osgeo.org to next
+- update cronjob '[cron_grass_HEAD_src_snapshot.sh](https://github.com/OSGeo/grass-addons/tree/grass8/utils/cronjobs_osgeo_lxd)' on grass.osgeo.org to next
   but one release tag for the differences
 - wiki updates, only when new major release:
     - {{cmd|xxxx}} macro: <https://grasswiki.osgeo.org/wiki/Template:Cmd>

diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile
@@ -169,13 +169,13 @@ RUN echo "  => Configure and compile grass" && \
     ldconfig /etc/ld.so.conf.d
 
 # Reduce the image size - Remove unnecessary grass files
-RUN cp /usr/local/grass80/gui/wxpython/xml/module_items.xml module_items.xml; \
-    rm -rf /usr/local/grass80/demolocation; \
-    rm -rf /usr/local/grass80/fonts; \
-    rm -rf /usr/local/grass80/gui; \
-    rm -rf /usr/local/grass80/share; \
-    mkdir -p /usr/local/grass80/gui/wxpython/xml/; \
-    mv module_items.xml /usr/local/grass80/gui/wxpython/xml/module_items.xml;
+RUN cp /usr/local/grass81/gui/wxpython/xml/module_items.xml module_items.xml; \
+    rm -rf /usr/local/grass81/demolocation; \
+    rm -rf /usr/local/grass81/fonts; \
+    rm -rf /usr/local/grass81/gui; \
+    rm -rf /usr/local/grass81/share; \
+    mkdir -p /usr/local/grass81/gui/wxpython/xml/; \
+    mv module_items.xml /usr/local/grass81/gui/wxpython/xml/module_items.xml;
 
 
 FROM common as grass

diff --git a/docker/alpine/Dockerfile_alpine_latest b/docker/alpine/Dockerfile_alpine_latest
@@ -170,10 +170,10 @@ RUN echo "  => Configure and compile grass";\
     rm -rf /var/cache/apk/*; \
     rm -rf /root/.cache; \
     # Remove unnecessary grass files
-    rm -rf /usr/local/grass80/demolocation; \
-    rm -rf /usr/local/grass80/fonts; \
-    rm -rf /usr/local/grass80/gui; \
-    rm -rf /usr/local/grass80/share;
+    rm -rf /usr/local/grass81/demolocation; \
+    rm -rf /usr/local/grass81/fonts; \
+    rm -rf /usr/local/grass81/gui; \
+    rm -rf /usr/local/grass81/share;
 
 
 # Unset environmental variables to avoid later compilation issues

diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile
@@ -209,7 +209,7 @@ ENV LC_ALL "en_US.UTF-8"
 ENV GRASS_SKIP_MAPSET_OWNER_CHECK 1
 
 # Create generic GRASS GIS lib name regardless of version number
-RUN ln -sf /usr/local/grass80 /usr/local/grass
+RUN ln -sf /usr/local/grass81 /usr/local/grass
 
 # show GRASS GIS, PROJ, GDAL etc versions
 RUN grass --tmp-location EPSG:4326 --exec g.version -rge && \

diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile
@@ -201,7 +201,7 @@ ENV LC_ALL "en_US.UTF-8"
 ENV GRASS_SKIP_MAPSET_OWNER_CHECK 1
 
 # Create generic GRASS GIS lib name regardless of version number
-RUN ln -sf /usr/local/grass80 /usr/local/grass
+RUN ln -sf /usr/local/grass81 /usr/local/grass
 
 # show GRASS GIS, PROJ, GDAL etc versions
 RUN grass --tmp-location EPSG:4326 --exec g.version -rge && \

diff --git a/general/g.findfile/g.findfile.html b/general/g.findfile/g.findfile.html
@@ -75,7 +75,7 @@ <h3>SHELL</h3>
 
 <h3>PYTHON</h3>
 
-See <em><a href="https://grass.osgeo.org/grass80/manuals/libpython/">Python
+See <em><a href="https://grass.osgeo.org/grass-devel/manuals/libpython/">Python
 Scripting Library</a></em> for more info.
 <p>
 Note: The Python tab in the <em>wxGUI</em> can be used for entering the

diff --git a/general/g.message/g.message.html b/general/g.message/g.message.html
@@ -47,7 +47,7 @@ <h2>NOTES</h2>
 
 <h3>Usage in Python scripts</h3>
 
-<a href="https://grass.osgeo.org/grass80/manuals/libpython/">GRASS
+<a href="https://grass.osgeo.org/grass-devel/manuals/libpython/">GRASS
 Python Scripting Library</a> defines special wrappers
 for <em>g.message</em>.
 

diff --git a/grasslib.dox b/grasslib.dox
@@ -52,7 +52,7 @@ href="https://grass.osgeo.org">https://grass.osgeo.org</a>
  - gis: \ref gislib
  - raster: \ref rasterlib
  - vector: \ref vectorlib
- - Temporal GIS API: See https://grass.osgeo.org/grass80/manuals/libpython/temporal_framework.html
+ - Temporal GIS API: See https://grass.osgeo.org/grass-devel/manuals/libpython/temporal_framework.html
 
 \section libs Further libraries
 
@@ -113,7 +113,7 @@ href="https://grass.osgeo.org">https://grass.osgeo.org</a>
 
 \subsection pythonlibs Python API
 
- - python:	See GRASS GIS Python library (https://grass.osgeo.org/grass80/manuals/libpython/)
+ - python:	See GRASS GIS Python library (https://grass.osgeo.org/grass-devel/manuals/libpython/)
 
 \subsection projlibs Projection Libraries
 

diff --git a/gui/wxpython/xml/menudata.README b/gui/wxpython/xml/menudata.README
@@ -2,7 +2,7 @@ MENU
 - the entries in menudata.xml and module_tree_menudata.xml are autogenerated 
   via tools/build_modules_xml.py (see ../Makefile)
 - Find more info at
-  https://grass.osgeo.org/grass80/manuals/wxGUI.toolboxes.html
+  https://grass.osgeo.org/grass-devel/manuals/wxGUI.toolboxes.html
   (../docs/wxgui_sphinx/src/)
 - additionally
   https://trac.osgeo.org/grass/wiki/wxGUIDevelopment/Toolboxes
diff --git a/lib/gis/parser_wps.c b/lib/gis/parser_wps.c
@@ -578,7 +578,7 @@ static void wps_print_process_description_begin(int store, int status, const cha
     if(abstract)
     {
         fprintf(stdout,"\t\t<ows:Abstract>");
-        fprintf(stdout, "https://grass.osgeo.org/grass80/manuals/%s.html", identifier);
+        fprintf(stdout, "https://grass.osgeo.org/grass-devel/manuals/%s.html", identifier);
         fprintf(stdout, "</ows:Abstract>\n");
     }
 

diff --git a/lib/gpde/gpdelib.dox b/lib/gpde/gpdelib.dox
@@ -223,7 +223,7 @@ void #N_write_array_2d_to_rast (N_array_2d * array, char *name);
 
 <P>
 <b>Example implementation:</b><br>
-The GRASS module <a href="https://grass.osgeo.org/grass80/manuals/r.gwflow.html">r.gwflow</a>
+The GRASS module <a href="https://grass.osgeo.org/grass-devel/manuals/r.gwflow.html">r.gwflow</a>
 implements numerical calculation program for transient,
 confined and unconfined groundwater flow in two dimensions.
 
@@ -294,7 +294,7 @@ void #N_write_array_3d_to_rast3d (N_array_3d * array, char *name, int mask);
 
 <P>
 <b>Example implementation:</b><br>
-The GRASS module <a href="http://grass.itc.it/grass80/manuals/r3.gwflow.html">r3.gwflow</a>
+The GRASS module <a href="http://grass.osgeo.org/grass-devel/manuals/r3.gwflow.html">r3.gwflow</a>
 implements numerical calculation program for transient, confined
 groundwater flow in three dimensions.
 

diff --git a/locale/README b/locale/README
@@ -123,8 +123,8 @@ GENERAL TRANSLATION PROCEDURE (no programming required)
  see also: https://grasswiki.osgeo.org/wiki/GRASS_messages_translation#Get_the_translated_po_files
 
 [1] .pot files are auto-generated on grass.osgeo.org and
-    stored in https://grass.osgeo.org/grass80/binary/linux/snapshot/transifex/
-     --> cronjob (on grasslxd container): /home/neteler/cronjobs/cron_grass8_HEAD_build_bins.sh
+    stored in https://grass.osgeo.org/grass-devel/binary/linux/snapshot/transifex/
+     --> cronjob (on grasslxd container): /home/neteler/cronjobs/cron_grass8_main_src_snapshot.sh
 
 [2] Transifex job copies daily from [1] to here: 
 	https://www.transifex.com/grass-gis/grass7/dashboard/

diff --git a/man/build_graphical_index.py b/man/build_graphical_index.py
@@ -100,7 +100,7 @@ def std_img_name(name):
     ("wxGUI_graphical.html", std_img_name("gui"), "GUI"),
     ("wxGUI.nviz.html", std_img_name("3dview"), "3D view"),
     (
-        "https://grass.osgeo.org/grass80/manuals/libpython/index.html",
+        "https://grass.osgeo.org/grass-devel/manuals/libpython/index.html",
         std_img_name("python"),
         "Python",
     ),

diff --git a/man/sphinx/Makefile b/man/sphinx/Makefile
@@ -77,17 +77,17 @@ qthelp:
 	@echo
 	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
 	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/GRASS80Documentation.qhcp"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/GRASS81Documentation.qhcp"
 	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/GRASS80Documentation.qhc"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/GRASS81Documentation.qhc"
 
 devhelp:
 	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
 	@echo
 	@echo "Build finished."
 	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/GRASS80Documentation"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/GRASS80Documentation"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/GRASS81Documentation"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/GRASS81Documentation"
 	@echo "# devhelp"
 
 epub:

diff --git a/man/sphinx/conf.py b/man/sphinx/conf.py
@@ -1,5 +1,5 @@
 #
-# GRASS GIS 8.0 Documentation documentation build configuration file, created by
+# GRASS GIS 8.1 Documentation documentation build configuration file, created by
 # sphinx-quickstart on Thu Aug  9 17:16:28 2012.
 #
 # This file is execfile()d with the current directory set to its containing dir.
@@ -37,15 +37,15 @@
 master_doc = "index"
 
 # General information about the project.
-project = "GRASS GIS 8.0 Documentation"
+project = "GRASS GIS 8.1 Documentation"
 copyright = "2022, GRASS Development Team"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = "8.0"
+version = "8.1"
 # The full version, including alpha/beta/rc tags.
 release = "dev"
 
@@ -161,7 +161,7 @@
 # html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = "grass80Documentationdoc"
+htmlhelp_basename = "grass81Documentationdoc"
 
 
 # -- Options for LaTeX output --------------------------------------------------
@@ -180,8 +180,8 @@
 latex_documents = [
     (
         "content",
-        "grass80Documentation.tex",
-        "GRASS GIS 8.0 Documentation",
+        "grass81Documentation.tex",
+        "GRASS GIS 8.1 Documentation",
         "GRASS Development Team",
         "manual",
     ),
@@ -215,8 +215,8 @@
 man_pages = [
     (
         "content",
-        "grass80documentation",
-        "GRASS GIS 8.0 Documentation",
+        "grass81documentation",
+        "GRASS GIS 8.1 Documentation",
         ["GRASS Development Team"],
         1,
     )
@@ -234,10 +234,10 @@
 texinfo_documents = [
     (
         "content",
-        "grass80Documentation",
-        "GRASS GIS 8.0 Documentation",
+        "grass81Documentation",
+        "GRASS GIS 8.1 Documentation",
         "GRASS Development Team",
-        "grass80Documentation",
+        "grass81Documentation",
         "One line description of project.",
         "Miscellaneous",
     ),
@@ -256,7 +256,7 @@
 # -- Options for Epub output ---------------------------------------------------
 
 # Bibliographic Dublin Core info.
-epub_title = "GRASS GIS 8.0 Documentation"
+epub_title = "GRASS GIS 8.1 Documentation"
 epub_author = "GRASS Development Team"
 epub_publisher = "GRASS Development Team"
 epub_copyright = "2022, GRASS Development Team"

diff --git a/man/sphinx/make.bat b/man/sphinx/make.bat
@@ -99,9 +99,9 @@ if "%1" == "qthelp" (
 	echo.
 	echo.Build finished; now you can run "qcollectiongenerator" with the ^
 .qhcp project file in %BUILDDIR%/qthelp, like this:
-	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\GRASS80Documentation.qhcp
+	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\GRASS81Documentation.qhcp
 	echo.To view the help file:
-	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\GRASS80Documentation.ghc
+	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\GRASS81Documentation.ghc
 	goto end
 )
 

diff --git a/mswindows/Installer-Files/WinGRASS-README.url b/mswindows/Installer-Files/WinGRASS-README.url
@@ -1,5 +1,5 @@
 [InternetShortcut]
-URL=https://grass.osgeo.org/grass80/binary/mswindows/native/README.html
+URL=https://grass.osgeo.org/grass-devel/binary/mswindows/native/README.html
 IDList=
 IconFile=https://grass.osgeo.org/images/favicon/favicon.ico
 IconIndex=1

diff --git a/mswindows/crosscompile.sh b/mswindows/crosscompile.sh
@@ -61,7 +61,7 @@ Usage: crosscompile.sh [OPTIONS]
                              (default: /usr/include/freetype2)
     --update                 update the current branch
     --package                package the cross-compiled build as
-                             grass80-x86_64-w64-mingw32-YYYYMMDD.zip
+                             grass81-x86_64-w64-mingw32-YYYYMMDD.zip
 EOT
 		exit
 		;;

diff --git a/python/grass/docs/src/pygrass_gis.rst b/python/grass/docs/src/pygrass_gis.rst
@@ -14,7 +14,7 @@ These classes are used to manage the infrastructure of GRASS database:
 GIS data directory, Location and Mapset. Details about the GRASS GIS
 database management (locations and mapsets) can be found in the `GRASS
 GIS 7 User's Manual: GRASS GIS Quickstart
-<https://grass.osgeo.org/grass80/manuals/helptext.html>`_.
+<https://grass.osgeo.org/grass-devel/manuals/helptext.html>`_.
 
 .. _Region-label:
 

diff --git a/python/grass/gunittest/README.md b/python/grass/gunittest/README.md
@@ -2,4 +2,4 @@
 
 For more information on the test suite and unit tests, visit:
 
-https://grass.osgeo.org/grass80/manuals/libpython/gunittest_testing.html
+https://grass.osgeo.org/grass-devel/manuals/libpython/gunittest_testing.html
diff --git a/python/grass/pygrass/modules/shortcuts.py b/python/grass/pygrass/modules/shortcuts.py
@@ -68,7 +68,7 @@ def __getattr__(self, name):
         return self.cls("%s.%s" % (self.prefix, name.strip("_").replace("_", ".")))
 
 
-# https://grass.osgeo.org/grass80/manuals/full_index.html
+# https://grass.osgeo.org/grass-devel/manuals/full_index.html
 # [ d.* | db.* | g.* | i.* | m.* | ps.* | r.* | r3.* | t.* | v.* ]
 #
 #  d.*	display commands

diff --git a/python/grass/script/core.py b/python/grass/script/core.py
@@ -932,7 +932,7 @@ def parser():
     "flags" are Python booleans.
 
     Overview table of parser standard options:
-    https://grass.osgeo.org/grass80/manuals/parser_standard_options.html
+    https://grass.osgeo.org/grass-devel/manuals/parser_standard_options.html
     """
     if not os.getenv("GISBASE"):
         print("You must be in GRASS GIS to run this program.", file=sys.stderr)

diff --git a/testsuite/README.md b/testsuite/README.md
@@ -1,6 +1,6 @@
 This directory contains scripts to check some functionality of GRASS GIS.
 
-GRASS GIS testsuite documentation: https://grass.osgeo.org/grass80/manuals/libpython/gunittest_testing.html
+GRASS GIS testsuite documentation: https://grass.osgeo.org/grass-devel/manuals/libpython/gunittest_testing.html
 
 ## Simple test data
 

diff --git a/testsuite/examples/test_framework_GRASS_GIS_with_NC.sh b/testsuite/examples/test_framework_GRASS_GIS_with_NC.sh
@@ -6,7 +6,7 @@
 # PURPOSE:      Test GRASS GIS using the test framework
 #               Documentation:
 #                 https://trac.osgeo.org/grass/wiki/GSoC/2014/TestingFrameworkForGRASS
-#                 https://grass.osgeo.org/grass80/manuals/libpython/gunittest_running_tests.html#example-bash-script-to-run-be-used-as-a-cron-job
+#                 https://grass.osgeo.org/grass-devel/manuals/libpython/gunittest_running_tests.html#example-bash-script-to-run-be-used-as-a-cron-job
 #
 #               Data:
 #                 We use the full NC dataset (nc_spm_full_v2_alpha.tar.gz)

diff --git a/vector/v.info/v.info.html b/vector/v.info/v.info.html
@@ -134,7 +134,7 @@ <h3>Basic metadata information in shell script style</h3>
 
 <h2>PYTHON</h2>
 
-See <em><a href="https://grass.osgeo.org/grass80/manuals/libpython/">Python
+See <em><a href="https://grass.osgeo.org/grass-stable/manuals/libpython/">Python
 Scripting Library</a></em> for more info.
 <p>
 Note: The Python tab in the <em>wxGUI</em> can be used for entering the
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		For more information on the test suite and unit tests, visit:

		https://grass.osgeo.org/grass80/manuals/libpython/gunittest_testing.html
		https://grass.osgeo.org/grass-devel/manuals/libpython/gunittest_testing.html