Add assertions to make sure that set_default_encoding_parameters is always called...

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

diff --git a/Makefile b/Makefile
index 9b4225db475a988901a01b91867dbffa11110580..89532499154fc2b521a76433879b5a96f8ea8119 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,11 +14,10 @@ SOURCES=src/allmydata src/buildtest static misc bin/tahoe-script.template twiste
 
 .PHONY: make-version build
 
-# The 'darcsver' setup.py command comes in the 'darcsver' package:
-# http://pypi.python.org/pypi/darcsver It is necessary only if you want to
-# automatically produce a new _version.py file from the current darcs history.
+# This is necessary only if you want to automatically produce a new
+# _version.py file from the current git/darcs history.
 make-version:
-       $(PYTHON) ./setup.py darcsver --count-all-patches
+       $(PYTHON) ./setup.py update_version
 
 .built:
        $(MAKE) build
@@ -135,7 +134,7 @@ check-miscaptures:
        @echo
 
 pyflakes:
-       $(PYTHON) -OOu `which pyflakes` $(SOURCES) |sort |uniq
+       @$(PYTHON) -OOu `which pyflakes` $(SOURCES) |sort |uniq
        @echo
 
 check-umids:
@@ -200,6 +199,10 @@ check-grid: .built
 bench-dirnode: .built
        $(TAHOE) @src/allmydata/test/bench_dirnode.py
 
+# the provisioning tool runs as a stand-alone webapp server
+run-provisioning-tool: .built
+       $(TAHOE) @misc/operations_helpers/provisioning/run.py
+
 # 'make repl' is a simple-to-type command to get a Python interpreter loop
 # from which you can type 'import allmydata'
 repl: