瀏覽代碼

Happy New Year

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@70183 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Neteler 8 年之前
父節點
當前提交
d9c44d5926
共有 9 個文件被更改,包括 42 次插入34 次删除
  1. 1 1
      INSTALL
  2. 19 11
      REQUIREMENTS.html
  3. 2 2
      doc/howto_release.txt
  4. 15 15
      general/g.version/g.version.html
  5. 1 1
      grasslib.dox
  6. 1 1
      include/VERSION
  7. 1 1
      lib/gis/gislib_cmdline_parsing.dox
  8. 1 1
      lib/init/grass.py
  9. 1 1
      man/build_rest.py

+ 1 - 1
INSTALL

@@ -314,6 +314,6 @@ https://trac.osgeo.org/grass/wiki/Submitting
 https://grass.osgeo.org/documentation/first-time-users/
 
 ------------------
-(C) 1999-2016 by The GRASS Development Team
+(C) 1999-2017 by The GRASS Development Team
 
 Last changed: $Date$

+ 19 - 11
REQUIREMENTS.html

@@ -9,14 +9,14 @@
 
 <h2>REQUIREMENTS to compile GRASS GIS 7</h2>
 
-A workstation running some flavor of UNIX like Solaris, IRIX,
-GNU/Linux, BSD, Mac OS X, Cygwin or MinGW (on Win32). Ideally, you
-should have at least 500 Mb. The source code package needs around 80
-MB compressed. The resulting binaries may need between 20 MB and 180
-MB depending on your platform. During a full compilation you may need
+A workstation running some flavor of UNIX including GNU/Linux, Solaris, IRIX, BSD,
+Mac OSX, Cygwin or MinGW (on Win32/Win64). Ideally, you should have at least 800 MB of
+free disk space. The source code package needs disk space of around 26 MB compressed
+and 440MB uncompressed. The resulting binaries may need between 20 MB and 180 MB
+depending on your platform and compiler flags. During a full compilation you may need
 temporarily up to 550MB including the source code.
 <p>
-To disable features please read the <a href="INSTALL">INSTALL</a> file.
+To enable and disable features please read the <a href="INSTALL">INSTALL</a> file.
 
 <h3>General requirements:</h3>
 
@@ -64,7 +64,8 @@ map formats<br>
 
 <h3>Optional requirements:</h3>
 
-Note: also the respective xxx-dev or xxx-devel packages need to be installed.
+Note: also the respective development packages (commonly named xxx-dev or xxx-devel) need
+to be installed.
 
 <ul>
 
@@ -91,8 +92,8 @@ to the v.select module<br>
 <a href="http://www.unidata.ucar.edu/software/netcdf/">http://www.unidata.ucar.edu/software/netcdf/</a>
 </li>
 
-<li>If hardware openGL support is missing in the X
-Server, <b>Mesa-3.x</b> (openGL clone) may be required for wxNVIZ<br>
+<li>If hardware openGL support is missing in the X Server, <b>Mesa-3.x</b> (openGL clone)
+may be required for wxNVIZ<br>
 <a href="http://mesa3d.sourceforge.net">http://mesa3d.sourceforge.net</a>
 </li>
 
@@ -157,7 +158,7 @@ Ctypes can be added as a third-party module in Python 2.3 and 2.4
 
 <li><b>Python Imaging Library or PILLOW</b> (highly recommended for wxGUI and necessary for wxGUI Cartographic Composer)<br>
 <a href="http://www.pythonware.com/products/pil">http://www.pythonware.com/products/pil</a>,
-a newer version is "python-pillow"
+newer versions are named "python-pillow"
 </li>
 
 <li><b>Python matplotlib &gt; 1.2</b> ("python-matplotlib", needed for the several wxGUI tools)<br>
@@ -181,19 +182,26 @@ a newer version is "python-pillow"
 <a href="http://cairographics.org">http://cairographics.org</a>
 </li>
 
+<!-- really needed? -->
 <li><b>AVCE00 and E00Compr Libraries</b> (avcimport)<br>
 <a href="http://avce00.maptools.org">http://avce00.maptools.org</a>
 </li>
 
+<li><b>Subversion</b> (svn for g.extension)<br>
+<a href="https://subversion.apache.org/">https://subversion.apache.org/</a><br>
+</li>
+
 </ul>
 
 
 <h3>Note:</h3>
 
+<!-- since 2014 no longer supported: -->
 SUN Solaris users may go here to download precompiled libraries etc.:
 <br><a href="http://www.sunfreeware.com">http://www.sunfreeware.com</a>
 
 <p>
+<!-- no longer supported: -->
 SGI IRIX users may go here to download precompiled libraries etc.:
 <br><a href="http://freeware.sgi.com">http://freeware.sgi.com</a>
 
