From: Brian Warner <warner@lothar.com>
Date: Sat, 21 Mar 2015 21:20:00 +0000 (-0700)
Subject: create/test/upload tahoe-lafs-VERSION-osx.pkg, not tahoe-lafs-osx.pkg
X-Git-Tag: allmydata-tahoe-1.10.1a1~57^2
X-Git-Url: https://git.rkrishnan.org/vdrive/%22news.html/simplejson//%22?a=commitdiff_plain;h=c12d49b54e1d624462f1bc78dde2e733ef2cd6b5;p=tahoe-lafs%2Ftahoe-lafs.git

create/test/upload tahoe-lafs-VERSION-osx.pkg, not tahoe-lafs-osx.pkg

Closes ticket:2393
---

diff --git a/Makefile b/Makefile
index 00f025ae..6906e6cf 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ test-osx-pkg:
 
 upload-osx-pkg:
 	@if [ "X${BB_BRANCH}" = "Xmaster" ] || [ "X${BB_BRANCH}" = "X" ]; then \
-	  flappclient --furlfile ~/.tahoe-osx-pkg-upload.furl upload-file tahoe-lafs-osx.pkg; \
+	  flappclient --furlfile ~/.tahoe-osx-pkg-upload.furl upload-file tahoe-lafs-*-osx.pkg; \
 	 else \
 	  echo not uploading tahoe-lafs-osx-pkg because this is not trunk but is branch \"${BB_BRANCH}\" ; \
 	fi
diff --git a/misc/build_helpers/build-osx-pkg.sh b/misc/build_helpers/build-osx-pkg.sh
index b5d1d7b6..d063a830 100755
--- a/misc/build_helpers/build-osx-pkg.sh
+++ b/misc/build_helpers/build-osx-pkg.sh
@@ -23,7 +23,7 @@ pkgbuild --root $PWD \
 # create product archive
 productbuild --distribution $PWD/misc/build_helpers/osx/Distribution.xml \
              --package-path . \
-             tahoe-lafs-osx.pkg
+             tahoe-lafs-$VERSION-osx.pkg
 
 # remove intermediate pkg
 rm -f tahoe-lafs.pkg
diff --git a/misc/build_helpers/test-osx-pkg.py b/misc/build_helpers/test-osx-pkg.py
index 664f0538..750c5c3e 100644
--- a/misc/build_helpers/test-osx-pkg.py
+++ b/misc/build_helpers/test-osx-pkg.py
@@ -85,7 +85,11 @@ def test_osx_pkg(pkgfile):
 
 
 if __name__ == '__main__':
-    print "Testing..."
-    test_osx_pkg('tahoe-lafs-osx.pkg')
+    pkgs = [fn for fn in os.listdir(".") if fn.endswith("-osx.pkg")]
+    if len(pkgs) != 1:
+        print "ERR: unable to find a single .pkg file:", pkgs
+        sys.exit(1)
+    print "Testing %s ..." % pkgs[0]
+    test_osx_pkg(pkgs[0])
     print "Looks OK!"