mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-04-07 10:56:49 +00:00
Makefile: use absolute paths when setting PYTHONPATH
This commit is contained in:
parent
8e03d19ccc
commit
9c6d190190
31
Makefile
31
Makefile
@ -1,19 +1,6 @@
|
||||
|
||||
default: build
|
||||
|
||||
.PHONY: run-queen run-client test
|
||||
|
||||
run-queen:
|
||||
cd queen-basedir && PYTHONPATH=.. twistd -noy ../queen.tac
|
||||
|
||||
run-client:
|
||||
cd client-basedir && PYTHONPATH=.. twistd -noy ../client.tac
|
||||
|
||||
run-client2:
|
||||
cd client-basedir2 && PYTHONPATH=.. twistd -noy ../client.tac
|
||||
run-client3:
|
||||
cd client-basedir3 && PYTHONPATH=.. twistd -noy ../client.tac
|
||||
|
||||
.PHONY: build
|
||||
build:
|
||||
python setup.py build
|
||||
@ -21,11 +8,25 @@ build:
|
||||
# builddir.py to locate it.
|
||||
|
||||
ifneq ($(PYTHONPATH),)
|
||||
PP=PYTHONPATH=${PYTHONPATH}:$(shell python ./builddir.py)
|
||||
PP=PYTHONPATH=${PYTHONPATH}:$(shell python ./builddir.py -a)
|
||||
else
|
||||
PP=PYTHONPATH=$(shell python ./builddir.py)
|
||||
PP=PYTHONPATH=$(shell python ./builddir.py -a)
|
||||
endif
|
||||
|
||||
.PHONY: run-queen run-client test
|
||||
|
||||
run-queen:
|
||||
cd queen-basedir && PYTHONPATH=.. twistd -noy ../queen.tac
|
||||
|
||||
run-client: build
|
||||
cd client-basedir && $(PP) twistd -noy ../client.tac
|
||||
|
||||
run-client2:
|
||||
cd client-basedir2 && PYTHONPATH=.. twistd -noy ../client.tac
|
||||
run-client3:
|
||||
cd client-basedir3 && PYTHONPATH=.. twistd -noy ../client.tac
|
||||
|
||||
|
||||
TEST=allmydata
|
||||
REPORTER=
|
||||
|
||||
|
@ -7,4 +7,6 @@ from distutils.util import get_platform
|
||||
# libdir. If we were using a pure-python module, this would just be "lib".
|
||||
plat_specifier = ".%s-%s" % (get_platform(), sys.version[0:3])
|
||||
libdir = os.path.join("build", "lib" + plat_specifier)
|
||||
if len(sys.argv) > 1 and sys.argv[1] == "-a":
|
||||
libdir = os.path.abspath(libdir)
|
||||
print libdir
|
||||
|
Loading…
x
Reference in New Issue
Block a user