Browse Source

don't include revision number in manual

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@40113 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 15 years ago
parent
commit
fcf62d9b70
2 changed files with 5 additions and 3 deletions
  1. 0 1
      gui/wxpython/gui_modules/help.py
  2. 5 2
      man/build_html.py

+ 0 - 1
gui/wxpython/gui_modules/help.py

@@ -373,7 +373,6 @@ class AboutWindow(wx.Frame):
 
         # get version and web site
         version, svn_gis_h_rev, svn_gis_h_date = gcmd.RunCommand('g.version',
-                                                                 verbose = True, # -> svn revision
                                                                  flags = 'r',
                                                                  read = True).splitlines()
 

+ 5 - 2
man/build_html.py

@@ -78,7 +78,7 @@ r"""<!-- the files grass7.html & helptext.html file live in lib/init/ -->
     <tr>
       <td valign="top" bgcolor="${box_color}" class="box"><h3>&nbsp;Quick Introduction</h3>
       <ul>
-      <li><a href="grass6.html">GRASS startup manual page</a></li>
+      <li><a href="grass7.html">GRASS startup manual page</a></li>
       <li><a href="helptext.html">How to start with GRASS</a></li>
       </ul></td>
 
@@ -331,7 +331,10 @@ arch_dist_dir = os.environ['ARCH_DISTDIR']
 html_dir = os.path.join(arch_dist_dir, "docs", "html")
 gisbase = os.environ['GISBASE']
 ver = read_file(os.path.join(gisbase, "etc", "VERSIONNUMBER"))
-grass_version = ver.strip()
+try:
+    grass_version = ver.split()[0].strip()
+except IndexError:
+    grass_version = ver.split().strip()
 grass_mmver = '.'.join(ver.split('.')[0:2])
 macosx = "darwin" in os.environ['ARCH'].lower()