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

Closes ticket:2393

diff --git a/Makefile b/Makefile
index 00f025ae4480b1da257c35bea5c768df52a276f1..6906e6cfd831348b8bb64fff1e78ca9f42754926 100644 (file)
--- 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 b5d1d7b64c9b6ac76070782d05abac97c6003ebe..d063a830f7a2136898c5edc6d51e117b6f76a022 100755 (executable)
--- 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 664f05381379aee964d7e39c2b8530670d97d8ee..750c5c3e0985bbbc055b437d008d852be41c35d7 100644 (file)
--- 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!"