mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2024-12-21 05:53:12 +00:00
setup: attempt to work-around the problem that paths might end with trailing back-slashes (on Windows) by appending a PATHSEP (i.e. ":" or ";") instead of an OSSEP (i.e. "/" or "\")
I don't know what will happen if the path ends up with something like "C:\Programs and Files\Whatever\;" on Windows, and then that gets passed to cygwin bash. This reminds me of Brian's suggestion to use Python helper scripts (c.f. misc/find-dep-eggs.py) instead of writing this stuff in the GNUmake language. And *that* reminds me of the idea of writing the whole damn thing in Python instead of in GNUmake, i.e. make all of our build tools be plugins for setuptools instead of being GNUmake targets.
This commit is contained in:
parent
93e1f832ff
commit
2ed8a272ed
7
Makefile
7
Makefile
@ -64,7 +64,7 @@ TRIAL=$(PYTHON) -u "$(TRIALPATH)" --rterrors $(REACTOROPT)
|
|||||||
# accomplish this by depending upon the tahoe compile.
|
# accomplish this by depending upon the tahoe compile.
|
||||||
build-deps: .built check-twisted-dep
|
build-deps: .built check-twisted-dep
|
||||||
mkdir -p "$(SUPPORTLIB)"
|
mkdir -p "$(SUPPORTLIB)"
|
||||||
PYTHONPATH="$(PYTHONPATH)$(PATHSEP)$(SUPPORTLIB)$(PATHSEP)." \
|
PYTHONPATH="$(PYTHONPATH)$(PATHSEP)$(SUPPORTLIB)$(PATHSEP)" \
|
||||||
$(PYTHON) misc/dependencies/build-deps-setup.py install \
|
$(PYTHON) misc/dependencies/build-deps-setup.py install \
|
||||||
--prefix="$(SUPPORT)"
|
--prefix="$(SUPPORT)"
|
||||||
|
|
||||||
@ -72,7 +72,10 @@ EGGSPATH = $(shell $(PYTHON) misc/find-dep-eggs.py)
|
|||||||
show-eggspath:
|
show-eggspath:
|
||||||
@echo $(EGGSPATH)
|
@echo $(EGGSPATH)
|
||||||
|
|
||||||
PP=PYTHONPATH="$(SRCPATH)$(PATHSEP)$(EGGSPATH)$(PATHSEP)$(PYTHONPATH)$(OSSEP)."
|
ifneq ($(PYTHONPATH),)
|
||||||
|
PYTHONPATH := $(PYTHONPATH)$(PATHSEP)
|
||||||
|
endif
|
||||||
|
PP=PYTHONPATH="$(SRCPATH)$(PATHSEP)$(EGGSPATH)$(PATHSEP)$(PYTHONPATH)"
|
||||||
|
|
||||||
.PHONY: make-version build
|
.PHONY: make-version build
|
||||||
make-version:
|
make-version:
|
||||||
|
Loading…
Reference in New Issue
Block a user