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 6906e6cfd831348b8bb64fff1e78ca9f42754926..97587cd4e60c98fb2bedfd79c486d395059276e7 100644 (file)
--- 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 d063a830f7a2136898c5edc6d51e117b6f76a022..452dc4b731a026e701d5cfa944d813656e9039ff 100755 (executable)
--- 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