ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-07 03:40:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Closes ticket:2393
This commit is contained in:
Brian Warner 2015-03-21 14:20:00 -07:00
parent 05c6966801
commit c12d49b54e
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -42,7 +42,7 @@ test-osx-pkg:
upload-osx-pkg: upload-osx-pkg:
@if [ "X${BB_BRANCH}" = "Xmaster" ] || [ "X${BB_BRANCH}" = "X" ]; then \ @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 \ else \
echo not uploading tahoe-lafs-osx-pkg because this is not trunk but is branch \"${BB_BRANCH}\" ; \ echo not uploading tahoe-lafs-osx-pkg because this is not trunk but is branch \"${BB_BRANCH}\" ; \
fi fi

2
misc/build_helpers/build-osx-pkg.sh
View File

@ -23,7 +23,7 @@ pkgbuild --root $PWD \
# create product archive # create product archive
productbuild --distribution $PWD/misc/build_helpers/osx/Distribution.xml \ productbuild --distribution $PWD/misc/build_helpers/osx/Distribution.xml \
--package-path . \ --package-path . \
tahoe-lafs-osx.pkg tahoe-lafs-$VERSION-osx.pkg
# remove intermediate pkg # remove intermediate pkg
rm -f tahoe-lafs.pkg rm -f tahoe-lafs.pkg

8
misc/build_helpers/test-osx-pkg.py
View File

@ -85,7 +85,11 @@ def test_osx_pkg(pkgfile):
if __name__ == '__main__': if __name__ == '__main__':
print "Testing..." pkgs = [fn for fn in os.listdir(".") if fn.endswith("-osx.pkg")]
test_osx_pkg('tahoe-lafs-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!" print "Looks OK!"