[GRASS-SVN] r68888 - in grass/branches/releasebranch_7_2: . 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 man man/sphinx mswindows/Installer-Files raster/r.li raster3d/r3.flow temporal/t.rast.accumulate vector/v.info
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Jul 7 10:26:08 PDT 2016
Author: neteler
Date: 2016-07-07 10:26:08 -0700 (Thu, 07 Jul 2016)
New Revision: 68888
Modified:
grass/branches/releasebranch_7_2/doc/grass_database.html
grass/branches/releasebranch_7_2/doc/howto_release.txt
grass/branches/releasebranch_7_2/general/g.findfile/g.findfile.html
grass/branches/releasebranch_7_2/general/g.message/g.message.html
grass/branches/releasebranch_7_2/grasslib.dox
grass/branches/releasebranch_7_2/gui/icons/grass.desktop
grass/branches/releasebranch_7_2/gui/wxpython/README
grass/branches/releasebranch_7_2/gui/wxpython/docs/wxGUI.html
grass/branches/releasebranch_7_2/gui/wxpython/xml/menudata.README
grass/branches/releasebranch_7_2/imagery/i.topo.corr/test_i.topo.corr_synthetic_DEM_NC.sh
grass/branches/releasebranch_7_2/lib/gis/parser_wps.c
grass/branches/releasebranch_7_2/lib/gpde/gpdelib.dox
grass/branches/releasebranch_7_2/lib/init/README
grass/branches/releasebranch_7_2/lib/init/grass.py
grass/branches/releasebranch_7_2/lib/init/grass.sh
grass/branches/releasebranch_7_2/lib/init/grass7.html
grass/branches/releasebranch_7_2/lib/python/docs/src/gunittest_running_tests.rst
grass/branches/releasebranch_7_2/lib/python/docs/src/pygrass_gis.rst
grass/branches/releasebranch_7_2/lib/python/gunittest/multirunner.py
grass/branches/releasebranch_7_2/lib/python/pygrass/modules/shortcuts.py
grass/branches/releasebranch_7_2/lib/python/script/core.py
grass/branches/releasebranch_7_2/lib/python/script/setup.py
grass/branches/releasebranch_7_2/man/build_graphical_index.py
grass/branches/releasebranch_7_2/man/sphinx/conf.py
grass/branches/releasebranch_7_2/mswindows/Installer-Files/WinGRASS-README.url
grass/branches/releasebranch_7_2/raster/r.li/TODO
grass/branches/releasebranch_7_2/raster3d/r3.flow/r3.flow.html
grass/branches/releasebranch_7_2/temporal/t.rast.accumulate/t.rast.accumulate.html
grass/branches/releasebranch_7_2/vector/v.info/v.info.html
Log:
docs: update grass70, grass71 to grass72
Modified: grass/branches/releasebranch_7_2/doc/grass_database.html
===================================================================
--- grass/branches/releasebranch_7_2/doc/grass_database.html 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/doc/grass_database.html 2016-07-07 17:26:08 UTC (rev 68888)
@@ -221,7 +221,7 @@
in a given Mapset with only command line interface:
<div class="code"><pre>
-grass71 -text ~/grassdata/mylocation/mymapset
+grass72 -text ~/grassdata/mylocation/mymapset
</pre></div>
And the following will create the given Location with projection given
@@ -229,7 +229,7 @@
(GUI or command line):
<div class="code"><pre>
-grass71 -c EPSG:5514:3 ~/grassdata/mylocation
+grass72 -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_2/doc/howto_release.txt
===================================================================
--- grass/branches/releasebranch_7_2/doc/howto_release.txt 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/doc/howto_release.txt 2016-07-07 17:26:08 UTC (rev 68888)
@@ -195,11 +195,11 @@
Update addons (grass_addons.sh) rules, eg.
- compile $SVN_PATH/grass7 $GISBASE_PATH/grass710RC1 $ADDON_PATH/grass710RC1/addons
+ compile $SVN_PATH/grass7 $GISBASE_PATH/grass720RC1 $ADDON_PATH/grass720RC1/addons
Modify grass_copy_wwwroot.sh accordingly, eg.
- copy_addon 700RC1 7.0.0RC1
+ copy_addon 720RC1 7.2.0RC1
o Launchpad notes:
@@ -268,12 +268,12 @@
1. see SVN book:
http://svnbook.red-bean.com/en/1.1/ch04s07.html
- GRASS 7.0 release branch:
+ GRASS 7.2 release branch:
BRANCH=releasebranch_7_0
URL=https://svn.osgeo.org/grass
svn copy $URL/grass/trunk \
$URL/grass/branches/$BRANCH \
- -m "Development branch for GRASS 7.0.x"
+ -m "Development branch for GRASS 7.2.x"
Switching current local copy to above development branch:
Modified: grass/branches/releasebranch_7_2/general/g.findfile/g.findfile.html
===================================================================
--- grass/branches/releasebranch_7_2/general/g.findfile/g.findfile.html 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/general/g.findfile/g.findfile.html 2016-07-07 17:26:08 UTC (rev 68888)
@@ -75,7 +75,7 @@
<h3>PYTHON</h3>
-See <em><a href="http://grass.osgeo.org/grass71/manuals/libpython/">Python
+See <em><a href="http://grass.osgeo.org/grass72/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_2/general/g.message/g.message.html
===================================================================
--- grass/branches/releasebranch_7_2/general/g.message/g.message.html 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/general/g.message/g.message.html 2016-07-07 17:26:08 UTC (rev 68888)
@@ -47,7 +47,7 @@
<h3>Usage in Python scripts</h3>
-<a href="http://grass.osgeo.org/grass71/manuals/libpython/">GRASS
+<a href="http://grass.osgeo.org/grass72/manuals/libpython/">GRASS
Python Scripting Library</a> defines special wrappers
for <em>g.message</em>.
Modified: grass/branches/releasebranch_7_2/grasslib.dox
===================================================================
--- grass/branches/releasebranch_7_2/grasslib.dox 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/grasslib.dox 2016-07-07 17:26:08 UTC (rev 68888)
@@ -51,7 +51,7 @@
- gis: \ref gislib
- raster: \ref rasterlib
- vector: \ref vectorlib
- - Temporal GIS API: See http://grass.osgeo.org/grass71/manuals/libpython/temporal_framework.html
+ - Temporal GIS API: See http://grass.osgeo.org/grass72/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/grass71/manuals/libpython/)
+ - python: See GRASS GIS Python library (http://grass.osgeo.org/grass72/manuals/libpython/)
\subsection projlibs Projection Libraries
Modified: grass/branches/releasebranch_7_2/gui/icons/grass.desktop
===================================================================
--- grass/branches/releasebranch_7_2/gui/icons/grass.desktop 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/gui/icons/grass.desktop 2016-07-07 17:26:08 UTC (rev 68888)
@@ -48,8 +48,8 @@
Comment[uk]=Геоінформаційна система
Comment[uz]=Geografik axborot tizimi
Categories=Education;Science;Geoscience;Geography;
-Exec=grass71
-Icon=grass71
+Exec=grass72
+Icon=grass72
Terminal=true
URL=https://grass.osgeo.org/
Keywords=gis;spatial;geospatial;database;remote sensing;hydrology;vector;raster;visualization;maps;wms;wfs;ogc;osgeo;
Modified: grass/branches/releasebranch_7_2/gui/wxpython/README
===================================================================
--- grass/branches/releasebranch_7_2/gui/wxpython/README 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/gui/wxpython/README 2016-07-07 17:26:08 UTC (rev 68888)
@@ -18,7 +18,7 @@
If you want to launch wxPython GUI automatically, start GRASS with
`-gui` parameter
-$ grass70 -gui
+$ grass72 -gui
3 - STARTUP FROM GRASS TERMINAL
Modified: grass/branches/releasebranch_7_2/gui/wxpython/docs/wxGUI.html
===================================================================
--- grass/branches/releasebranch_7_2/gui/wxpython/docs/wxGUI.html 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/gui/wxpython/docs/wxGUI.html 2016-07-07 17:26:08 UTC (rev 68888)
@@ -674,7 +674,7 @@
specifying the <tt>-gui</tt> (or <tt>-wxpython</tt>) switch:
<div class="code"><pre>
-grass71 -gui
+grass72 -gui
</pre></div>
Modified: grass/branches/releasebranch_7_2/gui/wxpython/xml/menudata.README
===================================================================
--- grass/branches/releasebranch_7_2/gui/wxpython/xml/menudata.README 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/gui/wxpython/xml/menudata.README 2016-07-07 17:26:08 UTC (rev 68888)
@@ -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/grass71/manuals/wxGUI.toolboxes.html
+ https://grass.osgeo.org/grass72/manuals/wxGUI.toolboxes.html
(../docs/wxgui_sphinx/src/)
- additionally
https://trac.osgeo.org/grass/wiki/wxGUIDevelopment/Toolboxes
Modified: grass/branches/releasebranch_7_2/imagery/i.topo.corr/test_i.topo.corr_synthetic_DEM_NC.sh
===================================================================
--- grass/branches/releasebranch_7_2/imagery/i.topo.corr/test_i.topo.corr_synthetic_DEM_NC.sh 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/imagery/i.topo.corr/test_i.topo.corr_synthetic_DEM_NC.sh 2016-07-07 17:26:08 UTC (rev 68888)
@@ -3,7 +3,7 @@
# Script to test i.topo.corr with a synthetic map
#
# Use North Carolina location to test:
-# grass71 ~/grassdata/nc_spm_08_grass7/user1
+# grass72 ~/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_2/lib/gis/parser_wps.c
===================================================================
--- grass/branches/releasebranch_7_2/lib/gis/parser_wps.c 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/lib/gis/parser_wps.c 2016-07-07 17:26:08 UTC (rev 68888)
@@ -578,7 +578,7 @@
if(abstract)
{
fprintf(stdout,"\t\t<ows:Abstract>");
- fprintf(stdout, "http://grass.osgeo.org/grass71/manuals/%s.html", identifier);
+ fprintf(stdout, "http://grass.osgeo.org/grass72/manuals/%s.html", identifier);
fprintf(stdout, "</ows:Abstract>\n");
}
Modified: grass/branches/releasebranch_7_2/lib/gpde/gpdelib.dox
===================================================================
--- grass/branches/releasebranch_7_2/lib/gpde/gpdelib.dox 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/lib/gpde/gpdelib.dox 2016-07-07 17:26:08 UTC (rev 68888)
@@ -223,7 +223,7 @@
<P>
<b>Example implementation:</b><br>
-The GRASS module <a href="http://grass.osgeo.org/grass71/manuals/r.gwflow.html">r.gwflow</a>
+The GRASS module <a href="http://grass.osgeo.org/grass72/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/grass71/manuals/r3.gwflow.html">r3.gwflow</a>
+The GRASS module <a href="http://grass.osgeo.org/grass72/manuals/r3.gwflow.html">r3.gwflow</a>
implements numerical calculation program for transient, confined
groundwater flow in three dimensions.
Modified: grass/branches/releasebranch_7_2/lib/init/README
===================================================================
--- grass/branches/releasebranch_7_2/lib/init/README 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/lib/init/README 2016-07-07 17:26:08 UTC (rev 68888)
@@ -1,10 +1,10 @@
o GRASS text mode startup
- "grass71" starts up d.m by default (if not first time user).
- "grass71 -text" will start up in text mode.
- "grass71 -wxpython" or "grass71 -gui" will start up in wxpython mode.
+ "grass72" starts up d.m by default (if not first time user).
+ "grass72 -text" will start up in text mode.
+ "grass72 -wxpython" or "grass72 -gui" will start up in wxpython mode.
- You can use alias "grass71" to "grass71 -text" to use text mode by default.
+ You can use alias "grass72" to "grass72 -text" to use text mode by default.
Or set env var GRASS_GUI=text.
@@ -25,18 +25,18 @@
export LOCATION_NAME=loc1
export MAPSET=map1
- grass71 - # non-interactive startup using LOCATION location
+ grass72 - # non-interactive startup using LOCATION location
ex2)
export GISDBASE=/usr/home/grass/usr/data1
export LOCATION_NAME=loc1
export MAPSET=map1
- grass71 - # non-interactive startup using
+ grass72 - # non-interactive startup using
# GISDBASE/LOCATION_NAME/MAPSET location
- Also, the first argument of grass71 can override these env vars.
+ Also, the first argument of grass72 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
- grass71 /usr/home/grass/usr/data2/loc2-1/map1-1
+ grass72 /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
- grass71 /usr/home/grass/usr/data2/loc2-1/map1-1
+ grass72 /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
- grass71 map1-1 # non-interactive startup using
+ grass72 map1-1 # non-interactive startup using
# GISDBASE/LOCATION_NAME/map1-1 location
ex6)
@@ -72,7 +72,7 @@
export LOCATION_NAME=loc1
export MAPSET=map1
- grass71 loc2-1/map1-1
+ grass72 loc2-1/map1-1
# non-interactive startup using
# GISDBASE/loc2-1/map1-1 location
Modified: grass/branches/releasebranch_7_2/lib/init/grass.py
===================================================================
--- grass/branches/releasebranch_7_2/lib/init/grass.py 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/lib/init/grass.py 2016-07-07 17:26:08 UTC (rev 68888)
@@ -855,7 +855,7 @@
l = None
if arg == '-':
- # TODO: repair or remove behavior env vars + `grass71 -` (see doc)
+ # TODO: repair or remove behavior env vars + `grass72 -` (see doc)
# this is broken for some time (before refactoring, e.g. r65235)
# is some code is added, it should be a separate function, probably
# called here
Modified: grass/branches/releasebranch_7_2/lib/init/grass.sh
===================================================================
--- grass/branches/releasebranch_7_2/lib/init/grass.sh 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/lib/init/grass.sh 2016-07-07 17:26:08 UTC (rev 68888)
@@ -28,4 +28,4 @@
fi
export GRASS_PYTHON
-exec "$GRASS_PYTHON" "@BINDIR@/grass71.py" "$@" &
+exec "$GRASS_PYTHON" "@BINDIR@/grass72.py" "$@" &
Modified: grass/branches/releasebranch_7_2/lib/init/grass7.html
===================================================================
--- grass/branches/releasebranch_7_2/lib/init/grass7.html 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/lib/init/grass7.html 2016-07-07 17:26:08 UTC (rev 68888)
@@ -2,7 +2,7 @@
<h2>SYNOPSIS</h2>
-<b>grass71</b> [<b>-h</b> | <b>-help</b> | <b>--help</b>] [<b>-v</b> | <b>--version</b>]
+<b>grass72</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>]
@@ -84,13 +84,13 @@
<p>The startup program will remember both the desired user interface
and mapset. Thus, the next time the user runs GRASS, typing
-<em>grass71</em> (without any options) will start GRASS with the
+<em>grass72</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>grass71</em> program will try to verify that the system you
+the <em>grass72</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>grass71</em> will automatically switch back
+these checks fail then <em>grass72</em> will automatically switch back
to the text user interface mode.
<h2>ENVIRONMENT VARIABLES</h2>
@@ -115,14 +115,14 @@
<h3>User Interface Environment Variable</h3>
-<p>The <em>grass71</em> program will check for the existence of an
+<p>The <em>grass72</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>grass71</em> is run, then it will be created and then saved
+when <em>grass72</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>grass71</em>
+<p>There is an order of precedence in the way <em>grass72</em>
determines the user interface to use. The following is the hierarchy
from highest precedence to lowest.
<ol>
@@ -221,44 +221,44 @@
<p>The following are some examples of how you could start GRASS
<dl>
-<dt><b>grass71</b>
+<dt><b>grass72</b>
<dd> Start GRASS using the default user interface. The user will be
prompted to choose the appropriate location and mapset.
-<dt><b>grass71 -gui</b>
+<dt><b>grass72 -gui</b>
<dd> Start GRASS using the graphical user interface. The user will be
prompted to choose the appropriate location and mapset.
-<dt><b>grass71 -text</b>
+<dt><b>grass72 -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>grass71 -gtext</b>
+<dt><b>grass72 -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>grass71 $HOME/grassdata/spearfish70/user1</b>
+<dt><b>grass72 $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>grass71 -gui -</b>
+<dt><b>grass72 -gui -</b>
<dd> Start GRASS using the graphical user interface and try to
obtain the location and mapset from environment variables.
-<dt><b>grass71 -c EPSG:4326 $HOME/grassdata/mylocation</b>
+<dt><b>grass72 -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>grass71 -c EPSG:5514:3 $HOME/grassdata/mylocation</b>
+<dt><b>grass72 -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>grass71 -c myvector.shp $HOME/grassdata/mylocation</b>
+<dt><b>grass72 -c myvector.shp $HOME/grassdata/mylocation</b>
<dd> Creates new GRASS location based on georeferenced Shapefile
-<dt><b>grass71 -c myraster.tif $HOME/grassdata/mylocation</b>
+<dt><b>grass72 -c myraster.tif $HOME/grassdata/mylocation</b>
<dd> Creates new GRASS location based on georeferenced GeoTIFF file
</dl>
@@ -274,26 +274,26 @@
Create a new Location based on a projection of a file:
<div class="code"><pre>
-grass71 -c elevation.tiff -e .../grassdata/test1/
+grass72 -c elevation.tiff -e .../grassdata/test1/
</pre></div>
Link external raster data to PERMANENT Mapset:
<div class="code"><pre>
-grass71 .../grassdata/test1/PERMANENT/ --exec r.external input=basins.tiff output=basins
-grass71 .../grassdata/test1/PERMANENT/ --exec r.external input=elevation.tiff output=elevation
+grass72 .../grassdata/test1/PERMANENT/ --exec r.external input=basins.tiff output=basins
+grass72 .../grassdata/test1/PERMANENT/ --exec r.external input=elevation.tiff output=elevation
</pre></div>
Get statistics for one raster map:
<div class="code"><pre>
-grass71 .../grassdata/test1/PERMANENT/ --exec r.univar map=elevation
+grass72 .../grassdata/test1/PERMANENT/ --exec r.univar map=elevation
</pre></div>
Compare the rasters visually:
<div class="code"><pre>
-grass71 .../grassdata/test1/PERMANENT/ --exec g.gui.mapswipe first=elevation second=basins
+grass72 .../grassdata/test1/PERMANENT/ --exec g.gui.mapswipe first=elevation second=basins
</pre></div>
@@ -317,7 +317,7 @@
Start GRASS with the following command:
<div class="code"><pre>
-grass71 -
+grass72 -
</pre></div>
GRASS will start with the mapset defined by LOCATION since the LOCATION
@@ -336,14 +336,14 @@
Start GRASS with the following command:
<div class="code"><pre>
-grass71 -
+grass72 -
</pre></div>
GRASS will start with the mapset defined by
GISDBASE/LOCATION_NAME/MAPSET.
<div class="code"><pre>
-grass71 /usr/home/grass/data/thailand/forests
+grass72 /usr/home/grass/data/thailand/forests
</pre></div>
GRASS will start with the
@@ -351,7 +351,7 @@
environment variables.
<div class="code"><pre>
-grass71 swamps
+grass72 swamps
</pre></div>
GRASS will start with the mapset defined by
@@ -359,7 +359,7 @@
mapset overrides the environment variable MAPSET.
<div class="code"><pre>
-grass71 thailand/forests
+grass72 thailand/forests
</pre></div>
GRASS will start with the mapset defined by GISDBASE/thailand/forests
Modified: grass/branches/releasebranch_7_2/lib/python/docs/src/gunittest_running_tests.rst
===================================================================
--- grass/branches/releasebranch_7_2/lib/python/docs/src/gunittest_running_tests.rst 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/lib/python/docs/src/gunittest_running_tests.rst 2016-07-07 17:26:08 UTC (rev 68888)
@@ -89,7 +89,7 @@
REPORTS=".../testreports"
GRASSSRC=".../grass-src"
# here we suppose default compilation settings of GRASS and no make install
- GRASSBIN="$GRASSSRC/bin.../grass71"
+ GRASSBIN="$GRASSSRC/bin.../grass72"
GRASSDIST="$GRASSSRC/dist..."
# necessary hardcoded GRASS paths
Modified: grass/branches/releasebranch_7_2/lib/python/docs/src/pygrass_gis.rst
===================================================================
--- grass/branches/releasebranch_7_2/lib/python/docs/src/pygrass_gis.rst 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/lib/python/docs/src/pygrass_gis.rst 2016-07-07 17:26:08 UTC (rev 68888)
@@ -7,7 +7,7 @@
of GRASS database: Gisdbase, 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/grass71/manuals/helptext.html>`_
+can be found in the `GRASS GIS 7 User's Manual: GRASS GIS Quickstart <http://grass.osgeo.org/grass72/manuals/helptext.html>`_
.. _Region-label:
Modified: grass/branches/releasebranch_7_2/lib/python/gunittest/multirunner.py
===================================================================
--- grass/branches/releasebranch_7_2/lib/python/gunittest/multirunner.py 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/lib/python/gunittest/multirunner.py 2016-07-07 17:26:08 UTC (rev 68888)
@@ -56,7 +56,7 @@
# TODO: create directory accoring 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.0.svn\grass70svn.bat'
+ #grass7bin = 'C:\Program Files (x86)\GRASS GIS 7.2.svn\grass72svn.bat'
grass7bin = args.grassbin # TODO: can be used if pressent
########### SOFTWARE
Modified: grass/branches/releasebranch_7_2/lib/python/pygrass/modules/shortcuts.py
===================================================================
--- grass/branches/releasebranch_7_2/lib/python/pygrass/modules/shortcuts.py 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/lib/python/pygrass/modules/shortcuts.py 2016-07-07 17:26:08 UTC (rev 68888)
@@ -47,7 +47,7 @@
return self.cls('%s.%s' % (self.prefix, name.replace('_', '.')))
-# http://grass.osgeo.org/grass71/manuals/full_index.html
+# http://grass.osgeo.org/grass72/manuals/full_index.html
#[ d.* | db.* | g.* | i.* | m.* | ps.* | r.* | r3.* | t.* | v.* ]
#
# d.* display commands
Modified: grass/branches/releasebranch_7_2/lib/python/script/core.py
===================================================================
--- grass/branches/releasebranch_7_2/lib/python/script/core.py 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/lib/python/script/core.py 2016-07-07 17:26:08 UTC (rev 68888)
@@ -709,7 +709,7 @@
"flags" are Python booleans.
Overview table of parser standard options:
- https://grass.osgeo.org/grass71/manuals/parser_standard_options.html
+ https://grass.osgeo.org/grass72/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_2/lib/python/script/setup.py
===================================================================
--- grass/branches/releasebranch_7_2/lib/python/script/setup.py 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/lib/python/script/setup.py 2016-07-07 17:26:08 UTC (rev 68888)
@@ -24,17 +24,17 @@
# query GRASS itself for its GISBASE
# (with fixes for specific platforms)
# needs to be edited by the user
- grass7bin = 'grass70'
+ grass7bin = 'grass72'
if sys.platform.startswith('win'):
# MS Windows
- grass7bin = r'C:\OSGeo4W\bin\grass70.bat'
+ grass7bin = r'C:\OSGeo4W\bin\grass72.bat'
# uncomment when using standalone WinGRASS installer
- # grass7bin = r'C:\Program Files (x86)\GRASS GIS 7.0.0\grass70.bat'
+ # grass7bin = r'C:\Program Files (x86)\GRASS GIS 7.2.0\grass72.bat'
# this can be avoided if GRASS executable is added to PATH
elif sys.platform == 'darwin':
# Mac OS X
# TODO: this have to be checked, maybe unix way is good enough
- grass7bin = '/Applications/GRASS/GRASS-7.0.app/'
+ grass7bin = '/Applications/GRASS/GRASS-7.2.app/'
# query GRASS GIS itself for its GISBASE
startcmd = [grass7bin, '--config', 'path']
Modified: grass/branches/releasebranch_7_2/man/build_graphical_index.py
===================================================================
--- grass/branches/releasebranch_7_2/man/build_graphical_index.py 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/man/build_graphical_index.py 2016-07-07 17:26:08 UTC (rev 68888)
@@ -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/grass71/manuals/libpython/index.html', std_img_name('python'), 'Python'),
+ ('https://grass.osgeo.org/grass72/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'),
]
Modified: grass/branches/releasebranch_7_2/man/sphinx/conf.py
===================================================================
--- grass/branches/releasebranch_7_2/man/sphinx/conf.py 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/man/sphinx/conf.py 2016-07-07 17:26:08 UTC (rev 68888)
@@ -40,15 +40,15 @@
master_doc = 'index'
# General information about the project.
-project = u'GRASS 7.0 Documentation'
-copyright = u'2012, GRASS Development Team'
+project = u'GRASS 7.2 Documentation'
+copyright = u'2016, 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 = '7.0'
+version = '7.2'
# The full version, including alpha/beta/rc tags.
release = 'svn'
@@ -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', 'GRASS70Documentation.tex', u'GRASS 7.0 Documentation Documentation',
+ ('content', 'GRASS72Documentation.tex', u'GRASS 7.2 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', 'grass70documentation', u'GRASS 7.0 Documentation Documentation',
+ ('content', 'grass72documentation', u'GRASS 7.2 Documentation Documentation',
[u'GRASS Development Team'], 1)
]
@@ -227,7 +227,7 @@
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
- ('content', 'GRASS70Documentation', u'GRASS 7.0 Documentation Documentation',
+ ('content', 'GRASS72Documentation', u'GRASS 7.2 Documentation Documentation',
u'GRASS Development Team', 'GRASS70Documentation', 'One line description of project.',
'Miscellaneous'),
]
@@ -245,7 +245,7 @@
# -- Options for Epub output ---------------------------------------------------
# Bibliographic Dublin Core info.
-epub_title = u'GRASS 7.0 Documentation'
+epub_title = u'GRASS 7.2 Documentation'
epub_author = u'GRASS Development Team'
epub_publisher = u'GRASS Development Team'
epub_copyright = u'2012, GRASS Development Team'
Modified: grass/branches/releasebranch_7_2/mswindows/Installer-Files/WinGRASS-README.url
===================================================================
--- grass/branches/releasebranch_7_2/mswindows/Installer-Files/WinGRASS-README.url 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/mswindows/Installer-Files/WinGRASS-README.url 2016-07-07 17:26:08 UTC (rev 68888)
@@ -1,5 +1,5 @@
[InternetShortcut]
-URL=http://grass.osgeo.org/grass70/binary/mswindows/native/README.html
+URL=http://grass.osgeo.org/grass72/binary/mswindows/native/README.html
IDList=
IconFile=http://grass.osgeo.org/favicon.ico
IconIndex=1
Modified: grass/branches/releasebranch_7_2/raster/r.li/TODO
===================================================================
--- grass/branches/releasebranch_7_2/raster/r.li/TODO 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/raster/r.li/TODO 2016-07-07 17:26:08 UTC (rev 68888)
@@ -2,16 +2,6 @@
=========
GRASS 7:
- * r.li.daemon: Uses UNIX sockets, replace or figure out how
- to use them on Windows
- --> 4/2014: still an issue?
-
- * r.li.setup: Shell scripts, Tcl/Tk, Xmonitors to be replaced
- by Python + wxPython equivalents.
- See Luca D's prototype in trunk/gui/wxpython/rlisetup
- and http://grass.osgeo.org/grass70/manuals/g.gui.rlisetup.html
- --> 4/2014: still an issue?
-
# TODO: change the examples to North Carolina wherever possible:
# Spearfish tests
Modified: grass/branches/releasebranch_7_2/raster3d/r3.flow/r3.flow.html
===================================================================
--- grass/branches/releasebranch_7_2/raster3d/r3.flow/r3.flow.html 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/raster3d/r3.flow/r3.flow.html 2016-07-07 17:26:08 UTC (rev 68888)
@@ -44,8 +44,8 @@
<h2>EXAMPLES</h2>
First we create input data using
-<a href="http://grass.osgeo.org/grass71/manuals/r3.gwflow.html#example-1">example 1</a> from
-<a href="http://grass.osgeo.org/grass71/manuals/r3.gwflow.html">r3.gwflow manual page</a>:
+<a href="r3.gwflow.html#example-1">example 1</a> from
+<a href="r3.gwflow.html">r3.gwflow manual page</a>:
<div class="code"><pre>
# set the region accordingly
@@ -88,9 +88,9 @@
<h2>SEE ALSO</h2>
<em>
-<a href="http://grass.osgeo.org/grass71/manuals/r.flow.html">r.flow</a>,
-<a href="http://grass.osgeo.org/grass71/manuals/r3.gradient.html">r3.gradient</a>,
-<a href="http://grass.osgeo.org/grass71/manuals/r3.gwflow.html">r3.gwflow</a>
+<a href="r.flow.html">r.flow</a>,
+<a href="r3.gradient.html">r3.gradient</a>,
+<a href="r3.gwflow.html">r3.gwflow</a>
</em>
<h2>AUTHORS</h2>
Modified: grass/branches/releasebranch_7_2/temporal/t.rast.accumulate/t.rast.accumulate.html
===================================================================
--- grass/branches/releasebranch_7_2/temporal/t.rast.accumulate/t.rast.accumulate.html 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/temporal/t.rast.accumulate/t.rast.accumulate.html 2016-07-07 17:26:08 UTC (rev 68888)
@@ -66,7 +66,7 @@
mkdir -p /tmp/grassdata/LL
# Start GRASS and create a new location with PERMANENT mapset
-grass71 -c EPSG:4326 /tmp/grassdata/LL/PERMANENT
+grass72 -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_2/vector/v.info/v.info.html
===================================================================
--- grass/branches/releasebranch_7_2/vector/v.info/v.info.html 2016-07-07 17:25:32 UTC (rev 68887)
+++ grass/branches/releasebranch_7_2/vector/v.info/v.info.html 2016-07-07 17:26:08 UTC (rev 68888)
@@ -128,7 +128,7 @@
<h2>PYTHON</h2>
-See <em><a href="http://grass.osgeo.org/grass71/manuals/libpython/">Python
+See <em><a href="http://grass.osgeo.org/grass72/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