X-Git-Url: https://git.rkrishnan.org/?a=blobdiff_plain;f=Makefile;h=6df6bd6adf0b48358e7a45d35f4542462dbcf573;hb=498563da69dddae86478343c66d437a467274522;hp=00f025ae4480b1da257c35bea5c768df52a276f1;hpb=05c69668018802a770c813f2a6d7d26a8d1790e2;p=tahoe-lafs%2Ftahoe-lafs.git

diff --git a/Makefile b/Makefile
index 00f025ae..6df6bd6a 100644
--- a/Makefile
+++ b/Makefile
@@ -35,14 +35,15 @@ build:
 # Build OS X pkg packages.
 .PHONY: build-osx-pkg test-osx-pkg upload-osx-pkg
 build-osx-pkg: build
-	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")
+	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; \
+	  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
@@ -287,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