[GRASS-SVN] r73215 - in grass/branches/releasebranch_7_6: . display/d.mon doc general/g.findfile general/g.message gui/icons gui/wxpython gui/wxpython/docs gui/wxpython/xml imagery/i.topo.corr lib/gis lib/gpde lib/init lib/python/docs/src lib/python/gunittest lib/python/pygrass/modules lib/python/script locale man man/sphinx mswindows/Installer-Files temporal/t.rast.accumulate vector/v.info
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Aug 31 08:01:16 PDT 2018
Author: neteler
Date: 2018-08-31 08:01:15 -0700 (Fri, 31 Aug 2018)
New Revision: 73215
Modified:
grass/branches/releasebranch_7_6/INSTALL
grass/branches/releasebranch_7_6/README
grass/branches/releasebranch_7_6/display/d.mon/main.c
grass/branches/releasebranch_7_6/doc/grass_database.html
grass/branches/releasebranch_7_6/doc/howto_release.txt
grass/branches/releasebranch_7_6/general/g.findfile/g.findfile.html
grass/branches/releasebranch_7_6/general/g.message/g.message.html
grass/branches/releasebranch_7_6/grasslib.dox
grass/branches/releasebranch_7_6/gui/icons/grass.desktop
grass/branches/releasebranch_7_6/gui/wxpython/README
grass/branches/releasebranch_7_6/gui/wxpython/docs/wxGUI.html
grass/branches/releasebranch_7_6/gui/wxpython/xml/menudata.README
grass/branches/releasebranch_7_6/imagery/i.topo.corr/test_i.topo.corr_synthetic_DEM_NC.sh
grass/branches/releasebranch_7_6/lib/gis/parser_wps.c
grass/branches/releasebranch_7_6/lib/gpde/gpdelib.dox
grass/branches/releasebranch_7_6/lib/init/README
grass/branches/releasebranch_7_6/lib/init/grass.sh
grass/branches/releasebranch_7_6/lib/init/grass7.html
grass/branches/releasebranch_7_6/lib/init/helptext.html
grass/branches/releasebranch_7_6/lib/python/docs/src/gunittest_running_tests.rst
grass/branches/releasebranch_7_6/lib/python/docs/src/pygrass_gis.rst
grass/branches/releasebranch_7_6/lib/python/gunittest/multirunner.py
grass/branches/releasebranch_7_6/lib/python/pygrass/modules/shortcuts.py
grass/branches/releasebranch_7_6/lib/python/script/core.py
grass/branches/releasebranch_7_6/lib/python/script/setup.py
grass/branches/releasebranch_7_6/locale/README
grass/branches/releasebranch_7_6/man/build_graphical_index.py
grass/branches/releasebranch_7_6/man/sphinx/conf.py
grass/branches/releasebranch_7_6/mswindows/Installer-Files/WinGRASS-README.url
grass/branches/releasebranch_7_6/temporal/t.rast.accumulate/t.rast.accumulate.html
grass/branches/releasebranch_7_6/vector/v.info/v.info.html
Log:
version bump: grass75 -> grass76 related updates
Modified: grass/branches/releasebranch_7_6/INSTALL
===================================================================
--- grass/branches/releasebranch_7_6/INSTALL 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/INSTALL 2018-08-31 15:01:15 UTC (rev 73215)
@@ -54,7 +54,7 @@
(*.tar.gz package) of that SVN repository. The SVN snapshot name
contains the date when the snapshot was created (checked out from
the SVN repository), e.g. grass-7.2.svn_src_snapshot_2016_06_11.tar.gz
- from https://grass.osgeo.org/grass75/source/snapshot/
+ from https://grass.osgeo.org/grass76/source/snapshot/
Further instructions at https://trac.osgeo.org/grass/wiki/DownloadSource
@@ -151,16 +151,16 @@
After compilation, the resulting code is stored in the directory
./dist.$ARCH
-and the scripts (grass75, ...) in
+and the scripts (grass76, ...) in
./bin.$ARCH
To run GRASS, simply start
- ./bin.$ARCH/grass75
+ ./bin.$ARCH/grass76
or run
make install
- grass75
+ grass76
(E) INSTALLATION ON MACOSX
Modified: grass/branches/releasebranch_7_6/README
===================================================================
--- grass/branches/releasebranch_7_6/README 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/README 2018-08-31 15:01:15 UTC (rev 73215)
@@ -48,7 +48,7 @@
make pdfdocs
An online version is available at:
-http://grass.osgeo.org/programming7/
+https://grass.osgeo.org/programming7/
## Docker
@@ -55,26 +55,26 @@
Build using the downloaded source code (in the directory with the
source code):
- docker build -t grassgis75 .
+ docker build -t grassgis76 .
A test run (assuming you have existing GRASS GIS location; it can be downloaded from
https://grass.osgeo.org/sampledata/north_carolina/nc_basic_spm_grass7.zip)
# case 1: launching in the grassdata directory in which the location is stored:
- docker run -it --rm --user=$(id -u):$(id -g) --volume $(pwd):/data --env HOME=/data/ grassgis75 \
+ docker run -it --rm --user=$(id -u):$(id -g) --volume $(pwd):/data --env HOME=/data/ grassgis76 \
grass --text nc_spm_08_grass7/user1 --exec g.region -p
# case 2: launching anywhere
- docker run -it --rm --user=$(id -u):$(id -g) --volume /your/test/grassdata/:/data --env HOME=/data/ grassgis75 \
+ docker run -it --rm --user=$(id -u):$(id -g) --volume /your/test/grassdata/:/data --env HOME=/data/ grassgis76 \
grass /data/nc_basic_spm/PERMANENT --exec g.region -p
-Note that the first `grassgis75` is the name of the image while the second
+Note that the first `grassgis76` is the name of the image while the second
`grass` is the name of the executable.
To run the tests (again assuming local location):
docker run -it --rm --user=$(id -u):$(id -g) --volume /your/test/grassdata/:/data --env HOME=/data/ -w /code/grass \
- grassgis75 grass /data/nc_basic_spm/PERMANENT --exec \
+ grassgis76 grass /data/nc_basic_spm/PERMANENT --exec \
python -m grass.gunittest.main \
--location nc_basic_spm --location-type nc
Modified: grass/branches/releasebranch_7_6/display/d.mon/main.c
===================================================================
--- grass/branches/releasebranch_7_6/display/d.mon/main.c 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/display/d.mon/main.c 2018-08-31 15:01:15 UTC (rev 73215)
@@ -20,7 +20,7 @@
[1] https://trac.osgeo.org/grass/browser/grass/trunk/display/d.mon/render_cmd.py
[2] https://trac.osgeo.org/grass/browser/grass/trunk/lib/display/r_raster.c#L107
- [3] https://grass.osgeo.org/grass75/manuals/displaydrivers.html
+ [3] https://grass.osgeo.org/grass76/manuals/displaydrivers.html
*/
Modified: grass/branches/releasebranch_7_6/doc/grass_database.html
===================================================================
--- grass/branches/releasebranch_7_6/doc/grass_database.html 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/doc/grass_database.html 2018-08-31 15:01:15 UTC (rev 73215)
@@ -222,7 +222,7 @@
in a given Mapset with only command line interface:
<div class="code"><pre>
-grass75 -text ~/grassdata/mylocation/mymapset
+grass76 -text ~/grassdata/mylocation/mymapset
</pre></div>
And the following will create the given Location with projection given
@@ -230,7 +230,7 @@
(GUI or command line):
<div class="code"><pre>
-grass75 -c EPSG:5514:3 ~/grassdata/mylocation
+grass76 -c EPSG:5514:3 ~/grassdata/mylocation
</pre></div>
See <a href="grass7.html"><em>grass</em></a> command manual for more details.
Modified: grass/branches/releasebranch_7_6/doc/howto_release.txt
===================================================================
--- grass/branches/releasebranch_7_6/doc/howto_release.txt 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/doc/howto_release.txt 2018-08-31 15:01:15 UTC (rev 73215)
@@ -191,8 +191,8 @@
# write announcement
- store in trac:
- https://trac.osgeo.org/grass/wiki/Release/7.4.x-News
- https://trac.osgeo.org/grass/wiki/Grass7/NewFeatures74 <- add content of major changes only
+ https://trac.osgeo.org/grass/wiki/Release/7.6.x-News
+ https://trac.osgeo.org/grass/wiki/Grass7/NewFeatures76 <- add content of major changes only
- update version in https://grasswiki.osgeo.org/wiki/GRASS-Wiki
- store in Web as announces/announce_grass$MAJOR$MINOR$RELEASE.html <- how? with protected PHP upload page? (dropped since CMS)
@@ -227,11 +227,11 @@
- Update addons (grass_addons.sh) rules, eg.
- compile $SVN_PATH/grass7 $GISBASE_PATH/grass740RC1 $ADDON_PATH/grass740RC1/addons
+ compile $SVN_PATH/grass7 $GISBASE_PATH/grass760RC1 $ADDON_PATH/grass760RC1/addons
- Modify grass_copy_wwwroot.sh accordingly, eg.
- copy_addon 741RC1 7.4.1RC1
+ copy_addon 761RC1 7.666666.1RC1
# Launchpad notes:
@@ -305,23 +305,24 @@
1. see SVN book:
http://svnbook.red-bean.com/en/1.1/ch04s07.html
- GRASS 7.4 release branch:
- BRANCH=releasebranch_7_4
- URL=https://svn.osgeo.org/grass
- svn copy $URL/grass/trunk \
- $URL/grass/branches/$BRANCH \
- -m "Release branch for GRASS 7.4.x"
+ GRASS 7.6 release branch:
+# see below for real example
+# BRANCH=releasebranch_7_6
+# URL=https://svn.osgeo.org/grass
+# svn copy $URL/grass/trunk \
+# $URL/grass/branches/$BRANCH \
+# -m "Release branch for GRASS 7.6.x"
- Switching current local copy to above development branch:
- (http://svnbook.red-bean.com/en/1.1/ch04s05.html)
- cd /path/to/your/local/copy/trunk
- svn switch https://svn.osgeo.org/grass/grass/branches/releasebranch_7_4 .
+Branch creation example: GRASS GIS 7.6 release branch creation
+svn copy https://svn.osgeo.org/grass/grass/trunk/ \
+ https://svn.osgeo.org/grass/grass/branches/releasebranch_7_6 \
+ -m "Release branch for GRASS GIS 7.6.x"
+
----------
-Example: GRASS GIS 7.4 release branch creation
+Switching current local copy to above development branch:
+ (http://svnbook.red-bean.com/en/1.1/ch04s05.html)
-svn copy https://svn.osgeo.org/grass/grass/trunk/ \
- https://svn.osgeo.org/grass/grass/branches/releasebranch_7_4 \
- -m "Release branch for GRASS GIS 7.4.x"
-
+ cd /path/to/your/local/copy/trunk
+ svn switch https://svn.osgeo.org/grass/grass/branches/releasebranch_7_6 .
Modified: grass/branches/releasebranch_7_6/general/g.findfile/g.findfile.html
===================================================================
--- grass/branches/releasebranch_7_6/general/g.findfile/g.findfile.html 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/general/g.findfile/g.findfile.html 2018-08-31 15:01:15 UTC (rev 73215)
@@ -75,7 +75,7 @@
<h3>PYTHON</h3>
-See <em><a href="http://grass.osgeo.org/grass75/manuals/libpython/">Python
+See <em><a href="https://grass.osgeo.org/grass76/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
Modified: grass/branches/releasebranch_7_6/general/g.message/g.message.html
===================================================================
--- grass/branches/releasebranch_7_6/general/g.message/g.message.html 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/general/g.message/g.message.html 2018-08-31 15:01:15 UTC (rev 73215)
@@ -47,7 +47,7 @@
<h3>Usage in Python scripts</h3>
-<a href="http://grass.osgeo.org/grass75/manuals/libpython/">GRASS
+<a href="https://grass.osgeo.org/grass76/manuals/libpython/">GRASS
Python Scripting Library</a> defines special wrappers
for <em>g.message</em>.
Modified: grass/branches/releasebranch_7_6/grasslib.dox
===================================================================
--- grass/branches/releasebranch_7_6/grasslib.dox 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/grasslib.dox 2018-08-31 15:01:15 UTC (rev 73215)
@@ -1,10 +1,10 @@
/*! \mainpage GRASS GIS 7 Programmer's Manual
<!-- * doxygenized from "GRASS 5 Programmer's Manual"
by M. Neteler 2/2004
- * updated 8/2005, 2006-2008, 2010-2011, 2017
+ * updated 8/2005, 2006-2008, 2010-2011, 2017, 2018
-->
-<a href="http://grass.osgeo.org">GRASS GIS</a> (<b>Geographic
+<a href="https://grass.osgeo.org">GRASS GIS</a> (<b>Geographic
Resources Analysis Support System</b>) is an open source, free
software <em>Geographical Information System</em> (GIS) with raster,
topological %vector, image processing, and graphics production
@@ -51,7 +51,7 @@
- gis: \ref gislib
- raster: \ref rasterlib
- vector: \ref vectorlib
- - Temporal GIS API: See http://grass.osgeo.org/grass75/manuals/libpython/temporal_framework.html
+ - Temporal GIS API: See https://grass.osgeo.org/grass76/manuals/libpython/temporal_framework.html
\section libs Further libraries
@@ -112,7 +112,7 @@
\subsection pythonlibs Python API
- - python: See GRASS GIS Python library (http://grass.osgeo.org/grass75/manuals/libpython/)
+ - python: See GRASS GIS Python library (https://grass.osgeo.org/grass76/manuals/libpython/)
\subsection projlibs Projection Libraries
Modified: grass/branches/releasebranch_7_6/gui/icons/grass.desktop
===================================================================
--- grass/branches/releasebranch_7_6/gui/icons/grass.desktop 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/gui/icons/grass.desktop 2018-08-31 15:01:15 UTC (rev 73215)
@@ -47,8 +47,8 @@
GenericName[uk]=Геоінформаційна система
GenericName[uz]=Geografik axborot tizimi
Icon=grass
-TryExec=/usr/bin/grass75
-Exec=grass75
+TryExec=/usr/bin/grass76
+Exec=grass76
Terminal=true
Keywords=gis;spatial;geospatial;database;remote sensing;hydrology;vector;raster;visualization;maps;wms;wfs;ogc;osgeo;
Categories=Education;Science;Geoscience;Geography;
Modified: grass/branches/releasebranch_7_6/gui/wxpython/README
===================================================================
--- grass/branches/releasebranch_7_6/gui/wxpython/README 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/gui/wxpython/README 2018-08-31 15:01:15 UTC (rev 73215)
@@ -18,7 +18,7 @@
If you want to launch wxPython GUI automatically, start GRASS with
`-gui` parameter
-$ grass75 -gui
+$ grass76 -gui
3 - STARTUP FROM GRASS TERMINAL
Modified: grass/branches/releasebranch_7_6/gui/wxpython/docs/wxGUI.html
===================================================================
--- grass/branches/releasebranch_7_6/gui/wxpython/docs/wxGUI.html 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/gui/wxpython/docs/wxGUI.html 2018-08-31 15:01:15 UTC (rev 73215)
@@ -687,7 +687,7 @@
specifying the <tt>-gui</tt> (or <tt>-wxpython</tt>) switch:
<div class="code"><pre>
-grass75 -gui
+grass76 -gui
</pre></div>
@@ -707,11 +707,11 @@
</em>
<p>
-See also wxGUI <a href="http://grasswiki.osgeo.org/wiki/WxGUI">wiki</a>
+See also wxGUI <a href="https://grasswiki.osgeo.org/wiki/WxGUI">wiki</a>
page
-(especially various <a href="http://grasswiki.osgeo.org/wiki/WxGUI#Video_tutorials">video
+(especially various <a href="https://grasswiki.osgeo.org/wiki/WxGUI#Video_tutorials">video
tutorials</a>),
-and <a href="http://grasswiki.osgeo.org/wiki/Quick_wxGUI_tutorial">Quick
+and <a href="https://grasswiki.osgeo.org/wiki/Quick_wxGUI_tutorial">Quick
wxGUI Tutorial</a>.
<h2>AUTHORS</h2>
Modified: grass/branches/releasebranch_7_6/gui/wxpython/xml/menudata.README
===================================================================
--- grass/branches/releasebranch_7_6/gui/wxpython/xml/menudata.README 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/gui/wxpython/xml/menudata.README 2018-08-31 15:01:15 UTC (rev 73215)
@@ -2,7 +2,7 @@
- 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/grass75/manuals/wxGUI.toolboxes.html
+ https://grass.osgeo.org/grass76/manuals/wxGUI.toolboxes.html
(../docs/wxgui_sphinx/src/)
- additionally
https://trac.osgeo.org/grass/wiki/wxGUIDevelopment/Toolboxes
Modified: grass/branches/releasebranch_7_6/imagery/i.topo.corr/test_i.topo.corr_synthetic_DEM_NC.sh
===================================================================
--- grass/branches/releasebranch_7_6/imagery/i.topo.corr/test_i.topo.corr_synthetic_DEM_NC.sh 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/imagery/i.topo.corr/test_i.topo.corr_synthetic_DEM_NC.sh 2018-08-31 15:01:15 UTC (rev 73215)
@@ -3,7 +3,7 @@
# Script to test i.topo.corr with a synthetic map
#
# Use North Carolina location to test:
-# grass75 ~/grassdata/nc_spm_08_grass7/user1
+# grass76 ~/grassdata/nc_spm_08_grass7/user1
if test "$GISBASE" = ""; then
echo "You must be in GRASS to run this program."
Modified: grass/branches/releasebranch_7_6/lib/gis/parser_wps.c
===================================================================
--- grass/branches/releasebranch_7_6/lib/gis/parser_wps.c 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/lib/gis/parser_wps.c 2018-08-31 15:01:15 UTC (rev 73215)
@@ -578,7 +578,7 @@
if(abstract)
{
fprintf(stdout,"\t\t<ows:Abstract>");
- fprintf(stdout, "http://grass.osgeo.org/grass75/manuals/%s.html", identifier);
+ fprintf(stdout, "https://grass.osgeo.org/grass76/manuals/%s.html", identifier);
fprintf(stdout, "</ows:Abstract>\n");
}
Modified: grass/branches/releasebranch_7_6/lib/gpde/gpdelib.dox
===================================================================
--- grass/branches/releasebranch_7_6/lib/gpde/gpdelib.dox 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/lib/gpde/gpdelib.dox 2018-08-31 15:01:15 UTC (rev 73215)
@@ -223,7 +223,7 @@
<P>
<b>Example implementation:</b><br>
-The GRASS module <a href="http://grass.osgeo.org/grass75/manuals/r.gwflow.html">r.gwflow</a>
+The GRASS module <a href="https://grass.osgeo.org/grass76/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 @@
<P>
<b>Example implementation:</b><br>
-The GRASS module <a href="http://grass.itc.it/grass75/manuals/r3.gwflow.html">r3.gwflow</a>
+The GRASS module <a href="http://grass.itc.it/grass76/manuals/r3.gwflow.html">r3.gwflow</a>
implements numerical calculation program for transient, confined
groundwater flow in three dimensions.
Modified: grass/branches/releasebranch_7_6/lib/init/README
===================================================================
--- grass/branches/releasebranch_7_6/lib/init/README 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/lib/init/README 2018-08-31 15:01:15 UTC (rev 73215)
@@ -1,10 +1,10 @@
o GRASS text mode startup
- "grass75" starts up d.m by default (if not first time user).
- "grass75 -text" will start up in text mode.
- "grass75 -wxpython" or "grass75 -gui" will start up in wxpython mode.
+ "grass76" starts up d.m by default (if not first time user).
+ "grass76 -text" will start up in text mode.
+ "grass76 -wxpython" or "grass76 -gui" will start up in wxpython mode.
- You can use alias "grass75" to "grass75 -text" to use text mode by default.
+ You can use alias "grass76" to "grass76 -text" to use text mode by default.
Or set env var GRASS_GUI=text.
@@ -25,7 +25,7 @@
export LOCATION_NAME=loc1
export MAPSET=map1
- grass75 - # non-interactive startup using LOCATION location
+ grass76 - # non-interactive startup using LOCATION location
ex2)
export GISDBASE=/usr/home/grass/usr/data1
@@ -32,11 +32,11 @@
export LOCATION_NAME=loc1
export MAPSET=map1
- grass75 - # non-interactive startup using
+ grass76 - # non-interactive startup using
# GISDBASE/LOCATION_NAME/MAPSET location
- Also, the first argument of grass75 can override these env vars.
+ Also, the first argument of grass76 can override these env vars.
ex3)
export LOCATION=/usr/home/grass/usr/data1/loc1/map1
@@ -44,7 +44,7 @@
export LOCATION_NAME=loc1
export MAPSET=map1
- grass75 /usr/home/grass/usr/data2/loc2-1/map1-1
+ grass76 /usr/home/grass/usr/data2/loc2-1/map1-1
# non-interactive startup using
# /usr/home/grass/usr/data2/loc2-1/map1-1 location
@@ -53,7 +53,7 @@
export LOCATION_NAME=loc1
export MAPSET=map1
- grass75 /usr/home/grass/usr/data2/loc2-1/map1-1
+ grass76 /usr/home/grass/usr/data2/loc2-1/map1-1
# non-interactive startup using
# /usr/home/grass/usr/data2/loc2-1/map1-1 location
@@ -63,7 +63,7 @@
export LOCATION_NAME=loc1
export MAPSET=map1
- grass75 map1-1 # non-interactive startup using
+ grass76 map1-1 # non-interactive startup using
# GISDBASE/LOCATION_NAME/map1-1 location
ex6)
@@ -72,7 +72,7 @@
export LOCATION_NAME=loc1
export MAPSET=map1
- grass75 loc2-1/map1-1
+ grass76 loc2-1/map1-1
# non-interactive startup using
# GISDBASE/loc2-1/map1-1 location
Modified: grass/branches/releasebranch_7_6/lib/init/grass.sh
===================================================================
--- grass/branches/releasebranch_7_6/lib/init/grass.sh 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/lib/init/grass.sh 2018-08-31 15:01:15 UTC (rev 73215)
@@ -28,4 +28,4 @@
fi
export GRASS_PYTHON
-exec "$GRASS_PYTHON" "@BINDIR@/grass75.py" "$@" &
+exec "$GRASS_PYTHON" "@BINDIR@/grass76.py" "$@" &
Modified: grass/branches/releasebranch_7_6/lib/init/grass7.html
===================================================================
--- grass/branches/releasebranch_7_6/lib/init/grass7.html 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/lib/init/grass7.html 2018-08-31 15:01:15 UTC (rev 73215)
@@ -2,7 +2,7 @@
<h2>SYNOPSIS</h2>
-<b>grass75</b> [<b>-h</b> | <b>-help</b> | <b>--help</b>] [<b>-v</b> | <b>--version</b>]
+<b>grass76</b> [<b>-h</b> | <b>-help</b> | <b>--help</b>] [<b>-v</b> | <b>--version</b>]
[<b>-c</b> | <b>-c geofile</b> | <b>-c EPSG:code[:datum_trans]</b>]
[<b>-text</b> | <b>-gtext</b> | <b>-gui</b>]
[[[<b><GISDBASE>/</b>]<b><LOCATION_NAME>/</b>]
@@ -94,13 +94,13 @@
<p>The startup program will remember both the desired user interface
and mapset. Thus, the next time the user runs GRASS, typing
-<em>grass75</em> (without any options) will start GRASS with the
+<em>grass76</em> (without any options) will start GRASS with the
previous settings for the user interface and mapset selected.
<p>If you specify a graphical user interface (<b>-gui</b>)
-the <em>grass75</em> program will try to verify that the system you
+the <em>grass76</em> program will try to verify that the system you
specified exists and that you can access it successfully. If any of
-these checks fail then <em>grass75</em> will automatically switch back
+these checks fail then <em>grass76</em> will automatically switch back
to the text user interface mode.
<h2>SAMPLE DATA</h2>
@@ -136,14 +136,14 @@
<h3>User Interface Environment Variable</h3>
-<p>The <em>grass75</em> program will check for the existence of an
+<p>The <em>grass76</em> program will check for the existence of an
environment variable called GRASS_GUI which indicates the type of user
interface for GRASS to use. If this variable is not set
-when <em>grass75</em> is run, then it will be created and then saved
+when <em>grass76</em> is run, then it will be created and then saved
in the <tt>$HOME/.grass7/rc</tt> file for the next time GRASS is
run. It can be set to <tt>text</tt>, <tt>gtext</tt> or <tt>gui</tt>.
-<p>There is an order of precedence in the way <em>grass75</em>
+<p>There is an order of precedence in the way <em>grass76</em>
determines the user interface to use. The following is the hierarchy
from highest precedence to lowest.
<ol>
@@ -187,7 +187,7 @@
This environment variable allows the user to extend the GRASS program
search paths to include locally installed
(see <em><a href="g.extension.html">g.extension</a></em> for details)
-<a href="http://grasswiki.osgeo.org/wiki/GRASS_AddOns">GRASS Addon</a>
+<a href="https://grasswiki.osgeo.org/wiki/GRASS_AddOns">GRASS Addon</a>
modules which are not distributed with the standard GRASS release.
<div class="code"><pre>
GRASS_ADDON_BASE=/usr/grass-addons
@@ -242,44 +242,44 @@
<p>The following are some examples of how you could start GRASS
<dl>
-<dt><b>grass75</b>
+<dt><b>grass76</b>
<dd> Start GRASS using the default user interface. The user will be
prompted to choose the appropriate location and mapset.
-<dt><b>grass75 -gui</b>
+<dt><b>grass76 -gui</b>
<dd> Start GRASS using the graphical user interface. The user will be
prompted to choose the appropriate location and mapset.
-<dt><b>grass75 -text</b>
+<dt><b>grass76 -text</b>
<dd> Start GRASS using the text-based user interface. Appropriate
location and mapset must be set by environmental variables (see
examples below) otherwise taken from the last GRASS session.</dd>
-<dt><b>grass75 -gtext</b>
+<dt><b>grass76 -gtext</b>
<dd> Start GRASS using the text-based user interface. The user will be
prompted to choose the appropriate location and mapset.
-<dt><b>grass75 $HOME/grassdata/spearfish70/user1</b>
+<dt><b>grass76 $HOME/grassdata/spearfish70/user1</b>
<dd> Start GRASS using the default user interface and automatically
launch into the given mapset, bypassing the mapset selection menu.
-<dt><b>grass75 -gui -</b>
+<dt><b>grass76 -gui -</b>
<dd> Start GRASS using the graphical user interface and try to
obtain the location and mapset from environment variables.
-<dt><b>grass75 -c EPSG:4326 $HOME/grassdata/mylocation</b>
+<dt><b>grass76 -c EPSG:4326 $HOME/grassdata/mylocation</b>
<dd> Creates new GRASS location with EPSG code 4326 (latitude-longitude, WGS84)
in the specified GISDBASE
-<dt><b>grass75 -c EPSG:5514:3 $HOME/grassdata/mylocation</b>
+<dt><b>grass76 -c EPSG:5514:3 $HOME/grassdata/mylocation</b>
<dd> Creates new GRASS location with EPSG code 5514 (S-JTSK / Krovak
East North - SJTSK) with datum transformation parameters used in
Czech Republic in the specified GISDBASE
-<dt><b>grass75 -c myvector.shp $HOME/grassdata/mylocation</b>
+<dt><b>grass76 -c myvector.shp $HOME/grassdata/mylocation</b>
<dd> Creates new GRASS location based on georeferenced Shapefile
-<dt><b>grass75 -c myraster.tif $HOME/grassdata/mylocation</b>
+<dt><b>grass76 -c myraster.tif $HOME/grassdata/mylocation</b>
<dd> Creates new GRASS location based on georeferenced GeoTIFF file
</dl>
@@ -296,26 +296,26 @@
and exit (<b>-e</b>) immediately:
<div class="code"><pre>
-grass75 -c elevation.tiff -e /path/to/grassdata/test1/
+grass76 -c elevation.tiff -e /path/to/grassdata/test1/
</pre></div>
Linking external raster data to PERMANENT Mapset:
<div class="code"><pre>
-grass75 /path/to/grassdata/test1/PERMANENT/ --exec r.external input=basins.tiff output=basins
-grass75 /path/to/grassdata/test1/PERMANENT/ --exec r.external input=elevation.tiff output=elevation
+grass76 /path/to/grassdata/test1/PERMANENT/ --exec r.external input=basins.tiff output=basins
+grass76 /path/to/grassdata/test1/PERMANENT/ --exec r.external input=elevation.tiff output=elevation
</pre></div>
Get statistics for one raster map:
<div class="code"><pre>
-grass75 /path/to/grassdata/test1/PERMANENT/ --exec r.univar map=elevation
+grass76 /path/to/grassdata/test1/PERMANENT/ --exec r.univar map=elevation
</pre></div>
Compare the rasters visually:
<div class="code"><pre>
-grass75 /path/to/grassdata/test1/PERMANENT/ --exec g.gui.mapswipe first=elevation second=basins
+grass76 /path/to/grassdata/test1/PERMANENT/ --exec g.gui.mapswipe first=elevation second=basins
</pre></div>
<h4>Execution of shell and Python scripts instead of single commands</h4>
@@ -326,7 +326,7 @@
<b>Shell script example:</b> the command to execute a shell script might be:
<div class="code"><pre>
-grass75 /path/to/grassdata/test1/PERMANENT/ --exec sh test.sh
+grass76 /path/to/grassdata/test1/PERMANENT/ --exec sh test.sh
</pre></div>
A very simple bash script ("test.sh") may look like this:
@@ -343,7 +343,7 @@
<b>Python script example:</b> the command to execute a Python script might be:
<div class="code"><pre>
-grass75 /path/to/grassdata/test1/PERMANENT/ --exec python test.py
+grass76 /path/to/grassdata/test1/PERMANENT/ --exec python test.py
</pre></div>
A very simple Python script ("test.py") may look like this:
@@ -374,19 +374,19 @@
computation in a shell script:
<div class="code"><pre>
-grass75 --tmp-location elevation.tiff --exec test.sh
+grass76 --tmp-location elevation.tiff --exec test.sh
</pre></div>
The same, but using an EPSG code and a Python script:
<div class="code"><pre>
-grass75 --tmp-location EPSG:3358 --exec test.py
+grass76 --tmp-location EPSG:3358 --exec test.py
</pre></div>
Finally, for special cases, we can create an XY location without any CRS:
<div class="code"><pre>
-grass75 --tmp-location XY --exec test.py
+grass76 --tmp-location XY --exec test.py
</pre></div>
Temporary location is automatically deleted after computation,
@@ -398,7 +398,7 @@
temporary location:
<div class="code"><pre>
-grass75 --tmp-location EPSG:3358 --exec g.proj -p
+grass76 --tmp-location EPSG:3358 --exec g.proj -p
</pre></div>
A temporary XY location with single command is useful, e.g. to show
@@ -405,7 +405,7 @@
help text of a module:
<div class="code"><pre>
-grass75 --tmp-location XY --exec r.neighbors --help
+grass76 --tmp-location XY --exec r.neighbors --help
</pre></div>
<h4>Troubleshooting</h4>
Modified: grass/branches/releasebranch_7_6/lib/init/helptext.html
===================================================================
--- grass/branches/releasebranch_7_6/lib/init/helptext.html 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/lib/init/helptext.html 2018-08-31 15:01:15 UTC (rev 73215)
@@ -167,7 +167,7 @@
If data were already imported, you can add them into the Layer Manager now
and display them. If your LOCATION is empty you can import your data from
the menu: Go to "File" -> "Import raster/vector data" (see also the
-related Wiki page on <a href="http://grasswiki.osgeo.org/wiki/Importing_data">Importing data</a>).
+related Wiki page on <a href="https://grasswiki.osgeo.org/wiki/Importing_data">Importing data</a>).
<h2>5. Text-based startup and location creation</h2>
@@ -180,13 +180,13 @@
without entering the new location:
<ul>
<li>Using an EPSG code:<br>
- <tt>grass75 -e -c EPSG:32630 /home/user/grassdata/mylocation</tt></li>
+ <tt>grass76 -e -c EPSG:32630 /home/user/grassdata/mylocation</tt></li>
<li>Using a georeferenced raster or vector file:<br>
- <tt>grass75 -e -c MyGeoReferenceFile.tif /home/user/grassdata/mylocation</tt></li>
+ <tt>grass76 -e -c MyGeoReferenceFile.tif /home/user/grassdata/mylocation</tt></li>
</ul></li>
<li> Create new mapset within the new location and launch GRASS GIS within
that mapset: <br>
- <tt>grass75 -c /home/user/grassdata/mylocation/mymapset</tt>
+ <tt>grass76 -c /home/user/grassdata/mylocation/mymapset</tt>
</ol>
Modified: grass/branches/releasebranch_7_6/lib/python/docs/src/gunittest_running_tests.rst
===================================================================
--- grass/branches/releasebranch_7_6/lib/python/docs/src/gunittest_running_tests.rst 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/lib/python/docs/src/gunittest_running_tests.rst 2018-08-31 15:01:15 UTC (rev 73215)
@@ -89,7 +89,7 @@
REPORTS=".../testreports"
GRASSSRC=".../grass-src"
# here we suppose default compilation settings of GRASS and no make install
- GRASSBIN="$GRASSSRC/bin.../grass75"
+ GRASSBIN="$GRASSSRC/bin.../grass76"
GRASSDIST="$GRASSSRC/dist..."
# necessary hardcoded GRASS paths
Modified: grass/branches/releasebranch_7_6/lib/python/docs/src/pygrass_gis.rst
===================================================================
--- grass/branches/releasebranch_7_6/lib/python/docs/src/pygrass_gis.rst 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/lib/python/docs/src/pygrass_gis.rst 2018-08-31 15:01:15 UTC (rev 73215)
@@ -14,7 +14,7 @@
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
-<http://grass.osgeo.org/grass75/manuals/helptext.html>`_.
+<https://grass.osgeo.org/grass76/manuals/helptext.html>`_.
.. _Region-label:
@@ -25,6 +25,6 @@
information about the computational region and to change it. Details
about the GRASS GIS computational region management can be found in
the `GRASS GIS Wiki: Computational region
-<http://grasswiki.osgeo.org/wiki/Computational_region>`_.
+<https://grasswiki.osgeo.org/wiki/Computational_region>`_.
The classes are part of the :mod:`~pygrass.gis` module.
Modified: grass/branches/releasebranch_7_6/lib/python/gunittest/multirunner.py
===================================================================
--- grass/branches/releasebranch_7_6/lib/python/gunittest/multirunner.py 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/lib/python/gunittest/multirunner.py 2018-08-31 15:01:15 UTC (rev 73215)
@@ -56,7 +56,7 @@
# TODO: create directory according to date and revision and create reports there
# some predefined variables, name of the GRASS launch script + location/mapset
- #grass7bin = 'C:\Program Files (x86)\GRASS GIS 7.2.svn\grass75svn.bat'
+ #grass7bin = 'C:\Program Files (x86)\GRASS GIS 7.2.svn\grass76svn.bat'
grass7bin = args.grassbin # TODO: can be used if pressent
########### SOFTWARE
Modified: grass/branches/releasebranch_7_6/lib/python/pygrass/modules/shortcuts.py
===================================================================
--- grass/branches/releasebranch_7_6/lib/python/pygrass/modules/shortcuts.py 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/lib/python/pygrass/modules/shortcuts.py 2018-08-31 15:01:15 UTC (rev 73215)
@@ -59,7 +59,7 @@
name.strip('_').replace('_', '.')))
-# http://grass.osgeo.org/grass75/manuals/full_index.html
+# https://grass.osgeo.org/grass76/manuals/full_index.html
#[ d.* | db.* | g.* | i.* | m.* | ps.* | r.* | r3.* | t.* | v.* ]
#
# d.* display commands
Modified: grass/branches/releasebranch_7_6/lib/python/script/core.py
===================================================================
--- grass/branches/releasebranch_7_6/lib/python/script/core.py 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/lib/python/script/core.py 2018-08-31 15:01:15 UTC (rev 73215)
@@ -770,7 +770,7 @@
"flags" are Python booleans.
Overview table of parser standard options:
- https://grass.osgeo.org/grass75/manuals/parser_standard_options.html
+ https://grass.osgeo.org/grass76/manuals/parser_standard_options.html
"""
if not os.getenv("GISBASE"):
print("You must be in GRASS GIS to run this program.", file=sys.stderr)
Modified: grass/branches/releasebranch_7_6/lib/python/script/setup.py
===================================================================
--- grass/branches/releasebranch_7_6/lib/python/script/setup.py 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/lib/python/script/setup.py 2018-08-31 15:01:15 UTC (rev 73215)
@@ -24,12 +24,12 @@
# query GRASS itself for its GISBASE
# (with fixes for specific platforms)
# needs to be edited by the user
- grass7bin = 'grass75'
+ grass7bin = 'grass76'
if sys.platform.startswith('win'):
# MS Windows
- grass7bin = r'C:\OSGeo4W\bin\grass75.bat'
+ grass7bin = r'C:\OSGeo4W\bin\grass76.bat'
# uncomment when using standalone WinGRASS installer
- # grass7bin = r'C:\Program Files (x86)\GRASS GIS 7.2.0\grass75.bat'
+ # grass7bin = r'C:\Program Files (x86)\GRASS GIS 7.2.0\grass76.bat'
# this can be avoided if GRASS executable is added to PATH
elif sys.platform == 'darwin':
# Mac OS X
Modified: grass/branches/releasebranch_7_6/locale/README
===================================================================
--- grass/branches/releasebranch_7_6/locale/README 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/locale/README 2018-08-31 15:01:15 UTC (rev 73215)
@@ -123,11 +123,11 @@
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/grass75/binary/linux/snapshot/transifex/
- --> cronjob: /home/neteler/cronjobs/cron_grass75_releasebranch_72_build_bins.sh
+ stored in https://grass.osgeo.org/grass76/binary/linux/snapshot/transifex/
+ --> cronjob: /home/neteler/cronjobs/cron_grass76_releasebranch_72_build_bins.sh
[2] Transifex job copies daily from [1] to here:
- https://www.transifex.com/grass-gis/grass75/
+ https://www.transifex.com/grass-gis/grass76/
[3] Translators work in Transifex,
Modified: grass/branches/releasebranch_7_6/man/build_graphical_index.py
===================================================================
--- grass/branches/releasebranch_7_6/man/build_graphical_index.py 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/man/build_graphical_index.py 2018-08-31 15:01:15 UTC (rev 73215)
@@ -102,7 +102,7 @@
('postscript_graphical.html', std_img_name('cartography'), 'Cartography'),
('wxGUI_graphical.html', std_img_name('gui'), 'GUI'),
('wxGUI.nviz.html', std_img_name('3dview'), '3D view'),
- ('https://grass.osgeo.org/grass75/manuals/libpython/index.html', std_img_name('python'), 'Python'),
+ ('https://grass.osgeo.org/grass76/manuals/libpython/index.html', std_img_name('python'), 'Python'),
('https://grass.osgeo.org/programming7/', std_img_name('c'), 'C library'),
('manual_gallery.html', std_img_name('gallery'), 'Gallery'),
('https://grass.osgeo.org/grass7/manuals/addons/', std_img_name('addons'), 'Addons'),
Modified: grass/branches/releasebranch_7_6/man/sphinx/conf.py
===================================================================
--- grass/branches/releasebranch_7_6/man/sphinx/conf.py 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/man/sphinx/conf.py 2018-08-31 15:01:15 UTC (rev 73215)
@@ -164,7 +164,7 @@
#html_file_suffix = None
# Output file base name for HTML help builder.
-htmlhelp_basename = 'grass75Documentationdoc'
+htmlhelp_basename = 'grass76Documentationdoc'
# -- Options for LaTeX output --------------------------------------------------
@@ -183,7 +183,7 @@
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, documentclass [howto/manual]).
latex_documents = [
- ('content', 'grass75Documentation.tex', u'GRASS 7.4 Documentation Documentation',
+ ('content', 'grass76Documentation.tex', u'GRASS 7.4 Documentation Documentation',
u'GRASS Development Team', 'manual'),
]
@@ -213,7 +213,7 @@
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
- ('content', 'grass75documentation', u'GRASS 7.4 Documentation Documentation',
+ ('content', 'grass76documentation', u'GRASS 7.4 Documentation Documentation',
[u'GRASS Development Team'], 1)
]
@@ -227,8 +227,8 @@
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
- ('content', 'grass75Documentation', u'GRASS 7.4 Documentation Documentation',
- u'GRASS Development Team', 'grass75Documentation', 'One line description of project.',
+ ('content', 'grass76Documentation', u'GRASS 7.4 Documentation Documentation',
+ u'GRASS Development Team', 'grass76Documentation', 'One line description of project.',
'Miscellaneous'),
]
Modified: grass/branches/releasebranch_7_6/mswindows/Installer-Files/WinGRASS-README.url
===================================================================
--- grass/branches/releasebranch_7_6/mswindows/Installer-Files/WinGRASS-README.url 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/mswindows/Installer-Files/WinGRASS-README.url 2018-08-31 15:01:15 UTC (rev 73215)
@@ -1,5 +1,5 @@
[InternetShortcut]
-URL=http://grass.osgeo.org/grass75/binary/mswindows/native/README.html
+URL=https://grass.osgeo.org/grass76/binary/mswindows/native/README.html
IDList=
IconFile=http://grass.osgeo.org/favicon.ico
IconIndex=1
Modified: grass/branches/releasebranch_7_6/temporal/t.rast.accumulate/t.rast.accumulate.html
===================================================================
--- grass/branches/releasebranch_7_6/temporal/t.rast.accumulate/t.rast.accumulate.html 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/temporal/t.rast.accumulate/t.rast.accumulate.html 2018-08-31 15:01:15 UTC (rev 73215)
@@ -66,7 +66,7 @@
mkdir -p /tmp/grassdata/LL
# Start GRASS and create a new location with PERMANENT mapset
-grass75 -c EPSG:4326 /tmp/grassdata/LL/PERMANENT
+grass76 -c EPSG:4326 /tmp/grassdata/LL/PERMANENT
# Import the temperature data
t.rast.import input=temperature_mean_1990_2000_daily_celsius.tar.gz \
Modified: grass/branches/releasebranch_7_6/vector/v.info/v.info.html
===================================================================
--- grass/branches/releasebranch_7_6/vector/v.info/v.info.html 2018-08-31 13:52:55 UTC (rev 73214)
+++ grass/branches/releasebranch_7_6/vector/v.info/v.info.html 2018-08-31 15:01:15 UTC (rev 73215)
@@ -128,7 +128,7 @@
<h2>PYTHON</h2>
-See <em><a href="http://grass.osgeo.org/grass75/manuals/libpython/">Python
+See <em><a href="https://grass.osgeo.org/grass76/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
More information about the grass-commit
mailing list