[GRASS-SVN] r59692 - in grass/trunk: gui/wxpython/docs lib/gis lib/gpde lib/init lib/python/pygrass/modules
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Apr 11 06:03:40 PDT 2014
Author: neteler
Date: 2014-04-11 06:03:39 -0700 (Fri, 11 Apr 2014)
New Revision: 59692
Modified:
grass/trunk/gui/wxpython/docs/wxGUI.html
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/python/pygrass/modules/shortcuts.py
Log:
version update: trunk is grass71
Modified: grass/trunk/gui/wxpython/docs/wxGUI.html
===================================================================
--- grass/trunk/gui/wxpython/docs/wxGUI.html 2014-04-11 12:57:55 UTC (rev 59691)
+++ grass/trunk/gui/wxpython/docs/wxGUI.html 2014-04-11 13:03:39 UTC (rev 59692)
@@ -47,7 +47,7 @@
specifying the <tt>-gui</tt> (or <tt>-wxpython</tt>) switch:
<div class="code"><pre>
-grass70 -gui
+grass71 -gui
</pre></div>
<p>
Modified: grass/trunk/lib/gis/parser_wps.c
===================================================================
--- grass/trunk/lib/gis/parser_wps.c 2014-04-11 12:57:55 UTC (rev 59691)
+++ grass/trunk/lib/gis/parser_wps.c 2014-04-11 13:03:39 UTC (rev 59692)
@@ -578,7 +578,7 @@
if(abstract)
{
fprintf(stdout,"\t\t<ows:Abstract>");
- fprintf(stdout, "http://grass.osgeo.org/grass70/manuals/html70_user/%s.html", identifier);
+ fprintf(stdout, "http://grass.osgeo.org/grass71/manuals/%s.html", identifier);
fprintf(stdout, "</ows:Abstract>\n");
}
Modified: grass/trunk/lib/gpde/gpdelib.dox
===================================================================
--- grass/trunk/lib/gpde/gpdelib.dox 2014-04-11 12:57:55 UTC (rev 59691)
+++ grass/trunk/lib/gpde/gpdelib.dox 2014-04-11 13:03:39 UTC (rev 59692)
@@ -223,7 +223,7 @@
<P>
<b>Example implementation:</b><br>
-The GRASS module <a href="http://grass.osgeo.org/grass70/manuals/r.gwflow.html">r.gwflow</a>
+The GRASS module <a href="http://grass.osgeo.org/grass71/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/grass70/manuals/r3.gwflow.html">r3.gwflow</a>
+The GRASS module <a href="http://grass.itc.it/grass71/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 2014-04-11 12:57:55 UTC (rev 59691)
+++ grass/trunk/lib/init/README 2014-04-11 13:03:39 UTC (rev 59692)
@@ -1,10 +1,10 @@
o GRASS text mode startup
- "grass70" starts up d.m by default (if not first time user).
- "grass70 -text" will start up in text mode.
- "grass70 -wxpython" or "grass70 -gui" will start up in wxpython mode.
+ "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.
- You can use alias "grass70" to "grass70 -text" to use text mode by default.
+ You can use alias "grass71" to "grass71 -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
- grass70 - # non-interactive startup using LOCATION location
+ grass71 - # non-interactive startup using LOCATION location
ex2)
export GISDBASE=/usr/home/grass/usr/data1
export LOCATION_NAME=loc1
export MAPSET=map1
- grass70 - # non-interactive startup using
+ grass71 - # non-interactive startup using
# GISDBASE/LOCATION_NAME/MAPSET location
- Also, the first argument of grass70 can override these env vars.
+ Also, the first argument of grass71 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
- grass70 /usr/home/grass/usr/data2/loc2-1/map1-1
+ grass71 /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
- grass70 /usr/home/grass/usr/data2/loc2-1/map1-1
+ grass71 /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
- grass70 map1-1 # non-interactive startup using
+ grass71 map1-1 # non-interactive startup using
# GISDBASE/LOCATION_NAME/map1-1 location
ex6)
@@ -72,7 +72,7 @@
export LOCATION_NAME=loc1
export MAPSET=map1
- grass70 loc2-1/map1-1
+ grass71 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 2014-04-11 12:57:55 UTC (rev 59691)
+++ grass/trunk/lib/init/grass.py 2014-04-11 13:03:39 UTC (rev 59692)
@@ -1357,10 +1357,10 @@
if not os.access(gisrc, os.F_OK):
if grass_gui == 'text' and len(args) == 0:
fatal(_("Unable to start GRASS. You can:\n"
- " - Launch GRASS with '-gui' switch (`grass70 -gui`)\n"
+ " - Launch GRASS with '-gui' switch (`grass71 -gui`)\n"
" - Create manually GISRC file (%s)\n"
" - Launch GRASS with path to "
- "the location/mapset as an argument (`grass70 /path/to/location/mapset`)") % gisrcrc)
+ "the location/mapset as an argument (`grass71 /path/to/location/mapset`)") % gisrcrc)
grass_intro()
else:
clean_temp()
Modified: grass/trunk/lib/init/grass.sh
===================================================================
--- grass/trunk/lib/init/grass.sh 2014-04-11 12:57:55 UTC (rev 59691)
+++ grass/trunk/lib/init/grass.sh 2014-04-11 13:03:39 UTC (rev 59692)
@@ -28,4 +28,4 @@
fi
export GRASS_PYTHON
-exec "$GRASS_PYTHON" "@BINDIR@/grass70.py" "$@" &
+exec "$GRASS_PYTHON" "@BINDIR@/grass71.py" "$@" &
Modified: grass/trunk/lib/init/grass7.html
===================================================================
--- grass/trunk/lib/init/grass7.html 2014-04-11 12:57:55 UTC (rev 59691)
+++ grass/trunk/lib/init/grass7.html 2014-04-11 13:03:39 UTC (rev 59692)
@@ -2,7 +2,7 @@
<h2>SYNOPSIS</h2>
-<b>grass70</b> [<b>-h</b> | <b>-help</b> | <b>--help</b>] [<b>-v</b> | <b>--version</b>]
+<b>grass71</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</b>]
[<b>-text</b> | <b>-gtext</b> | <b>-gui</b>]
[[[<b><GISDBASE>/</b>]<b><LOCATION_NAME>/</b>]
@@ -72,13 +72,13 @@
<p>The startup program will remember both the desired user interface
and mapset. Thus, the next time the user runs GRASS, typing
-<em>grass70</em> (without any options) will start GRASS with the
+<em>grass71</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>grass70</em> program will try to verify that the system you
+the <em>grass71</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>grass70</em> will automatically switch back
+these checks fail then <em>grass71</em> will automatically switch back
to the text user interface mode.
<h2>ENVIRONMENT VARIABLES</h2>
@@ -103,14 +103,14 @@
<h3>User Interface Environment Variable</h3>
-<p>The <em>grass70</em> program will check for the existence of an
+<p>The <em>grass71</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>grass70</em> is run, then it will be created and then saved
+when <em>grass71</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>grass70</em>
+<p>There is an order of precedence in the way <em>grass71</em>
determines the user interface to use. The following is the hierarchy
from highest precedence to lowest.
<ol>
@@ -209,39 +209,39 @@
<p>The following are some examples of how you could start GRASS
<dl>
-<dt><b>grass70</b>
+<dt><b>grass71</b>
<dd> Start GRASS using the default user interface. The user will be
prompted to choose the appropriate location and mapset.
-<dt><b>grass70 -gui</b>
+<dt><b>grass71 -gui</b>
<dd> Start GRASS using the graphical user interface. The user will be
prompted to choose the appropriate location and mapset.
-<dt><b>grass70 -text</b>
+<dt><b>grass71 -text</b>
<dd> Start GRASS using the text-based user interface. Appropriate
location and mapset must be set by environmental variables (see
examples bellow) otherwise taken from the last GRASS session.</dd>
-<dt><b>grass70 -gtext</b>
+<dt><b>grass71 -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>grass70 $HOME/grassdata/spearfish60/user1</b>
+<dt><b>grass71 $HOME/grassdata/spearfish60/user1</b>
<dd> Start GRASS using the default user interface and automatically
launch into the given mapset, bypassing the mapset selection menu.
-<dt><b>grass70 -gui -</b>
+<dt><b>grass71 -gui -</b>
<dd> Start GRASS using the graphical user interface and try to
obtain the location and mapset from environment variables.
-<dt><b>grass70 -c EPSG:4326 $HOME/grassdata/mylocation</b>
+<dt><b>grass71 -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>grass70 -c myvector.shp $HOME/grassdata/mylocation</b>
+<dt><b>grass71 -c myvector.shp $HOME/grassdata/mylocation</b>
<dd> Creates new GRASS location based on georeferenced Shapefile
-<dt><b>grass70 -c myraster.tif $HOME/grassdata/mylocation</b>
+<dt><b>grass71 -c myraster.tif $HOME/grassdata/mylocation</b>
<dd> Creates new GRASS location based on georeferenced GeoTIFF file
</dl>
@@ -265,7 +265,7 @@
Start GRASS with the following command:
<div class="code"><pre>
-grass70 -
+grass71 -
</pre></div>
GRASS will start with the mapset defined by LOCATION since the LOCATION
@@ -284,14 +284,14 @@
Start GRASS with the following command:
<div class="code"><pre>
-grass70 -
+grass71 -
</pre></div>
GRASS will start with the mapset defined by
GISDBASE/LOCATION_NAME/MAPSET.
<div class="code"><pre>
-grass70 /usr/home/grass/data/thailand/forests
+grass71 /usr/home/grass/data/thailand/forests
</pre></div>
GRASS will start with the
@@ -299,7 +299,7 @@
environment variables.
<div class="code"><pre>
-grass70 swamps
+grass71 swamps
</pre></div>
GRASS will start with the mapset defined by
@@ -307,7 +307,7 @@
mapset overrides the environment variable MAPSET.
<div class="code"><pre>
-grass70 thailand/forests
+grass71 thailand/forests
</pre></div>
GRASS will start with the mapset defined by GISDBASE/thailand/forests
Modified: grass/trunk/lib/python/pygrass/modules/shortcuts.py
===================================================================
--- grass/trunk/lib/python/pygrass/modules/shortcuts.py 2014-04-11 12:57:55 UTC (rev 59691)
+++ grass/trunk/lib/python/pygrass/modules/shortcuts.py 2014-04-11 13:03:39 UTC (rev 59692)
@@ -50,7 +50,7 @@
return self.cls('%s.%s' % (self.prefix, name.replace('_', '.')))
-# http://grass.osgeo.org/grass70/manuals/html70_user/full_index.html
+# http://grass.osgeo.org/grass71/manuals/full_index.html
#[ d.* | db.* | g.* | i.* | m.* | ps.* | r.* | r3.* | t.* | v.* ]
#
# d.* display commands
More information about the grass-commit
mailing list