boosted to GRASS 7 for parallel installation

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@31532 15284696-431f-4ddb-bdfa-cd5b030d7da7

INSTALL

@@ -44,11 +44,11 @@ Installation order:
 
 GRASS source code is currently distributed in 2 forms:
 
-1) Officially released source code (e.g. grass-6.0.0.tar.gz or later)
+1) Officially released source code (e.g. grass-7.0.0.tar.gz or later)
 
   The Full source code version contains all the GRASS source code
   required for compilation. It is distributed as one file (*.tar.gz
-  package) and the version is composed of 3 numbers, e.g. 6.0.0, 6.0.1
+  package) and the version is composed of 3 numbers, e.g. 7.0.0, 7.0.1
   etc.
 
 2) SVN or SVN Snapshots of source code (SVN or SVN snapshot)
@@ -57,7 +57,7 @@ GRASS source code is currently distributed in 2 forms:
   repository (http://svn.osgeo.org/grass/) or as a snapshot
   (*.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-6.3.svn_src_snapshot_2008_01_19.tar.gz
+  the SVN repository), e.g. grass-7.0.svn_src_snapshot_2008_10_19.tar.gz
 
 
 (B) COMPILATION
@@ -150,16 +150,16 @@ See also CODE OPTIMIZATION below.
 
 After compilation, the resulting code is stored in the directory
     ./dist.$ARCH
-and the scripts (grass6, ...) in
+and the scripts (grass70, ...) in
     ./bin.$ARCH
 
 To run GRASS, simply start
-    ./bin.$ARCH/grass6
+    ./bin.$ARCH/grass70
 
 or run
 
     make install
-    grass6
+    grass70
 
 
 (E) INSTALLATION ON MACOSX
@@ -186,7 +186,7 @@ SVN, you have to perform a few steps. In general:
 
 In detail:
 
-    cd /where/your/grass6sourcecode/lives/
+    cd /where/your/grass7sourcecode/lives/
     svn update
     ./configure ...
     make
@@ -207,9 +207,9 @@ the main source code directory or locally with
     "INST_NOW=y make"
 
 You may want to define an alias for this:
-    alias gmake6='INST_NOW=y make'
+    alias gmake7='INST_NOW=y make'
 Then simply compile/install the current module with
-    gmake6
+    gmake7
 
 Note: If you keep your module source code outside the standard GRASS
 source code directory structure, you will have to change the relative

gem/docs/GEM-Manual/GEM-Manual.html

@@ -51,7 +51,7 @@ Manual</H1>
 
 <H3>Abstract:</H3>
 <DIV>
-GRASS 6 Extensions Manager (GEM) is a small stand-alone program intended
+GRASS 7 Extensions Manager (GEM) is a small stand-alone program intended
 to make it easy for GRASS GIS users to download, compile and install
 additional GRASS modules. GEM manages source code, scripts and pre-compiled
 binaries in a simple file layout called an <I>extension</I>. Extensions
@@ -62,7 +62,7 @@ file, a so-called <I>extension package</I> using external programs
 such as tar and gzip. An extension (package) can be created easily
 by copying existing source codes into the right places of a skeleton
 file layout and filling in some information in simple, commented ASCII
-files. Makefiles written for GRASS 6 should work with minimal changes
+files. Makefiles written for GRASS 7 should work with minimal changes
 as GEM uses a simplified version of the orginal GRASS make system.
 
 <P>
@@ -412,7 +412,7 @@ given in section <A HREF="#sub:Basic-Usage">3.4</A>.
 <!-- MATH
  $\framebox{\parbox[t][1\totalheight]{1\columnwidth}{%
 Note: please make sure that you system-wide linker path includes the
-location of the GRASS dynamic libraries (e.g. \emph{/usr/local/grass-6.1.cvs/libs}).
+location of the GRASS dynamic libraries (e.g. \emph{/usr/local/grass-7.x.cvs/libs}).
 This is usually done by adding an appropriate entry to \emph{/etc/ld.so.conf}
 and running \emph{ldconfig}. You may have to consult your system's
 administrator.%
@@ -1020,8 +1020,8 @@ files (see following sections).
 
 <P>
 You will find the skeleton package files in the subdirectory <I>$GISBASE/etc/gem/skeleton</I>
-(replace <I>$GISBASE</I> with the path to your GRASS 6.1 install,
-e.g. <I>/usr/local/grass-6.1.cvs</I>).
+(replace <I>$GISBASE</I> with the path to your GRASS 7.1 install,
+e.g. <I>/usr/local/grass-7.x.cvs</I>).
 
 <P>
 Look into the skeleton extension directory and open the ASCII files
@@ -1348,7 +1348,7 @@ script using GEM's ``-config-opts='' option.
 The default configure script, that ships with the skeleton extension
 has all optional dependencies disabled (ca. line 2600 and following
 of the configure script). The check for the proj program and libraries
-(mandatory for GRASS 6.1) has been completely removed. If your extension
+(mandatory for GRASS 7.1) has been completely removed. If your extension
 code calls proj directly, you may want to add this part of the configure
 script back in.
 
@@ -1729,7 +1729,7 @@ respectively). HTML man pages for individual modules have to be named
 code directory.
 
 <P>
-Use an HTML manual page of an existing GRASS 6.1 module for a template.
+Use an HTML manual page of an existing GRASS 7.1 module for a template.
 
 <P>
 At the top of your description.html file, right after the <TT>&lt;h2&gt;NAME&lt;/h2&gt;</TT>
@@ -1833,7 +1833,7 @@ operation will be:
 or
 
 <P>
-<I>/Applications/Grass/grass61cvs.app/Contents/Resources/grass-6.1.cvs</I>
+<I>/Applications/Grass/grass61cvs.app/Contents/Resources/grass-7.x.cvs</I>
 
 <P>
 if you decided to also install Lorenzo's copy of the CVS version.
@@ -2007,8 +2007,8 @@ B..2 Changes to the GRASS Make System Files</A>
 
 <P>
 GEM exports three environment variables that point to the directories
-storing GRASS 6 headers and libs and to the install location (e.g.
-<I>/usr/local/grass-6.2.</I>0):
+storing GRASS 7 headers and libs and to the install location (e.g.
+<I>/usr/local/grass-7.x.</I>0):
 
 <P>
 <TT>GINSTALL_INC</TT>

gem/main.c

@@ -398,7 +398,7 @@ int main (int argc, char *argv[]) {
 					print_error (ERR_INVOCATION,"missing file or directory name.\n");
 				}			
 			if ( optopt == 'g' ) {
-				print_error (ERR_INVOCATION,"missing path to GRASS 6.\n");
+				print_error (ERR_INVOCATION,"missing path to GRASS 7.\n");
 			}
 			if ( optopt == 'b' ) {
 				print_error (ERR_INVOCATION,"missing name of binary architecture.\n");

gem/skeleton/post

@@ -18,7 +18,7 @@
 # GEM_ACTION can be "INSTALL", "QUERY", "DETAILS", "LICENSE", "CLEAN"
 
 # INSTALL_BASE is the path to the GRASS binary files installed on the
-# user's system (e.g. /usr/local/grass-6.x.y).
+# user's system (e.g. /usr/local/grass-7.x.y).
 # For some actions, INSTALL_BASE is not required and will be set to
 # "UNDEFINED".
 

gem/skeleton/uninstall

@@ -8,7 +8,7 @@
 
 # UNINSTALL_BASE will be exported by the GRASS extension managing tool
 # it contains the path to the GRASS binary files installed on the
-# user's system (e.g. /usr/local/grass-6.x.y).
+# user's system (e.g. /usr/local/grass-7.x.y).
 # By prefixing every file name with $UNINSTALL_BASE, we make sure
 # that deletions do not occur outside the GRASS installation dir.
 

general/g.gui/description.html

@@ -28,7 +28,7 @@ Valid values for GRASS_GUI are <tt>text</tt>, <tt>tcltk</tt>,
 <tt>oldtcltk</tt>, and <tt>wxpython</tt>.
 
 <em>g.gisenv</em> variables are stored in the user's home directory
-in a hidden file called "<TT>.grassrc6</TT>". They are not shell environment
+in a hidden file called "<TT>.grassrc7</TT>". They are not shell environment
 variables and the "rc" file is not a classic UNIX run command file,
 it just contains persistent GRASS variables and is not executed.
 

gui/wxpython/docs/wxGUI.html

@@ -7,7 +7,7 @@ GRASS with 'wxpython' switch
     grass -wxpython
 </pre></div>
 
-or define in your <tt>.grassrc6</tt> file 'GRASS_GUI' variable
+or define in your <tt>.grassrc7</tt> file 'GRASS_GUI' variable
 
 <div class="code"><pre>
     GRASS_GUI: wxpython

gui/wxpython/gis_set.py

@@ -357,7 +357,7 @@ class GRASSStartup(wx.Frame):
 
     def _read_grassrc(self):
         """
-        Read variables from $HOME/.grassrc6 file
+        Read variables from $HOME/.grassrc7 file
         """
 
         grassrc = {}

lib/db/README

@@ -26,7 +26,7 @@
 DBMI Library
 
 Original author: Joel Jones (jjones * zorro.cecer.army.mil | jjones * uiuc.edu )
-            Ref: http://grass.itc.it/pipermail/grass-dev/1995-February/002006.html
+            Ref: http://lists.osgeo.org/pipermail/grass-dev/1995-February/002015.html
 
 Directory contents:
 
@@ -45,7 +45,7 @@ The DBMI user modules are stored in
 ../../db/base/
 
 NOTE:
- Please read grass6/db/drivers/README
+ Please read db/drivers/README
 
 To generate dbmi_driver/dbstubs.h automatically, run './mk_dbstubs_h.sh' in
 dbmi_driver/ directory.

lib/gis/gislib.dox

@@ -1509,7 +1509,7 @@ pole; 0 if it contains neither pole.
 \section Vector_File_Processing GRASS Vector File Processing
 
  Please refer to GRASS Vector File Processing in Chapter \ref gisvectintro .
- Note, that the old "sites" are stored as vector points in GRASS 6.
+ Note, that the old "sites" are stored as vector points since GRASS 6.
 
 \section General_Plotting_Routines General Plotting Routines
 
@@ -2135,18 +2135,18 @@ make
 make install
 \endverbatim
 
-Then the code will be compiled into "/usr/local/grass-6.x.y" directory. The start
-script "grass6x" will be placed into "/usr/local/bin/".\\
+Then the code will be compiled into "/usr/local/grass-7.x.y" directory. The start
+script "grass7x" will be placed into "/usr/local/bin/".\\
 
 Optionally other target directories can be specified while "configuring":
 
 \verbatim
-./configure --prefix=/opt/grass-6.x.y --with-bindir=/usr/bin
+./configure --prefix=/opt/grass-7.x.y --with-bindir=/usr/bin
 make
 make install
 \endverbatim
 
-This will store the GRASS binaries into the directory "/opt/grass-6.x.y" and
+This will store the GRASS binaries into the directory "/opt/grass-7.x.y" and
 the  script mentioned above into "/usr/bin".
 
 The script "make" is required to compile single modules. The

lib/gis/unix_socks.c

@@ -75,7 +75,7 @@ static void init_sockets(void)
  * _get_make_sock_path(), builds and tests the path for the socket
  * directory.  Returns NULL on any failure, otherwise it returns the
  * directory path. The path will be like 
- * "/tmp/grass6-$USER-$GIS_LOCK".
+ * "/tmp/grass7-$USER-$GIS_LOCK".
  * ($GIS_LOCK is set in lib/init/init.sh to PID) 
  * ---------------------------------------------------------------------*/
 
@@ -83,7 +83,7 @@ static char *
 _get_make_sock_path (void)
 {
     char *path, *user, *lock;
-    const char *prefix = "/tmp/grass6";
+    const char *prefix = "/tmp/grass7";
     int len, status;
     struct stat theStat;
     

macosx/app/grass.sh.in

@@ -140,7 +140,7 @@ fi
 
 # if gisrc has text startup, switch back to Terminal (gotta duplicate some init.sh stuff)
 # eventually, when TclTk optional, can run appropriate apps per GUI here (ie X11)
-GISRCRC="$HOME/.grassrc6"
+GISRCRC="$HOME/.grassrc7"
 if [ ! "$GRASS_GUI" ] ; then
 	if [ -f "$GISRCRC" ] ; then
 		GRASS_GUI=`awk '/GRASS_GUI/ {print $2}' "$GISRCRC"`