ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-18 18:56:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

don't use --root, instead use --single-version-externally-managed

Browse Source 
fixes #35
This commit is contained in:
Zooko O'Whielacronx 2007-05-21 10:47:14 -07:00
parent c946a5f40c
commit eaa93014e5
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
GNUmakefile
View File

@ -63,15 +63,15 @@ build: make-version build-zfec build-Crypto build-foolscap
build-zfec: build-zfec:
cd src/zfec && \ cd src/zfec && \
$(PP) $(PYTHON) ./setup.py $(EXTRA_SETUP_ARGS) install --prefix="." --root="$(INSTDIR)" --install-lib="lib" --install-scripts="bin" $(PP) $(PYTHON) ./setup.py $(EXTRA_SETUP_ARGS) install --single-version-externally-managed --prefix="$(INSTDIR)" --record="$(INSTDIR)/zfec_install.log" --install-lib="$(INSTDIR)/lib" --install-scripts="$(INSTDIR)/bin"
build-foolscap: build-foolscap:
cd src/foolscap && \ cd src/foolscap && \
$(PP) $(PYTHON) ./setup.py $(EXTRA_SETUP_ARGS) install --prefix="." --root="$(INSTDIR)" --install-lib="lib" --install-scripts="bin" $(PP) $(PYTHON) ./setup.py $(EXTRA_SETUP_ARGS) install --prefix="$(INSTDIR)" --record="$(INSTDIR)/foolscap_install.log" --install-lib="$(INSTDIR)/lib" --install-scripts="$(INSTDIR)/bin"
build-Crypto: build-Crypto:
cd src/Crypto && \ cd src/Crypto && \
$(PP) $(PYTHON) ./setup.py $(EXTRA_SETUP_ARGS) install --prefix="." --root="$(INSTDIR)" --install-lib="lib" --install-scripts="bin" $(PP) $(PYTHON) ./setup.py $(EXTRA_SETUP_ARGS) install --prefix="$(INSTDIR)" --record="$(INSTDIR)/Crypto_install.log" --install-lib="$(INSTDIR)/lib" --install-scripts="$(INSTDIR)/bin"
clean-zfec: clean-zfec:
-cd src/zfec && \ -cd src/zfec && \
@ -125,15 +125,7 @@ test-all: test-foolscap test
# use 'make test REPORTER=--reporter=bwverbose' from buildbot, to supress the # use 'make test REPORTER=--reporter=bwverbose' from buildbot, to supress the
# ansi color sequences # ansi color sequences
# our current build process embeds bogus filenames inside the .pyc files
# (they start with /lib). Blow them away and allow the test process to
# regenerate them, so that tracebacks and figleaf data can refer to the
# correct filenames (and thus find their source code).
#
# TODO: remove this hack, since it requires redoing the byte-compliation on
# every single test run
test: build test: build
find $(INSTDIR) -name '*.pyc' |xargs rm
$(PP) $(TRIAL) $(REPORTER) $(TEST) $(PP) $(TRIAL) $(REPORTER) $(TEST)
# foolscap tests need to be run in their own source dir, so that the paths to # foolscap tests need to be run in their own source dir, so that the paths to