From 9513458c3e50fac5f40e76757b45ab15b67e8f00 Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Tue, 29 Mar 2011 15:34:25 -0700
Subject: add nova-vncproxy to setup.py

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 3b48990ac..20f4c1947 100644
--- a/setup.py
+++ b/setup.py
@@ -112,4 +112,5 @@ DistUtilsExtra.auto.setup(name='nova',
                'bin/nova-spoolsentry',
                'bin/stack',
                'bin/nova-volume',
+               'bin/nova-vncproxy',
                'tools/nova-debug'])
-- 
cgit 


From 7285694cb83ed618bea0d8c9170b725dd5566a27 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren@linux2go.dk>
Date: Tue, 5 Apr 2011 14:53:56 +0200
Subject: Add a find_data_files method to setup.py. Use it to get tools/
 installed under /usr/(local/)/share/nova

---
 setup.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 20f4c1947..6c45109bc 100644
--- a/setup.py
+++ b/setup.py
@@ -16,6 +16,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import glob
 import os
 import subprocess
 import sys
@@ -86,6 +87,19 @@ try:
 except:
     pass
 
+
+def find_data_files(destdir, srcdir):
+    package_data = []
+    files = []
+    for d in glob.glob('%s/*' % (srcdir, )):
+        if os.path.isdir(d):
+            package_data += find_data_files(
+                                 os.path.join(destdir, os.path.basename(d)), d)
+        else:
+            files += [d]
+    package_data += [(destdir, files)]
+    return package_data
+
 DistUtilsExtra.auto.setup(name='nova',
       version=version.canonical_version_string(),
       description='cloud computing fabric controller',
@@ -96,6 +110,7 @@ DistUtilsExtra.auto.setup(name='nova',
       packages=find_packages(exclude=['bin', 'smoketests']),
       include_package_data=True,
       test_suite='nose.collector',
+      data_files=find_data_files('share/nova', 'tools'),
       scripts=['bin/nova-ajax-console-proxy',
                'bin/nova-api',
                'bin/nova-compute',
-- 
cgit 


From 7168812fdf56280f24dc977c5dd9c7a73959c2a2 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Fri, 22 Apr 2011 13:30:13 -0400
Subject: adding gettext to setup.py

---
 setup.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 6c45109bc..194b55183 100644
--- a/setup.py
+++ b/setup.py
@@ -16,6 +16,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import gettext
 import glob
 import os
 import subprocess
@@ -33,6 +34,7 @@ except ImportError:
 assert DistUtilsExtra.auto.__version__ >= '2.18',\
        'needs DistUtilsExtra.auto >= 2.18'
 
+gettext.install('nova', unicode=1)
 
 from nova.utils import parse_mailmap, str_dict_replace
 from nova import version
-- 
cgit 


From c95aaaaefe11048990021d376dbca6460f19248c Mon Sep 17 00:00:00 2001
From: "jaypipes@gmail.com" <>
Date: Tue, 26 Apr 2011 14:17:09 -0700
Subject: Make the import of distutils.extra non-mandatory in setup.py. Just
 print a warning that i18n commands are not available...

---
 setup.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 194b55183..c165f40d7 100644
--- a/setup.py
+++ b/setup.py
@@ -25,14 +25,18 @@ import sys
 from setuptools import find_packages
 from setuptools.command.sdist import sdist
 
+# In order to run the i18n commands for compiling and
+# installing message catalogs, we use DistUtilsExtra.
+# Don't make this a hard requirement, but warn that
+# i18n commands won't be available if DistUtilsExtra is
+# not installed...
 try:
-    import DistUtilsExtra.auto
+    from DistUtilsExtra.auto import setup
 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 setuptools import setup
+    print "Warning: DistUtilsExtra required to use i18n builders. "
+    print "To build nova with support for message catalogs, you need "
+    print "  https://launchpad.net/python-distutils-extra >= 2.18"
 
 gettext.install('nova', unicode=1)
 
@@ -102,7 +106,7 @@ def find_data_files(destdir, srcdir):
     package_data += [(destdir, files)]
     return package_data
 
-DistUtilsExtra.auto.setup(name='nova',
+setup(name='nova',
       version=version.canonical_version_string(),
       description='cloud computing fabric controller',
       author='OpenStack',
-- 
cgit