[GRASS-SVN] r71706 - in grass/trunk: . display/d.mon doc general/g.findfile general/g.message general/g.version 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 locale/transifex/.tx man man/sphinx mswindows/Installer-Files temporal/t.rast.accumulate vector/v.info
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Nov 12 11:33:52 PST 2017
Author: neteler
Date: 2017-11-12 11:33:52 -0800 (Sun, 12 Nov 2017)
New Revision: 71706
Modified:
grass/trunk/INSTALL
grass/trunk/display/d.mon/main.c
grass/trunk/doc/grass_database.html
grass/trunk/doc/howto_release.txt
grass/trunk/general/g.findfile/g.findfile.html
grass/trunk/general/g.message/g.message.html
grass/trunk/general/g.version/g.version.html
grass/trunk/grasslib.dox
grass/trunk/gui/icons/grass.desktop
grass/trunk/gui/wxpython/README
grass/trunk/gui/wxpython/docs/wxGUI.html
grass/trunk/gui/wxpython/xml/menudata.README
grass/trunk/imagery/i.topo.corr/test_i.topo.corr_synthetic_DEM_NC.sh
grass/trunk/lib/gis/parser_wps.c
grass/trunk/lib/gpde/gpdelib.dox
grass/trunk/lib/init/README
grass/trunk/lib/init/grass.py
grass/trunk/lib/init/grass.sh
grass/trunk/lib/init/grass7.html
grass/trunk/lib/init/helptext.html
grass/trunk/lib/python/docs/src/gunittest_running_tests.rst
grass/trunk/lib/python/docs/src/pygrass_gis.rst
grass/trunk/lib/python/gunittest/multirunner.py
grass/trunk/lib/python/pygrass/modules/shortcuts.py
grass/trunk/lib/python/script/core.py
grass/trunk/lib/python/script/setup.py
grass/trunk/locale/README
grass/trunk/locale/transifex/.tx/config
grass/trunk/man/build_graphical_index.py
grass/trunk/man/sphinx/conf.py
grass/trunk/mswindows/Installer-Files/WinGRASS-README.url
grass/trunk/temporal/t.rast.accumulate/t.rast.accumulate.html
grass/trunk/vector/v.info/v.info.html
Log:
Update of version number entries
Modified: grass/trunk/INSTALL
===================================================================
--- grass/trunk/INSTALL 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/INSTALL 2017-11-12 19:33:52 UTC (rev 71706)
@@ -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/grass73/source/snapshot/
+ from https://grass.osgeo.org/grass75/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 (grass73, ...) in
+and the scripts (grass75, ...) in
./bin.$ARCH
To run GRASS, simply start
- ./bin.$ARCH/grass73
+ ./bin.$ARCH/grass75
or run
make install
- grass73
+ grass75
(E) INSTALLATION ON MACOSX
Modified: grass/trunk/display/d.mon/main.c
===================================================================
--- grass/trunk/display/d.mon/main.c 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/display/d.mon/main.c 2017-11-12 19:33:52 UTC (rev 71706)
@@ -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/grass72/manuals/displaydrivers.html
+ [3] https://grass.osgeo.org/grass75/manuals/displaydrivers.html
*/
Modified: grass/trunk/doc/grass_database.html
===================================================================
--- grass/trunk/doc/grass_database.html 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/doc/grass_database.html 2017-11-12 19:33:52 UTC (rev 71706)
@@ -221,7 +221,7 @@
in a given Mapset with only command line interface:
<div class="code"><pre>
-grass73 -text ~/grassdata/mylocation/mymapset
+grass75 -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>
-grass73 -c EPSG:5514:3 ~/grassdata/mylocation
+grass75 -c EPSG:5514:3 ~/grassdata/mylocation
</pre></div>
See <a href="grass7.html"><em>grass</em></a> command manual for more details.
Modified: grass/trunk/doc/howto_release.txt
===================================================================
--- grass/trunk/doc/howto_release.txt 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/doc/howto_release.txt 2017-11-12 19:33:52 UTC (rev 71706)
@@ -62,8 +62,8 @@
#example:
7
-2
-1RC1
+4
+0RC1
2017
rm -f include/VERSION~
@@ -98,7 +98,7 @@
echo $RELEASETAG
URL=https://svn.osgeo.org/grass
- svn copy $URL/grass/branches/releasebranch_7_2 \
+ svn copy $URL/grass/branches/releasebranch_7_4 \
$URL/grass/tags/$RELEASETAG \
-m "Tagging release grass_${MAJOR}_${MINOR}_${RELEASE}"
@@ -123,8 +123,8 @@
#example
7
-2
-1svn
+4
+0svn
2017
rm -f include/VERSION~
@@ -157,16 +157,16 @@
o update web site to new version: CMS
- News section
- - http://grass.osgeo.org/download/software/
- - http://grass.osgeo.org/download/software/sources/
- - http://grass.osgeo.org/download/software/linux/
- - http://grass.osgeo.org/home/history/releases/
- - http://grass.osgeo.org/development/svn/svn-tags/ (add tag): echo $RELEASETAG
+ - https://grass.osgeo.org/download/software/
+ - https://grass.osgeo.org/download/software/sources/
+ - https://grass.osgeo.org/download/software/linux/
+ - https://grass.osgeo.org/home/history/releases/
+ - https://grass.osgeo.org/development/svn/svn-tags/ (add tag): echo $RELEASETAG
write announcement
- store in trac:
http://trac.osgeo.org/grass/wiki/Release/7.XX.YY-News
- https://trac.osgeo.org/grass/wiki/Grass7/NewFeatures72 <- major releases only
+ https://trac.osgeo.org/grass/wiki/Grass7/NewFeatures74 <- 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?
@@ -189,9 +189,9 @@
o Trac updates:
- Add new release to https://trac.osgeo.org/grass/admin/ticket/versions
- - Set "complete" flag in https://trac.osgeo.org/grass/milestone/7.2.x --> Edit Milestone
+ - Set "complete" flag in https://trac.osgeo.org/grass/milestone/7.4.x --> Edit Milestone
- Batch modify tickets, set to next milestone (update this query accordingly: two entries to change)
- https://trac.osgeo.org/grass/query?status=assigned&status=new&status=reopened&milestone=7.2.0&milestone=7.2.1&group=status&col=id&col=summary&col=owner&col=type&col=priority&col=component&col=version&order=priority
+ https://trac.osgeo.org/grass/query?status=assigned&status=new&status=reopened&milestone=7.4.0&milestone=7.4.1&group=status&col=id&col=summary&col=owner&col=type&col=priority&col=component&col=version&order=priority
- Set max items to 1000, then select all shown tickets via Status: assigned/new/reopened sections
- Scroll down to "Batch modify": under the "Comment" section, add Field "Milestone" and set to next version
- then use "Change ticket" button, done.
@@ -205,16 +205,16 @@
Update grass_packager_release.bat, eg.
set MAJOR=7
- set MINOR=2
+ set MINOR=4
set PATCH=0RC1
Update addons (grass_addons.sh) rules, eg.
- compile $SVN_PATH/grass7 $GISBASE_PATH/grass720RC1 $ADDON_PATH/grass720RC1/addons
+ compile $SVN_PATH/grass7 $GISBASE_PATH/grass750RC1 $ADDON_PATH/grass750RC1/addons
Modify grass_copy_wwwroot.sh accordingly, eg.
- copy_addon 720RC1 7.2.0RC1
+ copy_addon 740RC1 7.4.0RC1
o Launchpad notes:
@@ -278,7 +278,7 @@
-> Share your news with the EO community
https://www.heise.de/download/product/grass-gis-7105 (update, MN)
- See also: http://grass.osgeo.org/wiki/Contact_Databases
+ See also: https://grass.osgeo.org/wiki/Contact_Databases
... anywhere else? Please add here.
###########################################
@@ -287,23 +287,23 @@
1. see SVN book:
http://svnbook.red-bean.com/en/1.1/ch04s07.html
- GRASS 7.2 release branch:
- BRANCH=releasebranch_7_2
+ 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 "Development branch for GRASS 7.2.x"
+ -m "Release branch for GRASS 7.4.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_2 .
+ svn switch https://svn.osgeo.org/grass/grass/branches/releasebranch_7_4 .
----------
-Example: GRASS GIS 7.2 release branch creation
+Example: GRASS GIS 7.4 release branch creation
svn copy https://svn.osgeo.org/grass/grass/trunk/ \
- https://svn.osgeo.org/grass/grass/branches/releasebranch_7_2 \
- -m "Creating the GRASS GIS 7.2 release branch (branch started in 05/2016, r68500)"
+ https://svn.osgeo.org/grass/grass/branches/releasebranch_7_4 \
+ -m "Release branch for GRASS GIS 7.4.x"
Modified: grass/trunk/general/g.findfile/g.findfile.html
===================================================================
--- grass/trunk/general/g.findfile/g.findfile.html 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/general/g.findfile/g.findfile.html 2017-11-12 19:33:52 UTC (rev 71706)
@@ -75,7 +75,7 @@
<h3>PYTHON</h3>
-See <em><a href="http://grass.osgeo.org/grass73/manuals/libpython/">Python
+See <em><a href="http://grass.osgeo.org/grass75/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/trunk/general/g.message/g.message.html
===================================================================
--- grass/trunk/general/g.message/g.message.html 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/general/g.message/g.message.html 2017-11-12 19:33:52 UTC (rev 71706)
@@ -47,7 +47,7 @@
<h3>Usage in Python scripts</h3>
-<a href="http://grass.osgeo.org/grass73/manuals/libpython/">GRASS
+<a href="http://grass.osgeo.org/grass75/manuals/libpython/">GRASS
Python Scripting Library</a> defines special wrappers
for <em>g.message</em>.
Modified: grass/trunk/general/g.version/g.version.html
===================================================================
--- grass/trunk/general/g.version/g.version.html 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/general/g.version/g.version.html 2017-11-12 19:33:52 UTC (rev 71706)
@@ -12,7 +12,7 @@
<p>
Information about GRASS GIS
-core <a href="http://grass.osgeo.org/programming7/gislib.html">GIS
+core <a href="https://grass.osgeo.org/programming7/gislib.html">GIS
Library</a> can be printed by <b>-r</b> flag.
<p>
@@ -23,7 +23,7 @@
<p>
See also function <tt>version()</tt>
-from <a href="http://grasswiki.osgeo.org/wiki/GRASS_Python_Scripting_Library">Python
+from <a href="https://grasswiki.osgeo.org/wiki/GRASS_Python_Scripting_Library">Python
Scripting Library</a>.
<div class="code"><pre>
@@ -38,33 +38,35 @@
<div class="code"><pre>
g.version
-GRASS 7.2.svn (2017)
+GRASS 7.5.svn (2017)
</pre></div>
<h3>GIS Library info</h3>
<div class="code"><pre>
-GRASS 7.2.0svn (2016)
-libgis Revision: 68908
-libgis Date: 2016-07-09 20:12:57 +0200 (Sat, 09 Jul 2016)
+g.version -r
+
+GRASS 7.5.svn (2017)
+libgis Revision: 70829
+libgis Date: 2017-04-04 09:43:02 +0200 (Tue, 04 Apr 2017)
</pre></div>
<h3>Full info in shell script style</h3>
<div class="code"><pre>
g.version -rge
-version=7.2.0svn
-date=2016
-revision=r70151M
-build_date=2016-12-28
+version=7.5.svn
+date=2017
+revision=r71702M
+build_date=2017-11-12
build_platform=x86_64-pc-linux-gnu
build_off_t_size=8
-libgis_revision=68908
-libgis_date="2016-07-09 20:12:57 +0200 (Sat, 09 Jul 2016) "
-proj4=4.9.2
-gdal=2.1.2
-geos=3.5.0
-sqlite=3.13.0
+libgis_revision=70829
+libgis_date="2017-04-04 09:43:02 +0200 (Tue, 04 Apr 2017) "
+proj4=4.9.3
+gdal=2.1.3
+geos=3.6.1
+sqlite=3.20.1
</pre></div>
<h2>Citing GRASS GIS</h2>
@@ -72,7 +74,7 @@
The GRASS Development Team has invested significant time and effort
in creating GRASS GIS, please cite it when using it for data analysis.
-The GRASS GIS <a href="http://grass.osgeo.org/download/software/">Web site</a>
+The GRASS GIS <a href="https://grass.osgeo.org/download/software/">Web site</a>
offers citations in different styles.
<!-- TODO: g.version should offer this right away -->
Modified: grass/trunk/grasslib.dox
===================================================================
--- grass/trunk/grasslib.dox 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/grasslib.dox 2017-11-12 19:33:52 UTC (rev 71706)
@@ -51,7 +51,7 @@
- gis: \ref gislib
- raster: \ref rasterlib
- vector: \ref vectorlib
- - Temporal GIS API: See http://grass.osgeo.org/grass73/manuals/libpython/temporal_framework.html
+ - Temporal GIS API: See http://grass.osgeo.org/grass75/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/grass73/manuals/libpython/)
+ - python: See GRASS GIS Python library (http://grass.osgeo.org/grass75/manuals/libpython/)
\subsection projlibs Projection Libraries
Modified: grass/trunk/gui/icons/grass.desktop
===================================================================
--- grass/trunk/gui/icons/grass.desktop 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/gui/icons/grass.desktop 2017-11-12 19:33:52 UTC (rev 71706)
@@ -47,8 +47,8 @@
GenericName[uk]=Геоінформаційна система
GenericName[uz]=Geografik axborot tizimi
Icon=grass
-TryExec=/usr/bin/grass73
-Exec=grass73
+TryExec=/usr/bin/grass75
+Exec=grass75
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/trunk/gui/wxpython/README
===================================================================
--- grass/trunk/gui/wxpython/README 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/gui/wxpython/README 2017-11-12 19:33:52 UTC (rev 71706)
@@ -18,7 +18,7 @@
If you want to launch wxPython GUI automatically, start GRASS with
`-gui` parameter
-$ grass73 -gui
+$ grass75 -gui
3 - STARTUP FROM GRASS TERMINAL
Modified: grass/trunk/gui/wxpython/docs/wxGUI.html
===================================================================
--- grass/trunk/gui/wxpython/docs/wxGUI.html 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/gui/wxpython/docs/wxGUI.html 2017-11-12 19:33:52 UTC (rev 71706)
@@ -687,7 +687,7 @@
specifying the <tt>-gui</tt> (or <tt>-wxpython</tt>) switch:
<div class="code"><pre>
-grass73 -gui
+grass75 -gui
</pre></div>
Modified: grass/trunk/gui/wxpython/xml/menudata.README
===================================================================
--- grass/trunk/gui/wxpython/xml/menudata.README 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/gui/wxpython/xml/menudata.README 2017-11-12 19:33:52 UTC (rev 71706)
@@ -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/grass73/manuals/wxGUI.toolboxes.html
+ https://grass.osgeo.org/grass75/manuals/wxGUI.toolboxes.html
(../docs/wxgui_sphinx/src/)
- additionally
https://trac.osgeo.org/grass/wiki/wxGUIDevelopment/Toolboxes
Modified: grass/trunk/imagery/i.topo.corr/test_i.topo.corr_synthetic_DEM_NC.sh
===================================================================
--- grass/trunk/imagery/i.topo.corr/test_i.topo.corr_synthetic_DEM_NC.sh 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/imagery/i.topo.corr/test_i.topo.corr_synthetic_DEM_NC.sh 2017-11-12 19:33:52 UTC (rev 71706)
@@ -3,7 +3,7 @@
# Script to test i.topo.corr with a synthetic map
#
# Use North Carolina location to test:
-# grass73 ~/grassdata/nc_spm_08_grass7/user1
+# grass75 ~/grassdata/nc_spm_08_grass7/user1
if test "$GISBASE" = ""; then
echo "You must be in GRASS to run this program."
Modified: grass/trunk/lib/gis/parser_wps.c
===================================================================
--- grass/trunk/lib/gis/parser_wps.c 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/lib/gis/parser_wps.c 2017-11-12 19:33:52 UTC (rev 71706)
@@ -578,7 +578,7 @@
if(abstract)
{
fprintf(stdout,"\t\t<ows:Abstract>");
- fprintf(stdout, "http://grass.osgeo.org/grass73/manuals/%s.html", identifier);
+ fprintf(stdout, "http://grass.osgeo.org/grass75/manuals/%s.html", identifier);
fprintf(stdout, "</ows:Abstract>\n");
}
Modified: grass/trunk/lib/gpde/gpdelib.dox
===================================================================
--- grass/trunk/lib/gpde/gpdelib.dox 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/lib/gpde/gpdelib.dox 2017-11-12 19:33:52 UTC (rev 71706)
@@ -223,7 +223,7 @@
<P>
<b>Example implementation:</b><br>
-The GRASS module <a href="http://grass.osgeo.org/grass72/manuals/r.gwflow.html">r.gwflow</a>
+The GRASS module <a href="http://grass.osgeo.org/grass75/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/grass73/manuals/r3.gwflow.html">r3.gwflow</a>
+The GRASS module <a href="http://grass.itc.it/grass75/manuals/r3.gwflow.html">r3.gwflow</a>
implements numerical calculation program for transient, confined
groundwater flow in three dimensions.
Modified: grass/trunk/lib/init/README
===================================================================
--- grass/trunk/lib/init/README 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/lib/init/README 2017-11-12 19:33:52 UTC (rev 71706)
@@ -1,10 +1,10 @@
o GRASS text mode startup
- "grass73" starts up d.m by default (if not first time user).
- "grass73 -text" will start up in text mode.
- "grass73 -wxpython" or "grass73 -gui" will start up in wxpython mode.
+ "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.
- You can use alias "grass73" to "grass73 -text" to use text mode by default.
+ You can use alias "grass75" to "grass75 -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
- grass73 - # non-interactive startup using LOCATION location
+ grass75 - # non-interactive startup using LOCATION location
ex2)
export GISDBASE=/usr/home/grass/usr/data1
export LOCATION_NAME=loc1
export MAPSET=map1
- grass73 - # non-interactive startup using
+ grass75 - # non-interactive startup using
# GISDBASE/LOCATION_NAME/MAPSET location
- Also, the first argument of grass73 can override these env vars.
+ Also, the first argument of grass75 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
- grass73 /usr/home/grass/usr/data2/loc2-1/map1-1
+ grass75 /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
- grass73 /usr/home/grass/usr/data2/loc2-1/map1-1
+ grass75 /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
- grass73 map1-1 # non-interactive startup using
+ grass75 map1-1 # non-interactive startup using
# GISDBASE/LOCATION_NAME/map1-1 location
ex6)
@@ -72,7 +72,7 @@
export LOCATION_NAME=loc1
export MAPSET=map1
- grass73 loc2-1/map1-1
+ grass75 loc2-1/map1-1
# non-interactive startup using
# GISDBASE/loc2-1/map1-1 location
Modified: grass/trunk/lib/init/grass.py
===================================================================
--- grass/trunk/lib/init/grass.py 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/lib/init/grass.py 2017-11-12 19:33:52 UTC (rev 71706)
@@ -875,7 +875,7 @@
l = None
if arg == '-':
- # TODO: repair or remove behavior env vars + `grass73 -` (see doc)
+ # TODO: repair or remove behavior env vars + `grass75 -` (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/trunk/lib/init/grass.sh
===================================================================
--- grass/trunk/lib/init/grass.sh 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/lib/init/grass.sh 2017-11-12 19:33:52 UTC (rev 71706)
@@ -28,4 +28,4 @@
fi
export GRASS_PYTHON
-exec "$GRASS_PYTHON" "@BINDIR@/grass73.py" "$@" &
+exec "$GRASS_PYTHON" "@BINDIR@/grass75.py" "$@" &
Modified: grass/trunk/lib/init/grass7.html
===================================================================
--- grass/trunk/lib/init/grass7.html 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/lib/init/grass7.html 2017-11-12 19:33:52 UTC (rev 71706)
@@ -2,7 +2,7 @@
<h2>SYNOPSIS</h2>
-<b>grass73</b> [<b>-h</b> | <b>-help</b> | <b>--help</b>] [<b>-v</b> | <b>--version</b>]
+<b>grass75</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>]
@@ -87,13 +87,13 @@
<p>The startup program will remember both the desired user interface
and mapset. Thus, the next time the user runs GRASS, typing
-<em>grass73</em> (without any options) will start GRASS with the
+<em>grass75</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>grass73</em> program will try to verify that the system you
+the <em>grass75</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>grass73</em> will automatically switch back
+these checks fail then <em>grass75</em> will automatically switch back
to the text user interface mode.
<h2>SAMPLE DATA</h2>
@@ -129,14 +129,14 @@
<h3>User Interface Environment Variable</h3>
-<p>The <em>grass73</em> program will check for the existence of an
+<p>The <em>grass75</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>grass73</em> is run, then it will be created and then saved
+when <em>grass75</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>grass73</em>
+<p>There is an order of precedence in the way <em>grass75</em>
determines the user interface to use. The following is the hierarchy
from highest precedence to lowest.
<ol>
@@ -235,44 +235,44 @@
<p>The following are some examples of how you could start GRASS
<dl>
-<dt><b>grass73</b>
+<dt><b>grass75</b>
<dd> Start GRASS using the default user interface. The user will be
prompted to choose the appropriate location and mapset.
-<dt><b>grass73 -gui</b>
+<dt><b>grass75 -gui</b>
<dd> Start GRASS using the graphical user interface. The user will be
prompted to choose the appropriate location and mapset.
-<dt><b>grass73 -text</b>
+<dt><b>grass75 -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>grass73 -gtext</b>
+<dt><b>grass75 -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>grass73 $HOME/grassdata/spearfish70/user1</b>
+<dt><b>grass75 $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>grass73 -gui -</b>
+<dt><b>grass75 -gui -</b>
<dd> Start GRASS using the graphical user interface and try to
obtain the location and mapset from environment variables.
-<dt><b>grass73 -c EPSG:4326 $HOME/grassdata/mylocation</b>
+<dt><b>grass75 -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>grass73 -c EPSG:5514:3 $HOME/grassdata/mylocation</b>
+<dt><b>grass75 -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>grass73 -c myvector.shp $HOME/grassdata/mylocation</b>
+<dt><b>grass75 -c myvector.shp $HOME/grassdata/mylocation</b>
<dd> Creates new GRASS location based on georeferenced Shapefile
-<dt><b>grass73 -c myraster.tif $HOME/grassdata/mylocation</b>
+<dt><b>grass75 -c myraster.tif $HOME/grassdata/mylocation</b>
<dd> Creates new GRASS location based on georeferenced GeoTIFF file
</dl>
@@ -289,26 +289,26 @@
and exit (<b>-e</b>) immediately:
<div class="code"><pre>
-grass73 -c elevation.tiff -e /path/to/grassdata/test1/
+grass75 -c elevation.tiff -e /path/to/grassdata/test1/
</pre></div>
Linking external raster data to PERMANENT Mapset:
<div class="code"><pre>
-grass73 /path/to/grassdata/test1/PERMANENT/ --exec r.external input=basins.tiff output=basins
-grass73 /path/to/grassdata/test1/PERMANENT/ --exec r.external input=elevation.tiff output=elevation
+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
</pre></div>
Get statistics for one raster map:
<div class="code"><pre>
-grass73 /path/to/grassdata/test1/PERMANENT/ --exec r.univar map=elevation
+grass75 /path/to/grassdata/test1/PERMANENT/ --exec r.univar map=elevation
</pre></div>
Compare the rasters visually:
<div class="code"><pre>
-grass73 /path/to/grassdata/test1/PERMANENT/ --exec g.gui.mapswipe first=elevation second=basins
+grass75 /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>
@@ -319,7 +319,7 @@
<b>Shell script example:</b> the command to execute a shell script might be:
<div class="code"><pre>
-grass73 /path/to/grassdata/test1/PERMANENT/ --exec sh test.sh
+grass75 /path/to/grassdata/test1/PERMANENT/ --exec sh test.sh
</pre></div>
A very simple bash script ("test.sh") may look like this:
@@ -336,7 +336,7 @@
<b>Python script example:</b> the command to execute a Python script might be:
<div class="code"><pre>
-grass73 /path/to/grassdata/test1/PERMANENT/ --exec python test.py
+grass75 /path/to/grassdata/test1/PERMANENT/ --exec python test.py
</pre></div>
A very simple Python script ("test.py") may look like this:
@@ -387,7 +387,7 @@
Start GRASS with the following command:
<div class="code"><pre>
-grass73 -
+grass75 -
</pre></div>
GRASS will start with the mapset defined by LOCATION since the LOCATION
@@ -406,14 +406,14 @@
Start GRASS with the following command:
<div class="code"><pre>
-grass73 -
+grass75 -
</pre></div>
GRASS will start with the mapset defined by
GISDBASE/LOCATION_NAME/MAPSET.
<div class="code"><pre>
-grass73 /usr/home/grass/data/thailand/forests
+grass75 /usr/home/grass/data/thailand/forests
</pre></div>
GRASS will start with the
@@ -421,7 +421,7 @@
environment variables.
<div class="code"><pre>
-grass73 swamps
+grass75 swamps
</pre></div>
GRASS will start with the mapset defined by
@@ -429,7 +429,7 @@
mapset overrides the environment variable MAPSET.
<div class="code"><pre>
-grass73 thailand/forests
+grass75 thailand/forests
</pre></div>
GRASS will start with the mapset defined by GISDBASE/thailand/forests
Modified: grass/trunk/lib/init/helptext.html
===================================================================
--- grass/trunk/lib/init/helptext.html 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/lib/init/helptext.html 2017-11-12 19:33:52 UTC (rev 71706)
@@ -169,13 +169,13 @@
without entering the new location:
<ul>
<li>Using an EPSG code:<br>
- <tt>grass73 -e -c EPSG:32630 /home/user/grassdata/mylocation</tt></li>
+ <tt>grass75 -e -c EPSG:32630 /home/user/grassdata/mylocation</tt></li>
<li>Using a georeferenced raster or vector file:<br>
- <tt>grass73 -e -c MyGeoReferenceFile.tif /home/user/grassdata/mylocation</tt></li>
+ <tt>grass75 -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>grass73 -c /home/user/grassdata/mylocation/mymapset</tt>
+ <tt>grass75 -c /home/user/grassdata/mylocation/mymapset</tt>
</ol>
Modified: grass/trunk/lib/python/docs/src/gunittest_running_tests.rst
===================================================================
--- grass/trunk/lib/python/docs/src/gunittest_running_tests.rst 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/lib/python/docs/src/gunittest_running_tests.rst 2017-11-12 19:33:52 UTC (rev 71706)
@@ -89,7 +89,7 @@
REPORTS=".../testreports"
GRASSSRC=".../grass-src"
# here we suppose default compilation settings of GRASS and no make install
- GRASSBIN="$GRASSSRC/bin.../grass73"
+ GRASSBIN="$GRASSSRC/bin.../grass75"
GRASSDIST="$GRASSSRC/dist..."
# necessary hardcoded GRASS paths
Modified: grass/trunk/lib/python/docs/src/pygrass_gis.rst
===================================================================
--- grass/trunk/lib/python/docs/src/pygrass_gis.rst 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/lib/python/docs/src/pygrass_gis.rst 2017-11-12 19:33:52 UTC (rev 71706)
@@ -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/grass73/manuals/helptext.html>`_.
+<http://grass.osgeo.org/grass75/manuals/helptext.html>`_.
.. _Region-label:
Modified: grass/trunk/lib/python/gunittest/multirunner.py
===================================================================
--- grass/trunk/lib/python/gunittest/multirunner.py 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/lib/python/gunittest/multirunner.py 2017-11-12 19:33:52 UTC (rev 71706)
@@ -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\grass73svn.bat'
+ #grass7bin = 'C:\Program Files (x86)\GRASS GIS 7.2.svn\grass75svn.bat'
grass7bin = args.grassbin # TODO: can be used if pressent
########### SOFTWARE
Modified: grass/trunk/lib/python/pygrass/modules/shortcuts.py
===================================================================
--- grass/trunk/lib/python/pygrass/modules/shortcuts.py 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/lib/python/pygrass/modules/shortcuts.py 2017-11-12 19:33:52 UTC (rev 71706)
@@ -47,7 +47,7 @@
return self.cls('%s.%s' % (self.prefix, name.replace('_', '.')))
-# http://grass.osgeo.org/grass73/manuals/full_index.html
+# http://grass.osgeo.org/grass75/manuals/full_index.html
#[ d.* | db.* | g.* | i.* | m.* | ps.* | r.* | r3.* | t.* | v.* ]
#
# d.* display commands
Modified: grass/trunk/lib/python/script/core.py
===================================================================
--- grass/trunk/lib/python/script/core.py 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/lib/python/script/core.py 2017-11-12 19:33:52 UTC (rev 71706)
@@ -768,7 +768,7 @@
"flags" are Python booleans.
Overview table of parser standard options:
- https://grass.osgeo.org/grass73/manuals/parser_standard_options.html
+ https://grass.osgeo.org/grass75/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/trunk/lib/python/script/setup.py
===================================================================
--- grass/trunk/lib/python/script/setup.py 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/lib/python/script/setup.py 2017-11-12 19:33:52 UTC (rev 71706)
@@ -24,12 +24,12 @@
# query GRASS itself for its GISBASE
# (with fixes for specific platforms)
# needs to be edited by the user
- grass7bin = 'grass73'
+ grass7bin = 'grass75'
if sys.platform.startswith('win'):
# MS Windows
- grass7bin = r'C:\OSGeo4W\bin\grass73.bat'
+ grass7bin = r'C:\OSGeo4W\bin\grass75.bat'
# uncomment when using standalone WinGRASS installer
- # grass7bin = r'C:\Program Files (x86)\GRASS GIS 7.2.0\grass73.bat'
+ # grass7bin = r'C:\Program Files (x86)\GRASS GIS 7.2.0\grass75.bat'
# this can be avoided if GRASS executable is added to PATH
elif sys.platform == 'darwin':
# Mac OS X
Modified: grass/trunk/locale/README
===================================================================
--- grass/trunk/locale/README 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/locale/README 2017-11-12 19:33:52 UTC (rev 71706)
@@ -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/grass72/binary/linux/snapshot/transifex/
- --> cronjob: /home/neteler/cronjobs/cron_grass72_releasebranch_72_build_bins.sh
+ stored in https://grass.osgeo.org/grass75/binary/linux/snapshot/transifex/
+ --> cronjob: /home/neteler/cronjobs/cron_grass75_releasebranch_72_build_bins.sh
[2] Transifex job copies daily from [1] to here:
- https://www.transifex.com/grass-gis/grass72/
+ https://www.transifex.com/grass-gis/grass75/
[3] Translators work in Transifex,
Modified: grass/trunk/locale/transifex/.tx/config
===================================================================
--- grass/trunk/locale/transifex/.tx/config 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/locale/transifex/.tx/config 2017-11-12 19:33:52 UTC (rev 71706)
@@ -1,17 +1,17 @@
[main]
host = https://www.transifex.com
-[grass72.grasslibspot]
+[grass75.grasslibspot]
type = PO
source_lang = en
source_file = ../templates/grasslibs.pot
-[grass72.grassmodspot]
+[grass75.grassmodspot]
type = PO
source_lang = en
source_file = ../templates/grassmods.pot
-[grass72.grasswxpypot]
+[grass75.grasswxpypot]
type = PO
source_lang = en
source_file = ../templates/grasswxpy.pot
Modified: grass/trunk/man/build_graphical_index.py
===================================================================
--- grass/trunk/man/build_graphical_index.py 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/man/build_graphical_index.py 2017-11-12 19:33:52 UTC (rev 71706)
@@ -102,10 +102,10 @@
('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/grass73/manuals/libpython/index.html', std_img_name('python'), 'Python'),
+ ('https://grass.osgeo.org/grass75/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'),
- ('http://grass.osgeo.org/grass72/manuals/addons/', std_img_name('addons'), 'Addons'),
+ ('http://grass.osgeo.org/grass75/manuals/addons/', std_img_name('addons'), 'Addons'),
]
Modified: grass/trunk/man/sphinx/conf.py
===================================================================
--- grass/trunk/man/sphinx/conf.py 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/man/sphinx/conf.py 2017-11-12 19:33:52 UTC (rev 71706)
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# GRASS 7.3 Documentation documentation build configuration file, created by
+# GRASS GIS 7.4 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.
@@ -40,7 +40,7 @@
master_doc = 'index'
# General information about the project.
-project = u'GRASS 7.3 Documentation'
+project = u'GRASS 7.4 Documentation'
copyright = u'2017, GRASS Development Team'
# The version info for the project you're documenting, acts as replacement for
@@ -48,7 +48,7 @@
# built documents.
#
# The short X.Y version.
-version = '7.3'
+version = '7.4'
# The full version, including alpha/beta/rc tags.
release = 'svn'
@@ -164,7 +164,7 @@
#html_file_suffix = None
# Output file base name for HTML help builder.
-htmlhelp_basename = 'GRASS73Documentationdoc'
+htmlhelp_basename = 'grass75Documentationdoc'
# -- 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', 'GRASS73Documentation.tex', u'GRASS 7.3 Documentation Documentation',
+ ('content', 'grass75Documentation.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', 'grass73documentation', u'GRASS 7.3 Documentation Documentation',
+ ('content', 'grass75documentation', 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', 'GRASS73Documentation', u'GRASS 7.3 Documentation Documentation',
- u'GRASS Development Team', 'GRASS73Documentation', 'One line description of project.',
+ ('content', 'grass75Documentation', u'GRASS 7.4 Documentation Documentation',
+ u'GRASS Development Team', 'grass75Documentation', 'One line description of project.',
'Miscellaneous'),
]
@@ -245,7 +245,7 @@
# -- Options for Epub output ---------------------------------------------------
# Bibliographic Dublin Core info.
-epub_title = u'GRASS 7.3 Documentation'
+epub_title = u'GRASS 7.4 Documentation'
epub_author = u'GRASS Development Team'
epub_publisher = u'GRASS Development Team'
epub_copyright = u'2017, GRASS Development Team'
Modified: grass/trunk/mswindows/Installer-Files/WinGRASS-README.url
===================================================================
--- grass/trunk/mswindows/Installer-Files/WinGRASS-README.url 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/mswindows/Installer-Files/WinGRASS-README.url 2017-11-12 19:33:52 UTC (rev 71706)
@@ -1,5 +1,5 @@
[InternetShortcut]
-URL=http://grass.osgeo.org/grass72/binary/mswindows/native/README.html
+URL=http://grass.osgeo.org/grass75/binary/mswindows/native/README.html
IDList=
IconFile=http://grass.osgeo.org/favicon.ico
IconIndex=1
Modified: grass/trunk/temporal/t.rast.accumulate/t.rast.accumulate.html
===================================================================
--- grass/trunk/temporal/t.rast.accumulate/t.rast.accumulate.html 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/temporal/t.rast.accumulate/t.rast.accumulate.html 2017-11-12 19:33:52 UTC (rev 71706)
@@ -66,7 +66,7 @@
mkdir -p /tmp/grassdata/LL
# Start GRASS and create a new location with PERMANENT mapset
-grass73 -c EPSG:4326 /tmp/grassdata/LL/PERMANENT
+grass75 -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/trunk/vector/v.info/v.info.html
===================================================================
--- grass/trunk/vector/v.info/v.info.html 2017-11-12 17:39:23 UTC (rev 71705)
+++ grass/trunk/vector/v.info/v.info.html 2017-11-12 19:33:52 UTC (rev 71706)
@@ -128,7 +128,7 @@
<h2>PYTHON</h2>
-See <em><a href="http://grass.osgeo.org/grass73/manuals/libpython/">Python
+See <em><a href="http://grass.osgeo.org/grass75/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