From: Daira Hopwood <daira@jacaranda.org>
Date: Tue, 24 Mar 2015 16:41:43 +0000 (+0000)
Subject: Move computation of Tahoe version from Makefile to build-osx-pkg.sh. refs #2393
X-Git-Tag: allmydata-tahoe-1.10.1a1~56
X-Git-Url: https://git.rkrishnan.org/Site?a=commitdiff_plain;h=61f3d5ae1343836e76901a36db1c93541cd66251;p=tahoe-lafs%2Ftahoe-lafs.git

Move computation of Tahoe version from Makefile to build-osx-pkg.sh. refs #2393

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---

diff --git a/Makefile b/Makefile
index 6906e6cf..97587cd4 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ build:
 # Build OS X pkg packages.
 .PHONY: build-osx-pkg test-osx-pkg upload-osx-pkg
 build-osx-pkg: build
-	misc/build_helpers/build-osx-pkg.sh $(APPNAME) $(shell sh -c "cat src/allmydata/_version.py | grep verstr | head -n 1 | cut -d' ' -f 3")
+	misc/build_helpers/build-osx-pkg.sh $(APPNAME)
 
 test-osx-pkg:
 	$(PYTHON) misc/build_helpers/test-osx-pkg.py
diff --git a/misc/build_helpers/build-osx-pkg.sh b/misc/build_helpers/build-osx-pkg.sh
index d063a830..452dc4b7 100755
--- a/misc/build_helpers/build-osx-pkg.sh
+++ b/misc/build_helpers/build-osx-pkg.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 APPNAME=$1
-VERSION=$2
+VERSION=`sh -c "cat src/allmydata/_version.py | grep verstr | head -n 1 | cut -d' ' -f 3"`
 PWD=`pwd`
 
 # The editing of allmydata-tahoe.egg-link and easy-install.pth files