Sfoglia il codice sorgente

boosted to GRASS 7 for parallel installation

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@31530 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Neteler 17 anni fa
parent
commit
be07385969
8 ha cambiato i file con 49 aggiunte e 48 eliminazioni
  1. 1 1
      lib/init/Makefile
  2. 12 11
      lib/init/README
  3. 1 1
      lib/init/grass.bat
  4. 24 24
      lib/init/grass6.html
  5. 2 2
      lib/init/helptext.html
  6. 2 2
      lib/init/init.bat
  7. 3 3
      lib/init/init.sh
  8. 4 4
      lib/init/variables.html

+ 1 - 1
lib/init/Makefile

@@ -72,7 +72,7 @@ endif
 default: $(FILES)
 	$(MKDIR) $(GISBASE)/docs/html
 	$(INSTALL_DATA) variables.html $(GISBASE)/docs/html/variables.html
-	$(INSTALL_DATA) grass6.html $(GISBASE)/docs/html/grass6.html
+	$(INSTALL_DATA) grass7.html $(GISBASE)/docs/html/grass7.html
 	$(INSTALL_DATA) helptext.html $(GISBASE)/docs/html/helptext.html
 	$(INSTALL_DATA) help_loc_struct.png $(GISBASE)/docs/html/help_loc_struct.png
 

+ 12 - 11
lib/init/README

@@ -1,10 +1,11 @@
 o GRASS text mode startup
 
-  "grass63" starts up d.m by default (if not first time user).
-  "grass63 -text" will start up in text mode.
-  "grass63 -tcltk" or "grass63 -gui" will start up in tcltk mode.
+  "grass70" starts up d.m by default (if not first time user).
+  "grass70 -text" will start up in text mode.
+  "grass70 -tcltk" or "grass70 -gui" will start up in tcltk mode.
+  "grass70 -wxpython" will start up in wxpython mode.
 
-  You can use alias "grass63" to "grass63 -text" to use text mode by default.
+  You can use alias "grass70" to "grass70 -text" to use text mode by default.
   Or set env var GRASS_GUI=text.
 
 
@@ -25,18 +26,18 @@ o GRASS non-interactive startup examples
 	export LOCATION_NAME=loc1
 	export MAPSET=map1
 
-	grass63 -	# non-interactive startup using LOCATION location
+	grass70 -	# non-interactive startup using LOCATION location
 
   ex2)
 	export GISDBASE=/usr/home/grass/usr/data1
 	export LOCATION_NAME=loc1
 	export MAPSET=map1
   	
-	grass63 -	# non-interactive startup using
+	grass70 -	# non-interactive startup using
 			# GISDBASE/LOCATION_NAME/MAPSET location
 
 
-  Also, the first argument of grass63 can override these env vars.
+  Also, the first argument of grass70 can override these env vars.
 
   ex3)
   	export LOCATION=/usr/home/grass/usr/data1/loc1/map1
@@ -44,7 +45,7 @@ o GRASS non-interactive startup examples
 	export LOCATION_NAME=loc1
 	export MAPSET=map1
 
-	grass63 /usr/home/grass/usr/data2/loc2-1/map1-1
+	grass70 /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 +54,7 @@ o GRASS non-interactive startup examples
 	export LOCATION_NAME=loc1
 	export MAPSET=map1
   	
-	grass63 /usr/home/grass/usr/data2/loc2-1/map1-1
+	grass70 /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 +64,7 @@ o GRASS non-interactive startup examples
 	export LOCATION_NAME=loc1
 	export MAPSET=map1
 
-	grass63 map1-1	# non-interactive startup using
+	grass70 map1-1	# non-interactive startup using
 			# GISDBASE/LOCATION_NAME/map1-1 location
 
   ex6)
@@ -72,7 +73,7 @@ o GRASS non-interactive startup examples
 	export LOCATION_NAME=loc1
 	export MAPSET=map1
 
