Make tests work with both Nevow 0.11 and 0.12

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

diff --git a/Makefile b/Makefile
index 8a8b5ee3f4d424a8951b3a2f72d62483d295b72c..6df6bd6adf0b48358e7a45d35f4542462dbcf573 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -33,32 +33,21 @@ 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)
+
+test-osx-pkg:
        $(PYTHON) misc/build_helpers/test-osx-pkg.py
 
+upload-osx-pkg:
+       @echo "uploading to ~tahoe-tarballs/OS-X-packages/ via flappserver"
+       @if [ "X${BB_BRANCH}" = "Xmaster" ] || [ "X${BB_BRANCH}" = "X" ]; then \
+         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
+
 # TESTING
 
 # you can use 'make test TEST=allmydata.test.test_introducer' to run just
@@ -299,6 +288,9 @@ test-desert-island:
        $(MAKE) 2>&1 | tee make.out
        $(PYTHON) misc/build_helpers/check-build.py make.out no-downloads
 
+.PHONY: test-pip-install
+test-pip-install:
+       $(PYTHON) misc/build_helpers/test-pip-install.py
 
 # TARBALL GENERATION
 .PHONY: tarballs