[Python-checkins] r64528 - in doctools/trunk/sphinx: builder.py quickstart.py

[armin.ronacher]

Author: armin.ronacher
Date: Thu Jun 26 10:22:26 2008
New Revision: 64528

Log:
Removed last "web" bits from the pickle builder.



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

Modified: doctools/trunk/sphinx/builder.py
==============================================================================
--- doctools/trunk/sphinx/builder.py	(original)
+++ doctools/trunk/sphinx/builder.py	Thu Jun 26 10:22:26 2008
@@ -711,13 +711,16 @@
         return docname + SEP
 
     def handle_page(self, pagename, ctx, templatename='page.html',
-                    outfilename=None):
+                    outfilename=None, event_arg=None):
         ctx['current_page_name'] = pagename
         sidebarfile = self.config.html_sidebars.get(pagename)
         if sidebarfile:
             ctx['customsidebar'] = sidebarfile
         if not outfilename:
             outfilename = path.join(self.outdir, os_path(pagename) + self.out_suffix)
+
+        self.app.emit('html-page-context', pagename, templatename, ctx, event_arg)
+
         ensuredir(path.dirname(outfilename))
         f = open(outfilename, 'wb')
         try:
@@ -758,10 +761,6 @@
         # touch 'last build' file, used by the web application to determine
         # when to reload its environment and clear the cache
         open(path.join(self.outdir, LAST_BUILD_FILENAME), 'w').close()
-        # copy configuration file if not present
-        if not path.isfile(path.join(self.outdir, 'webconf.py')):
-            shutil.copyfile(path.join(path.dirname(__file__), 'web', 'webconf.py'),
-                            path.join(self.outdir, 'webconf.py'))
 
 
 class HTMLHelpBuilder(StandaloneHTMLBuilder):

Modified: doctools/trunk/sphinx/quickstart.py
==============================================================================
--- doctools/trunk/sphinx/quickstart.py	(original)
+++ doctools/trunk/sphinx/quickstart.py	Thu Jun 26 10:22:26 2008
@@ -257,9 +257,7 @@
 \tmkdir -p %(rbuilddir)s/pickle %(rbuilddir)s/doctrees
 \t$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) %(rbuilddir)s/pickle
 \t at echo
-\t at echo "Build finished; now you can process the pickle files or run"
-\t at echo "  sphinx-web %(rbuilddir)s/pickle"
-\t at echo "to start the sphinx-web server."
+\t at echo "Build finished; now you can process the pickle files."
 
 web: pickle