X-Git-Url: https://git.rkrishnan.org/?a=blobdiff_plain;f=Makefile;h=6df6bd6adf0b48358e7a45d35f4542462dbcf573;hb=0d6fcf445e21f58024ed869f5e672eab2d4a2903;hp=e2ade5d4c7101cc7c8c84170eaaa7b142f6e65da;hpb=53dc72318403b3a1de3a93dc43f35d15338d5b42;p=tahoe-lafs%2Ftahoe-lafs.git

diff --git a/Makefile b/Makefile
index e2ade5d4..6df6bd6a 100644
--- a/Makefile
+++ b/Makefile
@@ -10,10 +10,11 @@ export PYTHON
 # itself. It will also create it in the beginning of the 'develop' command.
 
 TAHOE=$(PYTHON) bin/tahoe
-SOURCES=src/allmydata src/buildtest static misc bin/tahoe-script.template twisted setup.py
+SOURCES=src/allmydata src/buildtest static misc bin/tahoe-script.template setup.py
+APPNAME=allmydata-tahoe
 
 # This is necessary only if you want to automatically produce a new
-# _version.py file from the current git/darcs history (without doing a build).
+# _version.py file from the current git history (without doing a build).
 .PHONY: make-version
 make-version:
 	$(PYTHON) ./setup.py update_version
@@ -31,6 +32,21 @@ build:
 	$(PYTHON) setup.py build
 	touch .built
 
+# 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)
+
+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
 
@@ -236,6 +252,7 @@ clean:
 	rm -rf misc/dependencies/build misc/dependencies/temp
 	rm -rf misc/dependencies/tahoe_deps.egg-info
 	rm -f bin/tahoe bin/tahoe.pyscript
+	rm -f *.pkg
 
 .PHONY: distclean
 distclean: clean
@@ -271,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
@@ -281,4 +301,4 @@ tarballs:
 
 .PHONY: upload-tarballs
 upload-tarballs:
-	@if [ "X${BB_BRANCH}" = "Xmaster" ] || [ "X${BB_BRANCH}" = "X" ]; then for f in dist/allmydata-tahoe-*; do flappclient --furlfile ~/.tahoe-tarball-upload.furl upload-file $$f; done ; else echo not uploading tarballs because this is not trunk but is branch \"${BB_BRANCH}\" ; fi
+	@if [ "X${BB_BRANCH}" = "Xmaster" ] || [ "X${BB_BRANCH}" = "X" ]; then for f in dist/$(APPNAME)-*; do flappclient --furlfile ~/.tahoe-tarball-upload.furl upload-file $$f; done ; else echo not uploading tarballs because this is not trunk but is branch \"${BB_BRANCH}\" ; fi