# setup.py will extend sys.path to include our support/lib/... directory
# itself. It will also create it in the beginning of the 'develop' command.
-PP=$(shell $(PYTHON) setup.py -q show_pythonpath)
-RUNPP=$(PYTHON) setup.py run_with_pythonpath
TAHOE=$(PYTHON) bin/tahoe
+SOURCES=src/allmydata src/buildtest static misc/build_helpers bin/tahoe-script.template twisted setup.py
.PHONY: make-version build
make-version:
$(PYTHON) ./setup.py darcsver --count-all-patches
-# We want src/allmydata/_version.py to be up-to-date, but it's a fairly
-# expensive operation (about 6 seconds on a just-before-0.7.0 tree, probably
-# because of the 332 patches since the last tag), and we've removed the need
-# for an explicit 'build' step by removing the C code from src/allmydata and
-# by running everything in place. It would be neat to do:
-#
-#src/allmydata/_version.py: _darcs/patches
-# $(MAKE) make-version
-#
-# since that would update the embedded version string each time new darcs
-# patches were pulled, but without an obligatory 'build' step this rule
-# wouldn't be run frequently enough anyways.
-#
-# So instead, I'll just make sure that we update the version at least once
-# when we first start using the tree, and again whenever an explicit
-# 'make-version' is run, since then at least the developer has some means to
-# update things. It would be nice if 'make clean' deleted any
-# automatically-generated _version.py too, so that 'make clean; make all'
-# could be useable as a "what the heck is going on, get me back to a clean
-# state', but we need 'make clean' to work on non-darcs trees without
-# destroying useful information.
-
.built:
$(MAKE) build
src/allmydata/_version.py:
$(MAKE) make-version
-build: src/allmydata/_version.py
+# It is unnecessary to have this depend on build or src/allmydata/_version.py,
+# since 'setup.py build' always updates the version using 'darcsver --count-all-patches'.
+build:
$(PYTHON) setup.py build
touch .built
# 'make install PREFIX=/usr/local/stow/tahoe-N.N' will do the same, but to
# a different location
-install: src/allmydata/_version.py
+install:
ifdef PREFIX
mkdir -p $(PREFIX)
$(PYTHON) ./setup.py install --single-version-externally-managed \
# TESTING
-.PHONY: signal-error-deps test test-coverage quicktest quicktest-coverage
+.PHONY: signal-error-deps test check test-coverage quicktest quicktest-coverage
.PHONY: coverage-output get-old-coverage-coverage coverage-delta-output
-signal-error-deps:
- @echo
- @echo
- @echo "ERROR: Not all of Tahoe's dependencies are in place. Please see docs/install.html for help on installing dependencies."
- @echo
- @echo
- exit 1
-
-check-auto-deps:
- $(PYTHON) setup.py -q check_auto_deps || $(MAKE) signal-error-deps
-
-.checked-deps:
- $(MAKE) check-auto-deps
- touch .checked-deps
-
# you can use 'make test TEST=allmydata.test.test_introducer' to run just
# test_introducer. TEST=allmydata.test.test_client.Basic.test_permute works
# too.
# use 'make test TRIALARGS=--reporter=bwverbose' from buildbot, to
# suppress the ansi color sequences
-test: build src/allmydata/_version.py
+# It is unnecessary to have this depend on build or src/allmydata/_version.py,
+# since 'setup.py test' always updates the version and builds before testing.
+test:
$(PYTHON) setup.py test $(TRIALARGS) -s $(TEST)
+ touch .built
-fuse-test: .built .checked-deps
- $(RUNPP) -d contrib/fuse -p -c runtests.py
+check: test
-test-coverage: build src/allmydata/_version.py
+test-coverage: build
rm -f .coverage
$(TAHOE) debug trial --reporter=bwverbose-coverage $(TEST)
quicktest-coverage:
rm -f .coverage
- $(TAHOE) debug trial --reporter=bwverbose-coverage $(TEST)
+ PYTHONPATH=. $(TAHOE) debug trial --reporter=bwverbose-coverage $(TEST)
# on my laptop, "quicktest" takes 239s, "quicktest-coverage" takes 304s
# --include appeared in coverage-3.4
cp .coverage coverage-html/coverage.data
@echo "now point your browser at coverage-html/index.html"
-## use these two targets to compare this coverage against the previous run.
-## The deltas only work if the old test was run in the same directory, since
-## it compares absolute filenames.
-#get-old-figleaf-coverage:
-# wget --progress=dot -O old.figleaf http://allmydata.org/tahoe-figleaf/current/figleaf.pickle
-#
-#figleaf-delta-output:
-# $(RUNPP) -p -c "misc/figleaf2html -d coverage-html -r src -x misc/figleaf.excludes -o old.figleaf"
-# cp .figleaf coverage-html/figleaf.pickle
-# @echo "now point your browser at coverage-html/index.html"
-
.PHONY: upload-coverage .coverage.el pyflakes count-lines
.PHONY: check-memory check-memory-once check-speed check-grid
.PHONY: repl test-darcs-boringfile test-clean clean find-trailing-spaces
pyflakes:
- $(PYTHON) -OOu `which pyflakes` src/allmydata static misc/build_helpers bin/tahoe-script.template |sort |uniq
+ $(PYTHON) -OOu `which pyflakes` $(SOURCES) |sort |uniq
+
check-umids:
- $(PYTHON) misc/coding_tools/check-umids.py `find src/allmydata -name '*.py'`
+ $(PYTHON) misc/coding_tools/check-umids.py `find $(SOURCES) -name '*.py'`
count-lines:
@echo -n "files: "
check-memory: .built
rm -rf _test_memory
- $(RUNPP) -p -c "src/allmydata/test/check_memory.py upload"
- $(RUNPP) -p -c "src/allmydata/test/check_memory.py upload-self"
- $(RUNPP) -p -c "src/allmydata/test/check_memory.py upload-POST"
- $(RUNPP) -p -c "src/allmydata/test/check_memory.py download"
- $(RUNPP) -p -c "src/allmydata/test/check_memory.py download-GET"
- $(RUNPP) -p -c "src/allmydata/test/check_memory.py download-GET-slow"
- $(RUNPP) -p -c "src/allmydata/test/check_memory.py receive"
+ $(TAHOE) @src/allmydata/test/check_memory.py upload
+ $(TAHOE) @src/allmydata/test/check_memory.py upload-self
+ $(TAHOE) @src/allmydata/test/check_memory.py upload-POST
+ $(TAHOE) @src/allmydata/test/check_memory.py download
+ $(TAHOE) @src/allmydata/test/check_memory.py download-GET
+ $(TAHOE) @src/allmydata/test/check_memory.py download-GET-slow
+ $(TAHOE) @src/allmydata/test/check_memory.py receive
check-memory-once: .built
rm -rf _test_memory
- $(RUNPP) -p -c "src/allmydata/test/check_memory.py $(MODE)"
+ $(TAHOE) @src/allmydata/test/check_memory.py $(MODE)
# The check-speed target uses a pre-established client node to run a canned
# set of performance tests against a test network that is also
-$(TAHOE) stop $(TESTCLIENTDIR)
$(TAHOE) start $(TESTCLIENTDIR)
sleep 5
- $(PYTHON) src/allmydata/test/check_speed.py $(TESTCLIENTDIR)
+ $(TAHOE) @src/allmydata/test/check_speed.py $(TESTCLIENTDIR)
$(TAHOE) stop $(TESTCLIENTDIR)
# The check-grid target also uses a pre-established client node, along with a
# in src/allmydata/test/check_grid.py to see how to set this up.
check-grid: .built
if [ -z '$(TESTCLIENTDIR)' ]; then exit 1; fi
- $(PYTHON) src/allmydata/test/check_grid.py $(TESTCLIENTDIR) bin/tahoe
+ $(TAHOE) @src/allmydata/test/check_grid.py $(TESTCLIENTDIR) bin/tahoe
bench-dirnode: .built
- $(RUNPP) -p -c src/allmydata/test/bench_dirnode.py
+ $(TAHOE) @src/allmydata/test/bench_dirnode.py
# 'make repl' is a simple-to-type command to get a Python interpreter loop
# from which you can type 'import allmydata'
find . |grep -vEe "_darcs|allfiles.tmp|src/allmydata/_(version|appname).py" |sort >allfiles.tmp.new
diff allfiles.tmp.old allfiles.tmp.new
+# It would be nice if 'make clean' deleted any automatically-generated
+# _version.py too, so that 'make clean; make all' could be useable as a
+# "what the heck is going on, get me back to a clean state', but we need
+# 'make clean' to work on non-darcs trees without destroying useful information.
clean:
- rm -rf build _trial_temp _test_memory .checked-deps .built
+ rm -rf build _trial_temp _test_memory .built
rm -f `find src *.egg -name '*.so' -or -name '*.pyc'`
rm -rf src/allmydata_tahoe.egg-info
rm -rf support dist
rm -f bin/tahoe bin/tahoe.pyscript
find-trailing-spaces:
- $(PYTHON) misc/coding_tools/find-trailing-spaces.py -r src
+ $(PYTHON) misc/coding_tools/find-trailing-spaces.py -r $(SOURCES)
# The test-desert-island target grabs the tahoe-deps tarball, unpacks it,
# does a build, then asserts that the build did not try to download anything
# support/lib/ directory is gone.
fetch-and-unpack-deps:
- test -f tahoe-deps.tar.gz || wget http://allmydata.org/source/tahoe/deps/tahoe-deps.tar.gz
+ test -f tahoe-deps.tar.gz || wget http://tahoe-lafs.org/source/tahoe/deps/tahoe-deps.tar.gz
rm -rf tahoe-deps
tar xzf tahoe-deps.tar.gz
upload-tarballs:
@if [ "X${BB_BRANCH}" == "Xtrunk" ] || [ "X${BB_BRANCH}" == "X" ]; then for f in dist/allmydata-tahoe-*; do flappclient --furlfile ~/.tahoe-tarball-upload.furl upload-file $$f; done ; else echo not uploading tarballs because this is not trunk but is branch \"${BB_BRANCH}\" ; fi
-
-# DEBIAN PACKAGING
-
-VER=$(shell $(PYTHON) misc/build_helpers/get-version.py)
-DEBCOMMENTS="'make deb' build"
-
-show-version:
- @echo $(VER)
-show-pp:
- @echo $(PP)
-
-.PHONY: setup-deb deb-ARCH is-known-debian-arch
-.PHONY: deb-etch deb-lenny deb-sid
-.PHONY: deb-edgy deb-feisty deb-gutsy deb-hardy deb-intrepid deb-jaunty
-
-# we use misc/debian_helpers/$TAHOE_ARCH/debian
-
-deb-etch: # py2.4
- $(MAKE) deb-ARCH ARCH=etch TAHOE_ARCH=etch
-deb-lenny: # py2.5
- $(MAKE) deb-ARCH ARCH=lenny TAHOE_ARCH=lenny
-deb-sid:
- $(MAKE) deb-ARCH ARCH=sid TAHOE_ARCH=sid
-
-deb-edgy: # py2.4
- $(MAKE) deb-ARCH ARCH=edgy TAHOE_ARCH=etch
-deb-feisty: # py2.5
- $(MAKE) deb-ARCH ARCH=feisty TAHOE_ARCH=lenny
-deb-gutsy: # py2.5
- $(MAKE) deb-ARCH ARCH=gutsy TAHOE_ARCH=lenny
-deb-hardy: # py2.5
- $(MAKE) deb-ARCH ARCH=hardy TAHOE_ARCH=lenny
-deb-intrepid: # py2.5
- $(MAKE) deb-ARCH ARCH=intrepid TAHOE_ARCH=lenny
-deb-jaunty: # py2.6
- $(MAKE) deb-ARCH ARCH=jaunty TAHOE_ARCH=lenny
-
-
-
-# we know how to handle the following debian architectures
-KNOWN_DEBIAN_ARCHES := etch lenny sid edgy feisty gutsy hardy intrepid jaunty
-
-ifeq ($(findstring x-$(ARCH)-x,$(foreach arch,$(KNOWN_DEBIAN_ARCHES),"x-$(arch)-x")),)
-is-known-debian-arch:
- @echo "ARCH must be set when using setup-deb or deb-ARCH"
- @echo "I know how to handle:" $(KNOWN_DEBIAN_ARCHES)
- false
-else
-is-known-debian-arch:
- true
-endif
-
-ifndef TAHOE_ARCH
-TAHOE_ARCH=$(ARCH)
-endif
-
-setup-deb: is-known-debian-arch
- rm -f debian
- ln -s misc/debian_helpers/$(TAHOE_ARCH)/debian debian
- chmod +x debian/rules
-
-# etch (current debian stable) has python-simplejson-1.3, which doesn't
-# support indent=
-# sid (debian unstable) currently has python-simplejson 1.7.1
-# edgy has 1.3, which doesn't support indent=
-# feisty has 1.4, which supports indent= but emits a deprecation warning
-# gutsy has 1.7.1
-#
-# we need 1.4 or newer
-
-deb-ARCH: is-known-debian-arch setup-deb
- fakeroot debian/rules binary
- @echo
- @echo "The newly built .deb packages are in the parent directory from here."
-
-.PHONY: increment-deb-version
-.PHONY: deb-etch-head deb-lenny-head deb-sid-head
-.PHONY: deb-edgy-head deb-feisty-head deb-gutsy-head deb-hardy-head deb-intrepid-head deb-jaunty-head
-
-# The buildbot runs the following targets after each change, to produce
-# up-to-date tahoe .debs. These steps do not create .debs for anything else.
-
-increment-deb-version: make-version
- debchange --newversion $(VER) $(DEBCOMMENTS)
-deb-etch-head:
- $(MAKE) setup-deb ARCH=etch TAHOE_ARCH=etch
- $(MAKE) increment-deb-version
- fakeroot debian/rules binary
-deb-lenny-head:
- $(MAKE) setup-deb ARCH=lenny TAHOE_ARCH=lenny
- $(MAKE) increment-deb-version
- fakeroot debian/rules binary
-deb-sid-head:
- $(MAKE) setup-deb ARCH=sid TAHOE_ARCH=lenny
- $(MAKE) increment-deb-version
- fakeroot debian/rules binary
-
-deb-edgy-head:
- $(MAKE) setup-deb ARCH=edgy TAHOE_ARCH=etch
- $(MAKE) increment-deb-version
- fakeroot debian/rules binary
-deb-feisty-head:
- $(MAKE) setup-deb ARCH=feisty TAHOE_ARCH=lenny
- $(MAKE) increment-deb-version
- fakeroot debian/rules binary
-deb-gutsy-head:
- $(MAKE) setup-deb ARCH=gutsy TAHOE_ARCH=lenny
- $(MAKE) increment-deb-version
- fakeroot debian/rules binary
-deb-hardy-head:
- $(MAKE) setup-deb ARCH=hardy TAHOE_ARCH=lenny
- $(MAKE) increment-deb-version
- fakeroot debian/rules binary
-deb-intrepid-head:
- $(MAKE) setup-deb ARCH=intrepid TAHOE_ARCH=lenny
- $(MAKE) increment-deb-version
- fakeroot debian/rules binary
-deb-jaunty-head:
- $(MAKE) setup-deb ARCH=jaunty TAHOE_ARCH=lenny
- $(MAKE) increment-deb-version
- fakeroot debian/rules binary
-
-# new experimental debian-packaging-building target
-.PHONY: EXPERIMENTAL-deb
-EXPERIMENTAL-deb: is-known-debian-arch
- $(PYTHON) misc/build_helpers/build-deb.py $(ARCH)
projects / tahoe-lafs / tahoe-lafs.git / blobdiff