merged trunk, added recent nova.sh

1 files changed, 10 insertions, 1 deletions

diff --git a/setup.py b/setup.py
index dab601290..33d815fa6 100644
--- a/setup.py
+++ b/setup.py
@@ -18,11 +18,19 @@
 
 from setuptools import setup, find_packages
 from setuptools.command.sdist import sdist
+from sphinx.setup_command import BuildDoc
 
 import os
 import subprocess
 
 
+class local_BuildDoc(BuildDoc):
+    def run(self):
+        for builder in ['html', 'man']:
+            self.builder = builder
+            self.finalize_options()
+            BuildDoc.run(self)
+
 class local_sdist(sdist):
     """Customized sdist hook - builds the ChangeLog file from VC first"""
 
@@ -44,7 +52,8 @@ setup(name='nova',
       author='OpenStack',
       author_email='nova@lists.launchpad.net',
       url='http://www.openstack.org/',
-      cmdclass={'sdist': local_sdist},
+      cmdclass={ 'sdist': local_sdist,
+                 'build_sphinx' : local_BuildDoc },
       packages=find_packages(exclude=['bin', 'smoketests']),
       scripts=['bin/nova-api',
                'bin/nova-compute',