@@ -204,7 +212,7 @@ MacOSX users may go here to download precompiled libraries etc.:
 <p>
 
 <hr width="100%">
-<i>&copy; GRASS Development Team 2001-2016</i>
+<i>&copy; GRASS Development Team 1997-2017</i>
 <p>Please report bugs here:
 <br><a href="http://grass.osgeo.org/development/bug-tracking/">http://grass.osgeo.org/development/bug-tracking/</a>
 

+ 2 - 2
doc/howto_release.txt

@@ -60,7 +60,7 @@ Contents
 7
 0
 6RC1
-2016
+2017
       rm -f include/VERSION~
 
     - Update OSGeo4W setup.hint file
@@ -121,7 +121,7 @@ Contents
 7
 0
 6svn
-2016
+2017
 
     rm -f include/VERSION~
     svn ci -m"back to SVN" include/VERSION

+ 15 - 15
general/g.version/g.version.html

@@ -38,7 +38,7 @@ print gcore.version()
 <div class="code"><pre>
 g.version 
 
-GRASS 7.0.0RC2 (2015)
+GRASS 7.0.6svn (2017)
 </pre></div>
 
 <h3>GIS Library info</h3>
@@ -46,26 +46,26 @@ GRASS 7.0.0RC2 (2015)
 <div class="code"><pre>
 g.version -r
 
-GRASS 7.0.0RC2 (2015)
-libgis Revision: 64007 
-libgis Date: 2015-01-08 20:08:36 +0100 (Thu, 08 Jan 2015) 
+GRASS 7.0.6svn (2017)
+libgis Revision: 67364 
+libgis Date: 2015-12-24 16:07:44 +0100 (Thu, 24 Dec 2015) 
 </pre></div>
 
 <h3>Full info in shell script style</h3>
 <div class="code"><pre>
 g.version -rge
 
-version=7.0.0RC2
-date=2015
-revision=64517M
-build_date=2015-01-12
-build_platform=x86_64-unknown-linux-gnu
-libgis_revision=64007 
-libgis_date="2015-01-08 20:08:36 +0100 (Thu, 08 Jan 2015) "
-proj4=4.8.0
-gdal=1.11.1
-geos=3.4.2
-sqlite=3.8.8
+version=7.0.6svn
+date=2016
+revision=70171
+build_date=2017-01-01
+build_platform=x86_64-pc-linux-gnu
+libgis_revision=67364 
+libgis_date="2015-12-24 16:07:44 +0100 (Thu, 24 Dec 2015) "
+proj4=4.9.2
+gdal=2.1.2
+geos=3.5.0
+sqlite=3.13.0
 </pre></div>
 
 <h2>Citing GRASS GIS</h2>

+ 1 - 1
grasslib.dox

@@ -23,7 +23,7 @@ Team</a>, an international team of programmers, GRASS module authors
 are cited within their module's source code and the contributed manual
 pages.
 
-&copy; 2000-2016 by the GRASS Development Team
+&copy; 2000-2017 by the GRASS Development Team
 
 This manual is published under <a
 href="http://www.fsf.org/copyleft/fdl.html">GNU Free Documentation

+ 1 - 1
include/VERSION

@@ -1,4 +1,4 @@
 7
 0
 6svn
-2016
+2017

+ 1 - 1
lib/gis/gislib_cmdline_parsing.dox

@@ -4,7 +4,7 @@
 <!--
 extracted form gislib.dox and improved by Vaclav Petras, 2013
 
-Copyright 2004-2013 by the GRASS Development Team
+Copyright 2004-2017 by the GRASS Development Team
 
 Published under GNU Free Documentation License
 -->

+ 1 - 1
lib/init/grass.py

@@ -17,7 +17,7 @@
 #               command line options for setting the GISDBASE, LOCATION,
 #               and/or MAPSET. Finally it starts GRASS with the appropriate
 #               user interface and cleans up after it is finished.
-# COPYRIGHT:    (C) 2000-2016 by the GRASS Development Team
+# COPYRIGHT:    (C) 2000-2017 by the GRASS Development Team
 #
 #               This program is free software under the GNU General
 #               Public License (>=v2). Read the file COPYING that

+ 1 - 1
man/build_rest.py

@@ -167,7 +167,7 @@ r"""
 --------------
 
 :doc:`Manual main page <index>` \| :doc:`Full Index <full_index>`
- 2003-2016 `GRASS Development Team <http://grass.osgeo.org>`_, GRASS GIS ${grass_version} Reference Manual
+ 2003-2017 `GRASS Development Team <http://grass.osgeo.org>`_, GRASS GIS ${grass_version} Reference Manual
 """)
 
 cmd1_tmpl = string.Template(\