From: Brian Warner <warner@lothar.com>
Date: Thu, 12 Jan 2012 19:14:15 +0000 (-0800)
Subject: 'make make-version': don't use darcsver. This fixes 'make tarballs'
X-Git-Tag: allmydata-tahoe-1.9.1~1
X-Git-Url: https://git.rkrishnan.org/pf/content/en/service/module-simplejson.encoder.html?a=commitdiff_plain;h=e267951a3c50094232453680104d812dc6f1d955;p=tahoe-lafs%2Ftahoe-lafs.git

'make make-version': don't use darcsver. This fixes 'make tarballs'
---

diff --git a/Makefile b/Makefile
index ac08c257..ba83cdbd 100644
--- a/Makefile
+++ b/Makefile
@@ -14,11 +14,10 @@ SOURCES=src/allmydata src/buildtest static misc/build_helpers bin/tahoe-script.t
 
 .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