Merged with trunk to resolve merge conflicts.

1 files changed, 33 insertions, 12 deletions

diff --git a/setup.py b/setup.py
index eb42283ea..0fd286f7d 100644
--- a/setup.py
+++ b/setup.py
@@ -16,20 +16,41 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import glob
+from setuptools import setup, find_packages
+from setuptools.command.sdist import sdist
+
 import os
-import sys
+import subprocess
 
-from setuptools import setup, find_packages
 
-srcdir = os.path.join(os.path.dirname(sys.argv[0]), 'src')
+class local_sdist(sdist):
+    """Customized sdist hook - builds the ChangeLog file from VC first"""
 
-setup(name='nova',
-      version='0.3.0',
-      description='None Other, Vaguely Awesome',
-      author='nova-core',
-      author_email='nova-core@googlegroups.com',
-      url='http://novacc.org/',
-      packages = find_packages(),
+    def run(self):
+        if os.path.isdir('.bzr'):
+            # We're in a bzr branch
+            log_cmd = subprocess.Popen(["bzr", "log", "--gnu"],
+                                       stdout=subprocess.PIPE)
+            changelog = log_cmd.communicate()[0]
+            with open("ChangeLog", "w") as changelog_file:
+                changelog_file.write(changelog)
+        sdist.run(self)
 
-     )
+setup(name='nova',
+      version='0.9.1',
+      description='cloud computing fabric controller',
+      author='OpenStack',
+      author_email='nova@lists.launchpad.net',
+      url='http://www.openstack.org/',
+      cmdclass={'sdist': local_sdist},
+      packages=find_packages(exclude=['bin', 'smoketests']),
+      scripts=['bin/nova-api',
+               'bin/nova-compute',
+               'bin/nova-dhcpbridge',
+               'bin/nova-import-canonical-imagestore',
+               'bin/nova-instancemonitor',
+               'bin/nova-manage',
+               'bin/nova-network',
+               'bin/nova-objectstore',
+               'bin/nova-rsapi',
+               'bin/nova-volume'])