library-web r423 - in trunk: . data src

[fpeters svn gnome org]

Author: fpeters
Date: Wed Mar 26 21:35:12 2008
New Revision: 423
URL: http://svn.gnome.org/viewvc/library-web?rev=423&view=rev

Log:
* data/overlay.xml.in, src/lgo.py: added workarounds for documentation
modules with variadic name (things like gnome-scan- API_VERSION@, this
concerned various GStreamer documents and gnome-scan manual).  Also
removed link to GStreamer as an external ressource as it got its way
into library.gnome.org itself.



Modified:
   trunk/ChangeLog
   trunk/data/overlay.xml.in
   trunk/src/lgo.py

Modified: trunk/data/overlay.xml.in
==============================================================================
--- trunk/data/overlay.xml.in	(original)
+++ trunk/data/overlay.xml.in	Wed Mar 26 21:35:12 2008
@@ -357,16 +357,31 @@
       </_abstract>
     </document>
 
-    <document channel="devel" category="api">
+    <document doc_module="gstreamer" channel="devel" category="api">
       <subsection>api-desktop</subsection>
-      <_title>GStreamer Reference Manual</_title>
+      <_title>GStreamer Core Reference Manual</_title>
+      <_abstract>
+        Powerful framework for creating multimedia applications. Supports both
+        Audio and Video.
+      </_abstract>
+    </document>
+
+    <document doc_module="gstreamer-libs" channel="devel" category="api">
+      <subsection>api-desktop</subsection>
+      <_title>GStreamer Library Reference Manual</_title>
+      <_abstract>
+        Powerful framework for creating multimedia applications. Supports both
+        Audio and Video.
+      </_abstract>
+    </document>
+
+    <document doc_module="gst-plugins-libs" channel="devel" category="api">
+      <subsection>api-desktop</subsection>
+      <_title>GStreamer Core Plugins Reference Manual</_title>
       <_abstract>
         Powerful framework for creating multimedia applications. Supports both
         Audio and Video.
       </_abstract>
-      <!-- URL to *translated* GStreamer API reference,
-           set to dash ("-") if it has not been translated -->
-      <_href>http://gstreamer.freedesktop.org/data/doc/gstreamer/stable/gstreamer/html/</_href>
     </document>
 
     <document doc_module="libgda-3.0" channel="devel" category="api">

Modified: trunk/src/lgo.py
==============================================================================
--- trunk/src/lgo.py	(original)
+++ trunk/src/lgo.py	Wed Mar 26 21:35:12 2008
@@ -360,6 +360,12 @@
         if makefile_am:
             self.makefile_am = makefile_am
             self.modulename = re.findall(r'DOC_MODULE\s?=\s?(.*)', makefile_am)[0].strip()
+            if '@' in self.modulename:
+                logging.warning('variadic module name: %s' % self.modulename)
+                # don't go interpreting autotools variables, as in this path
+                # lays madness, instead simply cut out the variable, such as
+                # gnome-scan- API_VERSION@ becomes gnome-scan.
+                self.modulename = self.modulename.split('@')[0].strip('-')
         self.version = os.path.splitext(tar.name)[0].split('-')[-1]
         self.one_dot_version = re.match(r'\d+\.\d+', self.version).group()
 
@@ -640,14 +646,15 @@
         doc.category = 'api'
         doc.toc_id = 'api'
 
+        devhelp_file = [x for x in os.listdir(web_output_dir) if x.endswith('.devhelp')]
         if os.path.exists(os.path.join(web_output_dir, 'index.xml.en')):
             tree = ET.parse(os.path.join(web_output_dir, 'index.xml.en'))
             if tree.find('title') is not None:
                 doc.title['en'] = tree.find('title').text
             elif tree.find('{http://www.w3.org/1999/xhtml}title') is not None:
                 doc.title['en'] = tree.find('{http://www.w3.org/1999/xhtml}title').text
-        elif os.path.exists(os.path.join(web_output_dir, '%s.devhelp' % doc_module)):
-            tree = ET.parse(os.path.join(web_output_dir, '%s.devhelp' % doc_module))
+        elif devhelp_file:
+            tree = ET.parse(os.path.join(web_output_dir, devhelp_file[0]))
             doc.title['en'] = tree.getroot().attrib['title']
 
         if app.config.create_tarballs: