Changed Makefile to shell script. The Makefile approach completely broke
debhelper's ability to figure out that this was a python package.
This commit is contained in:
parent
0d32008ea9
commit
849a4062cd
40
Makefile
40
Makefile
@ -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
|
13
run_tests.sh
Normal file
13
run_tests.sh
Normal file
@ -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
|
Loading…
Reference in New Issue
Block a user