-	grass63 loc2-1/map1-1
+	grass70 loc2-1/map1-1
 			# non-interactive startup using
 			# GISDBASE/loc2-1/map1-1 location
 

+ 1 - 1
lib/init/grass.bat

@@ -8,7 +8,7 @@ rem #########################################################################
 rem *******Environment variables***********
 rem Uncomment and set the following values if they differ from the indicated default
 
-rem Directory where your .grassrc6 file will be stored
+rem Directory where your .grassrc7 file will be stored
 rem set HOME=%USERPROFILE%
 
 rem Name of the wish (Tk) executable

+ 24 - 24
lib/init/grass6.html

@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
 <head>
- <TITLE>GRASS 6</TITLE>
+ <TITLE>GRASS 7</TITLE>
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  <link rel="stylesheet" href="grassdocs.css" type="text/css">
 </head>
@@ -12,11 +12,11 @@
 
 <H2>NAME</H2>
 
-<EM><B>grass63</B></EM>  - The GRASS startup program<BR>
+<EM><B>grass70</B></EM>  - The GRASS startup program<BR>
 
 <H2>SYNOPSIS</H2>
 
-<B>grass63</B> [<B>-</B>] [<B>-v</B>] [<B>-h | -help | --help</B>]
+<B>grass70</B> [<B>-</B>] [<B>-v</B>] [<B>-h | -help | --help</B>]
     [<B>-text | -gui | -tcltk | -wx]</B>]
     [[[<B>&lt;GISDBASE&gt;/</B>]<B>&lt;LOCATION_NAME&gt;/</B>]
     	<B>&lt;MAPSET&gt;</B>]
@@ -37,14 +37,14 @@ mapset to work on.
 
 <P>
 The GRASS program will save both the desired user interface and mapset.
