[Python-checkins] r62677 - in doctools/trunk/sphinx: builder.py htmlhelp.py

[georg.brandl]

Author: georg.brandl
Date: Sat May  3 22:45:43 2008
New Revision: 62677

Log:
Remove unused files from the HTML help build.


Modified:
   doctools/trunk/sphinx/builder.py
   doctools/trunk/sphinx/htmlhelp.py

Modified: doctools/trunk/sphinx/builder.py
==============================================================================
--- doctools/trunk/sphinx/builder.py	(original)
+++ doctools/trunk/sphinx/builder.py	Sat May  3 22:45:43 2008
@@ -468,15 +468,16 @@
             self.handle_page('modindex', modindexcontext, 'modindex.html')
 
         # the search page
-        self.info(' search', nonl=1)
-        self.handle_page('search', {}, 'search.html')
+        if self.name != 'htmlhelp':
+            self.info(' search', nonl=1)
+            self.handle_page('search', {}, 'search.html')
 
         # additional pages from conf.py
         for pagename, template in self.config.html_additional_pages.items():
             self.info(' '+pagename, nonl=1)
             self.handle_page(pagename, {}, template)
 
-        if self.config.html_use_opensearch:
+        if self.config.html_use_opensearch and self.name != 'htmlhelp':
             self.info(' opensearch', nonl=1)
             fn = path.join(self.outdir, '_static', 'opensearch.xml')
             self.handle_page('opensearch', {}, 'opensearch.xml', outfilename=fn)

Modified: doctools/trunk/sphinx/htmlhelp.py
==============================================================================
--- doctools/trunk/sphinx/htmlhelp.py	(original)
+++ doctools/trunk/sphinx/htmlhelp.py	Sat May  3 22:45:43 2008
@@ -135,9 +135,10 @@
             outdir += os.sep
         olen = len(outdir)
         for root, dirs, files in os.walk(outdir):
+            staticdir = (root == path.join(outdir, '_static'))
             for fn in files:
-                if fn.endswith('.html') or fn.endswith('.css') or fn.endswith('.js'):
-                    print >>f, path.join(root, fn)[olen:].replace('/', '\\')
+                if (staticdir and not fn.endswith('.js')) or fn.endswith('.html'):
+                    print >>f, path.join(root, fn)[olen:].replace(os.sep, '\\')
     finally:
         f.close()