[GRASS-SVN] r61723 - grass/trunk/man

svn_grass at osgeo.org svn_grass at osgeo.org
Sat Aug 23 16:28:04 PDT 2014


Author: martinl
Date: 2014-08-23 16:28:04 -0700 (Sat, 23 Aug 2014)
New Revision: 61723

Modified:
   grass/trunk/man/build_html.py
Log:
fix major index manual page: libpythonhtml is called by default

Modified: grass/trunk/man/build_html.py
===================================================================
--- grass/trunk/man/build_html.py	2014-08-23 22:09:11 UTC (rev 61722)
+++ grass/trunk/man/build_html.py	2014-08-23 23:28:04 UTC (rev 61723)
@@ -75,7 +75,7 @@
 #"
 
 overview_tmpl = string.Template(\
-r"""<!-- the files grass7.html & helptext.html file live in lib/init/ -->
+r"""<!-- the files grass${grass_version_major}.html & helptext.html file live in lib/init/ -->
 
 <table align="center" border="0" cellspacing="8">
   <tbody>
@@ -112,7 +112,7 @@
       </td>
       <td width="33%" valign="top" bgcolor="${box_color}" class="box"><h3> General</h3>
 	<ul>
-	<li class="box"><a href="grass7.html">GRASS GIS startup manual page</a></li>
+	<li class="box"><a href="grass${grass_version_major}.html">GRASS GIS startup manual page</a></li>
 	<li class="box"><a href="general.html">General commands manual</a></li>
 	</ul>
       </td>
@@ -171,8 +171,8 @@
       </td>
       <td width="33%" valign="top" bgcolor="${box_color}" class="box"><h3> Python</h3>
        <ul>
-        <li class="box"><a href="libpython/index.html">PyGRASS documentation</a></li>
-        <li class="box"><a href="libpython/index.html">GRASS GIS Testsuite</a></li>
+        <li class="box"><a href="http://grass.osgeo.org/grass${grass_version_major}${grass_version_minor}/manuals/libpython/pygrass_index.html">PyGRASS documentation</a></li>
+        <li class="box"><a href="http://grass.osgeo.org/grass${grass_version_major}${grass_version_minor}/manuals/libpython/gunittest_testing.html">GRASS GIS Testsuite</a></li>
        </ul>
       </td>
     </tr>
@@ -356,7 +356,9 @@
 
 def write_html_cmd_overview(f):
     box_color = "#e1ecd0"
-    f.write(overview_tmpl.substitute(box_color = box_color))
+    f.write(overview_tmpl.substitute(box_color = box_color,
+                                     grass_version_major = grass_version_major,
+                                     grass_version_minor = grass_version_minor))
 
 def write_html_footer(f, index_url, year = None):
     if year is None:
@@ -396,6 +398,8 @@
 html_dir = os.path.join(arch_dist_dir, "docs", "html")
 gisbase = os.environ['GISBASE']
 grass_version = os.getenv("VERSION_NUMBER", "unknown")
+grass_version_major = grass_version.split('.')[0]
+grass_version_minor = grass_version.split('.')[1]
 grass_mmver = '.'.join(grass_version.split('.')[0:2])
 macosx = "darwin" in os.environ['ARCH'].lower()
 default_year = os.getenv("VERSION_DATE")



More information about the grass-commit mailing list