summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Willey <todd@ansolabs.com>2010-11-07 17:53:39 -0500
committerTodd Willey <todd@ansolabs.com>2010-11-07 17:53:39 -0500
commita3b6e0f358871dc41516c33d237a0a61735ff84c (patch)
treefbe6e39d2ec5f2fe383bc3db5f3b3edf7025fc7f
parent75841f22d39d90859c1157315c326b4e8a4a3b9c (diff)
Use the autodoc tools in the setup.py build_sphinx toolchain.
-rw-r--r--doc/ext/nova_autodoc.py9
-rw-r--r--doc/source/conf.py3
2 files changed, 10 insertions, 2 deletions
diff --git a/doc/ext/nova_autodoc.py b/doc/ext/nova_autodoc.py
new file mode 100644
index 000000000..39aa2c2cf
--- /dev/null
+++ b/doc/ext/nova_autodoc.py
@@ -0,0 +1,9 @@
+import os
+
+from nova import utils
+
+def setup(app):
+ rootdir = os.path.abspath(app.srcdir + '/..')
+ print "**Autodocumenting from %s" % rootdir
+ rv = utils.execute('cd %s && ./generate_autodoc_index.sh' % rootdir)
+ print rv[0]
diff --git a/doc/source/conf.py b/doc/source/conf.py
index f59a58cdc..10a9b2317 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -24,8 +24,7 @@ sys.path.insert(0, os.path.abspath('./'))
# Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'ext.nova_todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath', 'sphinx.ext.ifconfig']
-#extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'sphinx.ext.coverage', 'sphinx.ext.pngmath', 'sphinx.ext.ifconfig']
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'ext.nova_todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath', 'sphinx.ext.ifconfig', 'ext.nova_autodoc']
todo_include_todos = True
# Add any paths that contain templates here, relative to this directory.