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

[tahoe-lafs/tahoe-lafs.git] / Makefile

diff --git a/Makefile b/Makefile
index 39161bcfa8484680589992f6ecf3c8b34b43b2c1..00f025ae4480b1da257c35bea5c768df52a276f1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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|' '{}' \;
-
-# 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
+       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")
+
+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; \