Got the tree set for debian packaging.0.9.0

10 files changed, 54 insertions, 49 deletions

diff --git a/CA/INTER/.placeholder b/CA/INTER/.placeholder
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/CA/INTER/.placeholder
diff --git a/CA/reqs/.placeholder b/CA/reqs/.placeholder
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/CA/reqs/.placeholder
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000000..e917077c52
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,21 @@
+include HACKING LICENSE run_tests.py run_tests.sh 
+include README builddeb.sh exercise_rsapi.py
+graft CA
+graft doc
+graft smoketests
+graft tools
+include nova/auth/novarc.template
+include nova/auth/slap.sh
+include nova/cloudpipe/bootscript.sh
+include nova/cloudpipe/client.ovpn.template
+include nova/compute/fakevirtinstance.xml
+include nova/compute/interfaces.template
+include nova/compute/libvirt.xml.template
+include nova/tests/CA/
+include nova/tests/CA/cacert.pem
+include nova/tests/CA/private/
+include nova/tests/CA/private/cakey.pem
+include nova/tests/bundle/
+include nova/tests/bundle/1mb.manifest.xml
+include nova/tests/bundle/1mb.part.0
+include nova/tests/bundle/1mb.part.1
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 847da779f7..0000000000
--- a/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-venv=.nova-venv
-with_venv=tools/with_venv.sh
-
-build:
-	# Nothing to do
-
-default_test_type:= $(shell if [ -e $(venv) ]; then echo venv; else echo system; fi)
-
-test: test-$(default_test_type)
-
-test-venv: $(venv)
-	$(with_venv) python run_tests.py
-
-test-system:
-	python run_tests.py
-
-clean:
-	rm -rf _trial_temp
-	rm -rf keys
-	rm -rf instances
-	rm -rf networks
-	rm -f run_tests.err.log
-
-clean-all: clean
-	rm -rf $(venv)
-
-MANIFEST.in:
-	[ -d .bzr ] || (echo "Must be a bzr checkout" ; exit 1)
-	bzr ls --kind=file -VR | while read f; do echo include "$$f"; done > $@
-
-sdist: MANIFEST.in
-	python setup.py sdist
-
-$(venv):
-	@echo "You need to install the Nova virtualenv before you can run this."
-	@echo ""
-	@echo "Please run tools/install_venv.py"
-	@exit 1
-
-.PHONY: MANIFEST.in
diff --git a/doc/build/.placeholder b/doc/build/.placeholder
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/doc/build/.placeholder
diff --git a/doc/source/_static/.placeholder b/doc/source/_static/.placeholder
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/doc/source/_static/.placeholder
diff --git a/doc/source/_templates/.placeholder b/doc/source/_templates/.placeholder
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/doc/source/_templates/.placeholder
diff --git a/run_tests.sh b/run_tests.sh
new file mode 100755
index 0000000000..1bf3d1a791
--- /dev/null
+++ b/run_tests.sh
@@ -0,0 +1,13 @@
+#!/bin/bash 
+
+venv=.nova-venv
+with_venv=tools/with_venv.sh
+
+if [ -e ${venv} ]; then
+  ${with_venv} python run_tests.py
+else  
+  echo "You need to install the Nova virtualenv before you can run this."
+  echo ""
+  echo "Please run tools/install_venv.py"
+  exit 1
+fi
diff --git a/setup.cfg b/setup.cfg
index 8394725445..14dcb5c8ed 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,4 +1,10 @@
 [build_sphinx]
+all_files = 1
+build-dir = doc/build
 source-dir = doc/source
-build-dir  = doc/build
-all_files  = 1
+
+[egg_info]
+tag_build = 
+tag_date = 0
+tag_svn_revision = 0
+
diff --git a/setup.py b/setup.py
index f9a6163359..127d014b19 100644
--- a/setup.py
+++ b/setup.py
@@ -16,19 +16,24 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import glob
-import os
-import sys
-
 from setuptools import setup, find_packages
 
-srcdir = os.path.join(os.path.dirname(sys.argv[0]), 'src')
-
 setup(name='nova',
       version='0.9.0',
       description='cloud computing fabric controller',
       author='OpenStack',
       author_email='nova@lists.launchpad.net',
       url='http://www.openstack.org/',
-      packages = find_packages(),
+      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',
+      ]
      )