X-Git-Url: https://git.rkrishnan.org/?a=blobdiff_plain;f=Makefile;h=89e2b41b6911c905b0d701dfff86e90b0e56bbd9;hb=HEAD;hp=de3a52c1b382e4315d61f4a3008ae3689d054c8f;hpb=74689af7a1492216e6d7e568435acd2ee55bed83;p=tahoe-lafs%2Ftahoe-lafs.git

diff --git a/Makefile b/Makefile
index de3a52c1..89e2b41b 100644
--- a/Makefile
+++ b/Makefile
@@ -5,12 +5,15 @@ default: build
 
 PYTHON=python
 export PYTHON
+PYFLAKES=pyflakes
+export PYFLAKES
 
 # setup.py will extend sys.path to include our support/lib/... directory
 # 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 setup.py
+APPNAME=allmydata-tahoe
 
 # This is necessary only if you want to automatically produce a new
 # _version.py file from the current git history (without doing a build).
@@ -32,30 +35,20 @@ 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
-build-osx-pkg:
-	$(PYTHON) setup.py build
-	find support -name allmydata-tahoe.egg-link -execdir sh -c "echo >> {}; echo /Applications/tahoe.app/src >> {}" \;
-	find support -name easy-install.pth -execdir sed -i.bak 's|^.*/src$$|../../../../src|' '{}' \;
-	touch .built
-
-# 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
+.PHONY: build-osx-pkg test-osx-pkg upload-osx-pkg
+build-osx-pkg: build
+	misc/build_helpers/build-osx-pkg.sh $(APPNAME)
 
-# create product archive
-	productbuild --distribution $(shell pwd)/misc/build_helpers/osx/Distribution.xml \
-	--package-path . \
-	tahoe-lafs-osx.pkg
+test-osx-pkg:
+	$(PYTHON) misc/build_helpers/test-osx-pkg.py
 
-# remove intermediate pkg
-	rm -f tahoe-lafs.pkg
+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
 
@@ -141,7 +134,7 @@ check-miscaptures:
 
 .PHONY: pyflakes
 pyflakes:
-	@$(PYTHON) -OOu `which pyflakes` $(SOURCES) |sort |uniq
+	$(PYFLAKES) $(SOURCES) |sort |uniq
 	@echo
 
 .PHONY: check-umids
@@ -261,6 +254,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
@@ -296,6 +290,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
@@ -306,4 +303,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