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=
ifeq ($(PLAT),win32)
# The platform is Windows with cygwin build tools and the native Python interpreter.
EXTRA_SETUP_ARGS=build -c mingw32
- REACTOR=iocp
+ REACTOR=select
INSTDIR := $(shell cygpath -w $(INSTDIR))
TRIALPATH := $(shell cygpath -w $(TRIALPATH))
ifneq ($(PYTHONPATH),)
PYTHONPATH := "$(INSTDIR)"
endif
-TRIAL=$(PYTHON) -u "$(TRIALPATH)" --reactor=$(REACTOR)
-# $(error $(TRIAL))
+TRIAL=$(PYTHON) -u "$(TRIALPATH)" --rterrors --reactor=$(REACTOR)
show-instdir:
@echo $(INSTDIR)
PP=PYTHONPATH=$(PYTHONPATH)
.PHONY: build
-build: build-pyfec build-Crypto
+build: build-zfec build-Crypto
$(PYTHON) setup.py $(EXTRA_SETUP_ARGS) install --install-lib="$(INSTDIR)" --install-scripts="$(INSTDIR)/scripts"
-build-pyfec:
- cd src/pyfec && $(PYTHON) ./setup.py $(EXTRA_SETUP_ARGS) install --install-lib="$(INSTDIR)" --install-scripts="$(INSTDIR)/scripts"
-
-test-pyfec:
- $(PP) $(PYTHON) src/pyfec/fec/test/test_pyfec.py
+build-zfec:
+ cd src/zfec && $(PYTHON) ./setup.py $(EXTRA_SETUP_ARGS) install --single-version-externally-managed --root="$(INSTDIR)" --install-lib="." --install-scripts="$(INSTDIR)/scripts"
-clean-pyfec:
- -cd src/pyfec && python ./setup.py clean
+clean-zfec:
+ -cd src/zfec && python ./setup.py clean --all
build-Crypto:
cd src/Crypto && $(PYTHON) ./setup.py $(EXTRA_SETUP_ARGS) install --install-lib="$(INSTDIR)" --install-scripts="$(INSTDIR)/scripts"
clean-Crypto:
- cd src/Crypto && python ./setup.py clean
+ cd src/Crypto && python ./setup.py clean --all
.PHONY: run-queen run-client test
cd client-basedir3 && PYTHONPATH=.. twistd -noy ../client.tac
ifeq ($(TEST),)
-TEST=allmydata fec
+TEST=allmydata zfec
endif
REPORTER=
$(PP) $(PYTHON) misc/figleaf2el.py .figleaf $(INSTDIR)
pyflakes:
- pyflakes src/allmydata
+ $(PYTHON) -OOu /usr/local/bin/pyflakes src/allmydata
count-lines:
@echo -n "files: "
check-memory:
$(PP) $(PYTHON) src/allmydata/test/check_memory.py
-clean: clean-pyfec clean-Crypto
+clean: clean-zfec clean-Crypto
rm -rf build
rm -f debian
rm -rf instdir