Merge from trunk

1 files changed, 18 insertions, 6 deletions

diff --git a/setup.py b/setup.py
index a333fbf64..ec0014478 100644
--- a/setup.py
+++ b/setup.py
@@ -16,12 +16,21 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import os
+import subprocess
+
 from setuptools import setup, find_packages
 from setuptools.command.sdist import sdist
+from sphinx.setup_command import BuildDoc
 
-import os
-import subprocess
+from nova.utils import parse_mailmap, str_dict_replace
 
+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"""
@@ -34,17 +43,19 @@ class local_sdist(sdist):
             log_cmd = subprocess.Popen(["bzr", "log", "--novalog"],
                                        stdout=subprocess.PIPE, env=env)
             changelog = log_cmd.communicate()[0]
+            mailmap = parse_mailmap()
             with open("ChangeLog", "w") as changelog_file:
-                changelog_file.write(changelog)
+                changelog_file.write(str_dict_replace(changelog, mailmap))
         sdist.run(self)
 
 setup(name='nova',
-      version='2010.1',
+      version='2011.1',
       description='cloud computing fabric controller',
       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',
@@ -55,4 +66,5 @@ setup(name='nova',
                'bin/nova-network',
                'bin/nova-objectstore',
                'bin/nova-scheduler',
-               'bin/nova-volume'])
+               'bin/nova-volume',
+               'tools/nova-debug'])