make pyflakes run faster and with more alacrity

[tahoe-lafs/tahoe-lafs.git] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index 5d1053e1d169edba090532a80bf5a2c6b5f427d7..0150e142f3fdc7c885153c11e2fa2fb9aace7745 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -6,7 +6,13 @@ INSTDIR=$(BASE)/instdir
 PATHSEP=$(shell python -c 'import os ; print os.pathsep')
 TRIALPATH=$(shell which trial.py 2>/dev/null)
 ifeq ($(TRIALPATH),)
-TRIALPATH=$(shell which trial)
+TRIALPATH=$(shell which trial 2>/dev/null)
+endif
+ifeq ($(TRIALPATH),)
+TRIALPATH=$(shell $(PYTHON) -c "import os, sys; print repr(os.path.join(sys.prefix, \"Scripts\", \"trial.py\"))")
+endif
+ifeq ($(TRIALPATH),)
+TRIALPATH=$(shell $(PYTHON) -c "import os, sys; print repr(os.path.join(sys.prefix, \"Scripts\", \"trial\"))")
 endif
 
 EXTRA_SETUP_ARGS=
@@ -35,8 +41,7 @@ else
 PYTHONPATH := "$(INSTDIR)"
 endif
 
-TRIAL=$(PYTHON) -u "$(TRIALPATH)" --reactor=$(REACTOR)
-# $(error $(TRIAL))
+TRIAL=$(PYTHON) -u "$(TRIALPATH)" --rterrors --reactor=$(REACTOR)
 
 show-instdir:
        @echo $(INSTDIR)
@@ -48,7 +53,7 @@ build: build-zfec build-Crypto
        $(PYTHON) setup.py $(EXTRA_SETUP_ARGS) install --install-lib="$(INSTDIR)" --install-scripts="$(INSTDIR)/scripts"
 
 build-zfec:
-       cd src/zfec && $(PYTHON) ./setup.py $(EXTRA_SETUP_ARGS) install --install-lib="$(INSTDIR)" --install-scripts="$(INSTDIR)/scripts"
+       cd src/zfec && $(PYTHON) ./setup.py $(EXTRA_SETUP_ARGS) install --single-version-externally-managed --root="$(INSTDIR)" --install-lib="." --install-scripts="$(INSTDIR)/scripts"
 
 clean-zfec:
        -cd src/zfec && python ./setup.py clean --all
@@ -108,7 +113,7 @@ endif
        $(PP) $(PYTHON) misc/figleaf2el.py .figleaf $(INSTDIR)
 
 pyflakes:
-       pyflakes src/allmydata
+       $(PYTHON) -OOu /usr/local/bin/pyflakes src/allmydata
 
 count-lines:
        @echo -n "files: "
@@ -187,3 +192,4 @@ deb-edgy-head: setup-edgy increment-deb-version
        fakeroot debian/rules binary
 deb-feisty-head: setup-feisty increment-deb-version
        fakeroot debian/rules binary
+