-Thus, the next time the user runs GRASS, typing <EM>grass63</EM> (without any
+Thus, the next time the user runs GRASS, typing <EM>grass70</EM> (without any
 options) will start grass with the previous settings for the user interface
 and mapset.
 
 <P>
-If you specify a graphical user interface (Tcl/Tk or wxPython), the <EM>grass63</EM>
+If you specify a graphical user interface (Tcl/Tk or wxPython), the <EM>grass70</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>grass63</EM>
+can access it successfully. If any of these checks fail, then <EM>grass70</EM>
 will automatically switch back to the text user interface mode.
 
 <H2>OPTIONS</H2>
@@ -102,20 +102,20 @@ All command line options are optional.
 <H3>User Interface Environment Variable</H3>
 
 <P>
-The <EM>grass63</EM> program will check for the existence of an environment
+The <EM>grass70</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>grass63</EM> is run, then
-it will be created and then saved in the $HOME/.grassrc6 file for the next
+GRASS to use. If this variable is not set when <EM>grass70</EM> is run, then
+it will be created and then saved in the $HOME/.grassrc7 file for the next
 time GRASS is run. In addition to "text", "tcltk" or "wx", the GRASS_GUI variable
 can be set to the name of the GUI to use, for example "gis.m" or "wxgrass".
 
 <P>
-There is an order of precedence in the way <EM>grass63</EM> determines the user
+There is an order of precedence in the way <EM>grass70</EM> determines the user
 interface to use. The following is the hierarchy from highest precedence to
 lowest.
 
 <P>
-The user may add own environment variable settings to $HOME/.grassrc6 file
+The user may add own environment variable settings to $HOME/.grassrc7 file
 which are used during next startup of GRASS (list of 
 <a href=variables.html>implemented environment variables</a>). 
 
@@ -124,7 +124,7 @@ which are used during next startup of GRASS (list of
 <DT><B>Interface precedence</B>
 <DD>Command line argument<BR>
     Environment variable GRASS_GUI<BR>
-    Value set in $HOME/.grassrc6<BR>
+    Value set in $HOME/.grassrc7<BR>
     Default value - currently gis.m
 
 </DL>
@@ -219,7 +219,7 @@ the mapset to use. The following are some possible examples.
     
     Start GRASS with the following command:<BR><BR>
     
-    grass63 -<BR><BR>
+    grass70 -<BR><BR>
     
     GRASS will start with the mapset defined by LOCATION since the LOCATION
     variable overrides the other variables.<BR><BR>
@@ -233,7 +233,7 @@ the mapset to use. The following are some possible examples.
     
     Start GRASS with the following command:<BR><BR>
     
-    grass63 -<BR><BR>
+    grass70 -<BR><BR>
     
     GRASS will start with the mapset defined by
     GISDBASE/LOCATION_NAME/MAPSET.<BR><BR>
@@ -248,7 +248,7 @@ the mapset to use. The following are some possible examples.
     
     Start GRASS with the following command:<BR><BR>
     
-    grass63 /usr/home/grass/data/thailand/forests<BR><BR>
+    grass70 /usr/home/grass/data/thailand/forests<BR><BR>
     
     GRASS will start with the mapset /home/grass/data/thailand/forests which
     overrides the environment variables.<BR><BR>
@@ -263,7 +263,7 @@ the mapset to use. The following are some possible examples.
     
     Start GRASS with the following command:<BR><BR>
     
-    grass63 swamps<BR><BR>
+    grass70 swamps<BR><BR>
     
     GRASS will start with the mapset defined by GISDBASE/LOCATION_NAME/swamps
     since the command line argument for the mapset overrides the environment
@@ -279,7 +279,7 @@ the mapset to use. The following are some possible examples.
     
     Start GRASS with the following command:<BR><BR>
     
-    grass63 thailand/forests<BR><BR>
+    grass70 thailand/forests<BR><BR>
     
     GRASS will start with the mapset defined by GISDBASE/thailand/forests
     since the command line arguments for the location and mapset overrides
@@ -300,19 +300,19 @@ The following are some examples of how you could start GRASS
 
 <DL>
 
-<DT><B>grass63</B>
+<DT><B>grass70</B>
 <DD> Start GRASS using the default user interface. The user will be prompted
     to choose the appropriate location and mapset.
 
-<DT><B>grass63 -gui</B>
+<DT><B>grass70 -gui</B>
 <DD> Start GRASS using the Tcl/Tk based user interface. The user will be
     prompted to choose the appropriate location and mapset.
 
-<DT><B>grass63 -text</B>
+<DT><B>grass70 -text</B>
 <DD> Start GRASS using the text based user interface. The user will be
     prompted to choose the appropriate location and mapset.
 
-<DT><B>grass63 -gui -</B>
+<DT><B>grass70 -gui -</B>
 <DD> Start GRASS using the Tcl/Tk based user interface and try to obtain
     the location and mapset from environment variables.
 
@@ -345,10 +345,10 @@ first version of <EM>wish</EM>.
 
 <H2>FILES</H2>
 
-<EM>$UNIX_BIN/grass63</EM> - GRASS startup program (Linux, MacOSX etc.)<BR><BR>
-<EM>$WINDOWS_BIN/grass63.bat</EM> - GRASS startup program (MS-Windows)<BR><BR>
+<EM>$UNIX_BIN/grass70</EM> - GRASS startup program (Linux, MacOSX etc.)<BR><BR>
+<EM>$WINDOWS_BIN/grass70.bat</EM> - GRASS startup program (MS-Windows)<BR><BR>
 <EM>$GISBASE/etc/Init.sh</EM> - GRASS initialization script called by
-    <EM>grass63</EM><BR><BR>
+    <EM>grass70</EM><BR><BR>
 <EM>$GISBASE/etc/gis_set.tcl</EM> - Tcl/Tk script to set the
     location and mapset to use. Called by <EM>Init.sh</EM><BR><BR>
 

+ 2 - 2
lib/init/helptext.html

@@ -174,9 +174,9 @@ Please have a look at the GRASS web site for tutorials and books:
 
 <H2>See also</H2>
 
-<a href="grass6.html">GRASS 6 launch manual page</a>
+<a href="grass7.html">GRASS 7 launch manual page</a>
 <br>
-<a href="index.html">GRASS 6 Reference Manual</a>
+<a href="index.html">GRASS 7 Reference Manual</a>
 
 <p><i>Last changed: $Date$</i>
 <HR>

+ 2 - 2
lib/init/init.bat

@@ -14,7 +14,7 @@ rem             In particular also, GUI mode prints nothing to the terminal
 rem             and does not expect or provide an interactive terminal
 rem             running in addition to the GUI display.
 rem 
-rem  COPYRIGHT: (C) 2006 by the GRASS Development Team
+rem  COPYRIGHT: (C) 2006, 2008 by the GRASS Development Team
 rem
 rem             This program is free software under the GNU General Public
 rem   	    	License (>=v2). Read the file COPYING that comes with GRASS
@@ -30,7 +30,7 @@ if not "%GRASS_ADDON_PATH%"=="" set PATH=%WINGISBASE%\bin;%WINGISBASE%\lib;%GRAS
 
 set GRASS_VERSION=GRASS_VERSION_NUMBER
 if "%HOME%"=="" set HOME=%USERPROFILE%
-set WINGISRC=%HOME%\.grassrc6
+set WINGISRC=%HOME%\.grassrc7
 rem Make sure %GISRC% is set so g.dirseps will work
 rem (not actually used)
 set GISRC=junk

+ 3 - 3
lib/init/init.sh

@@ -159,7 +159,7 @@ GIS_LOCK=$$
 export GIS_LOCK
 
 # Set the global grassrc file
-GISRCRC="$HOME/.grassrc6"
+GISRCRC="$HOME/.grassrc7"
 
 # Set the session grassrc file
 if [ "$MINGW" ] ; then
@@ -187,8 +187,8 @@ cleanup_tmp()
 
 ## use TMPDIR if it exists, otherwise /tmp
 #tmp=${TMPDIR-/tmp}
-#tmp="$tmp/grass6-$USER-$GIS_LOCK"
-tmp=/tmp/grass6-$USER-$GIS_LOCK
+#tmp="$tmp/grass7-$USER-$GIS_LOCK"
+tmp=/tmp/grass7-$USER-$GIS_LOCK
 (umask 077 && mkdir "$tmp") || {
     echo "Cannot create temporary directory! Exiting." 1>&2
     exit 1

+ 4 - 4
lib/init/variables.html

@@ -75,7 +75,7 @@ into GRASS, store them in:<br>
 <h2>Setting GRASS variables</h2>
 
 Use <em><a href="g.gisenv.html">g.gisenv</a></em> within GRASS. This permanently
-predefines GRASS variables in the <tt>.grassrc6</tt> file.
+predefines GRASS variables in the <tt>.grassrc7</tt> file.
 <br><br>
 Usage:
 <div class="code"><pre>
@@ -107,7 +107,7 @@ text
   
   <br>
   <dt>GISRC</dt>
-  <dd>name of <tt>.grassrc6</tt> file. Defines the system wide value
+  <dd>name of <tt>.grassrc7</tt> file. Defines the system wide value
     while in a GRASS session.</dd>
   
   <br>
@@ -559,11 +559,11 @@ detailed list of the variables.
 <h2>GRASS-related Files</h2>
 
 <dl>
-  <dt>$HOME/.grassrc6</dt>
+  <dt>$HOME/.grassrc7</dt>
   <dd>stores the GRASS variables (but not environment variables)</dd>
   
   <br>
-  <dt>$HOME/.grasslogin6</dt>
+  <dt>$HOME/.grasslogin7</dt>
   <dd>stores the DBMI passwords in this hidden file.
     Only the file owner can access this file.</dd>