ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-29 15:43:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move build-osx-pkg out to a separate shell script

Browse Source 
Also remove the duplicate test-osx-pkg (i.e. don't run the test as part
of the build, and have the caller do it themselves later).
This commit is contained in:
Brian Warner 2015-03-21 14:09:33 -07:00
parent 7846f5f9c8
commit 05c6966801
2 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Makefile
View File

@ -33,33 +33,13 @@ build:
touch .built
# Build OS X pkg packages.
# The editing of .egg-link and .pth files ensures that we reference the source at the correct path.
.PHONY: build-osx-pkg
.PHONY: build-osx-pkg test-osx-pkg upload-osx-pkg
build-osx-pkg: build
find support -name $(APPNAME).egg-link -execdir sh -c "echo >> {}; echo /Applications/tahoe.app/src >> {}" \;
find support -name easy-install.pth -execdir sed -i.bak 's|^.*/src$$|../../../../src|' '{}' \;
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")
# create component pkg
pkgbuild --root $(shell pwd) \
--identifier com.leastauthority.tahoe \
--version $(shell sh -c "cat src/allmydata/_version.py | grep verstr | head -n 1 | cut -d' ' -f 3") \
--ownership recommended \
--install-location /Applications/tahoe.app \
--scripts $(shell pwd)/misc/build_helpers/osx/scripts \
tahoe-lafs.pkg
# create product archive
productbuild --distribution $(shell pwd)/misc/build_helpers/osx/Distribution.xml \
--package-path . \
tahoe-lafs-osx.pkg
# remove intermediate pkg
rm -f tahoe-lafs.pkg
# test the result
test-osx-pkg:
$(PYTHON) misc/build_helpers/test-osx-pkg.py
.PHONY: upload-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; \

29
misc/build_helpers/build-osx-pkg.sh Executable file
View File

@ -0,0 +1,29 @@
#!/bin/sh
APPNAME=$1
VERSION=$2
PWD=`pwd`
# The editing of allmydata-tahoe.egg-link and easy-install.pth files
# (*in-place*) ensures that we reference the source at the correct path,
# removing the hard-coded local source tree directory names.
#
find support -name $APPNAME.egg-link -execdir sh -c "echo >> {}; echo /Applications/tahoe.app/src >> {}" \;
find support -name easy-install.pth -execdir sed -i.bak 's|^.*/src$|../../../../src|' '{}' \;
# create component pkg
pkgbuild --root $PWD \
--identifier com.leastauthority.tahoe \
--version $VERSION \
--ownership recommended \
--install-location /Applications/tahoe.app \
--scripts $PWD/misc/build_helpers/osx/scripts \
tahoe-lafs.pkg
# create product archive
productbuild --distribution $PWD/misc/build_helpers/osx/Distribution.xml \
--package-path . \
tahoe-lafs-osx.pkg
# remove intermediate pkg
rm -f tahoe-lafs.pkg