From 0cdc13f0f0bcdcd085d58a78b7aa7dbb856cdc79 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren.hansen@rackspace.com>
Date: Tue, 27 Jul 2010 23:56:24 +0200
Subject: Add a 'sdist' make target. It first generates a MANIFEST.in based on
 what's in bzr, then calls python setup.py sdist.

---
 Makefile | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index cd7e233e1..847da779f 100644
--- a/Makefile
+++ b/Makefile
@@ -24,8 +24,17 @@ clean:
 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
-- 
cgit 


From 849a4062cdf8af50b8c3d44611f10857fedf6813 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Tue, 27 Jul 2010 21:35:55 -0700
Subject: Changed Makefile to shell script. The Makefile approach completely
 broke debhelper's ability to figure out that this was a python package.

---
 Makefile | 40 ----------------------------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 Makefile

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 847da779f..000000000
--- 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
-- 
cgit