summaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorTodd Willey <todd@ansolabs.com>2011-04-04 21:12:57 -0400
committerTodd Willey <todd@ansolabs.com>2011-04-04 21:12:57 -0400
commitda346dac037a46582d569180915010f4c4e2cd50 (patch)
tree94cbeab7422f22b443868cb21d02406deb35826b /setup.py
parent2ee9070c3824d296bada49fc6637c09f8e18a5eb (diff)
parent08417c48c223ad1b698ab1d00686a967b6a2dc0a (diff)
downloadnova-da346dac037a46582d569180915010f4c4e2cd50.tar.gz
nova-da346dac037a46582d569180915010f4c4e2cd50.tar.xz
nova-da346dac037a46582d569180915010f4c4e2cd50.zip
Merge trunk.
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py17
1 files changed, 14 insertions, 3 deletions
diff --git a/setup.py b/setup.py
index 4e25f43ed..20f4c1947 100644
--- a/setup.py
+++ b/setup.py
@@ -18,10 +18,21 @@
import os
import subprocess
+import sys
-from setuptools import setup, find_packages
+from setuptools import find_packages
from setuptools.command.sdist import sdist
+try:
+ import DistUtilsExtra.auto
+except ImportError:
+ print >> sys.stderr, 'To build nova you need '\
+ 'https://launchpad.net/python-distutils-extra'
+ sys.exit(1)
+assert DistUtilsExtra.auto.__version__ >= '2.18',\
+ 'needs DistUtilsExtra.auto >= 2.18'
+
+
from nova.utils import parse_mailmap, str_dict_replace
from nova import version
@@ -75,7 +86,7 @@ try:
except:
pass
-setup(name='nova',
+DistUtilsExtra.auto.setup(name='nova',
version=version.canonical_version_string(),
description='cloud computing fabric controller',
author='OpenStack',
@@ -87,7 +98,6 @@ setup(name='nova',
test_suite='nose.collector',
scripts=['bin/nova-ajax-console-proxy',
'bin/nova-api',
- 'bin/nova-combined',
'bin/nova-compute',
'bin/nova-console',
'bin/nova-dhcpbridge',
@@ -102,4 +112,5 @@ setup(name='nova',
'bin/nova-spoolsentry',
'bin/stack',
'bin/nova-volume',
+ 'bin/nova-vncproxy',
'tools/nova-debug'])