summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnne Gentle <anne@openstack.org>2010-11-18 09:09:53 -0600
committerAnne Gentle <anne@openstack.org>2010-11-18 09:09:53 -0600
commit9364e486d1b68113feb55e507c5d783e4990dd4b (patch)
tree56451b506657db1b8b919bdb6169b62aeb377723
parent2a06dfc2aa83e6f3f77404f047a66791b91ec10c (diff)
parent609c50578f15e7dd117cb0f2b1e7032240346037 (diff)
downloadnova-9364e486d1b68113feb55e507c5d783e4990dd4b.tar.gz
nova-9364e486d1b68113feb55e507c5d783e4990dd4b.tar.xz
nova-9364e486d1b68113feb55e507c5d783e4990dd4b.zip
Soren updated setup.py so that the man page builds. Will continue working on man pages for nova-compute and nova-network
-rw-r--r--doc/build/doctrees/adminguide/nova.manage.doctreebin40401 -> 40316 bytes
-rw-r--r--doc/build/doctrees/environment.picklebin1803550 -> 1803754 bytes
-rw-r--r--setup.py11
3 files changed, 10 insertions, 1 deletions
diff --git a/doc/build/doctrees/adminguide/nova.manage.doctree b/doc/build/doctrees/adminguide/nova.manage.doctree
index c70fd2d71..b06b1fc48 100644
--- a/doc/build/doctrees/adminguide/nova.manage.doctree
+++ b/doc/build/doctrees/adminguide/nova.manage.doctree
Binary files differ
diff --git a/doc/build/doctrees/environment.pickle b/doc/build/doctrees/environment.pickle
index bcc1d22d0..6c3552ddc 100644
--- a/doc/build/doctrees/environment.pickle
+++ b/doc/build/doctrees/environment.pickle
Binary files differ
diff --git a/setup.py b/setup.py
index a333fbf64..71c9ee539 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',