Anonymous avatar Anonymous committed a5052da

Remove unused files from the HTML help build.

Comments (0)

Files changed (2)

sphinx/builder.py

             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)

sphinx/htmlhelp.py

             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()
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.