[pygccxml-commit] SF.net SVN: pygccxml:[1684] sphinx

[<rom...@us...>]

Revision: 1684
          http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1684&view=rev
Author:   roman_yakovenko
Date:     2009-02-16 11:11:35 +0000 (Mon, 16 Feb 2009)

Log Message:
-----------
sphinx

Modified Paths:
--------------
    sphinx/__templates_www/layout.html
    sphinx/conf.py

Modified: sphinx/__templates_www/layout.html
===================================================================
--- sphinx/__templates_www/layout.html	2009-02-16 08:30:56 UTC (rev 1683)
+++ sphinx/__templates_www/layout.html	2009-02-16 11:11:35 UTC (rev 1684)
@@ -23,15 +23,18 @@
 {%- block document %}
     <div class="document">
       <div class="documentwrapper">
-      {%- if not embedded %}
+      {%- if not embedded %}{% if not theme_nosidebar|tobool %}
         <div class="bodywrapper">
-      {%- endif %}
+      {%- endif %}{% endif %}
           <div class="body">
             {% block body %} {% endblock %}
             {% include "bottom_ad_unit.html" %}
           </div>
-      {%- if not embedded %}
+      {%- if not embedded %}{% if not theme_nosidebar|tobool %}
         </div>
-      {%- endif %}
+      {%- endif %}{% endif %}
       </div>
+      {%- block sidebar2 %}{{ sidebar() }}{% endblock %}
+      <div class="clearer"></div>
+    </div>
 {%- endblock %}

Modified: sphinx/conf.py
===================================================================
--- sphinx/conf.py	2009-02-16 08:30:56 UTC (rev 1683)
+++ sphinx/conf.py	2009-02-16 11:11:35 UTC (rev 1684)
@@ -14,7 +14,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os, shutil, atexit, getopt
+import sys, os, shutil, getopt
 
 opts, args = getopt.getopt( sys.argv[1:], 'ab:d:c:CD:A:NEqQP')
 print 'opts: ', opts
@@ -64,18 +64,22 @@
 except:
     pass #it is possible that pyenchant is not installed
 
-@atexit.register
-def copy_indexing_suite_v2_files():
+def copy_indexing_suite_v2_files(app, exception):
+    if exception:
+        print 'Indexing suite V2 copying was skipped - there were errors during the build process'
+        return
     source_dir = os.path.join( project_root, 'pyplusplus_dev', 'docs', 'documentation', 'indexing_suite_v2_files' )
     target_dir = os.path.join( doc_project_root, outdir, 'pyplusplus', 'documentation', 'indexing_suite_v2_files' )
     if os.path.exists(target_dir):
         shutil.rmtree(target_dir)
     shutil.copytree( source_dir, target_dir, ignore=shutil.ignore_patterns( r'.svn' ) )
 
-@atexit.register
-def generate_sitemap():
+def generate_sitemap(app, exception):
     if 'www' not in outdir:
         return
+    if exception:
+        print 'SITEMAP generation was skipped - there were errors during the build process'
+        return
     try:
         import sitemap_gen
 
@@ -105,6 +109,10 @@
         print "ERROR(SITEMAP): sitemap file was not generated - ", str(error)
 
 
+def setup(app):
+    app.connect('build-finished', copy_indexing_suite_v2_files)
+    app.connect('build-finished', generate_sitemap)
+
 # General configuration
 # ---------------------
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.