From: Brian Warner <warner@lothar.com>
Date: Sat, 21 Mar 2015 21:09:33 +0000 (-0700)
Subject: move build-osx-pkg out to a separate shell script
X-Git-Tag: allmydata-tahoe-1.10.1a1~57^2~1
X-Git-Url: https://git.rkrishnan.org/components/architecture.txt?a=commitdiff_plain;h=05c69668018802a770c813f2a6d7d26a8d1790e2;p=tahoe-lafs%2Ftahoe-lafs.git

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

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).
---

diff --git a/Makefile b/Makefile
index 39161bcf..00f025ae 100644
--- 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; \
diff --git a/misc/build_helpers/build-osx-pkg.sh b/misc/build_helpers/build-osx-pkg.sh
new file mode 100755
index 00000000..b5d1d7b6
--- /dev/null
+++ b/misc/build_helpers/build-osx-pkg.sh
@@ -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