Merge pull request #236 from daira/2725.timezone-test.0

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

diff --git a/Makefile b/Makefile
index e2ade5d4c7101cc7c8c84170eaaa7b142f6e65da..89e2b41b6911c905b0d701dfff86e90b0e56bbd9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,15 +5,18 @@ 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 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 +34,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
 
@@ -116,7 +134,7 @@ check-miscaptures:
 
 .PHONY: pyflakes
 pyflakes:
-       @$(PYTHON) -OOu `which pyflakes` $(SOURCES) |sort |uniq
+       $(PYFLAKES) $(SOURCES) |sort |uniq
        @echo
 
 .PHONY: check-umids
@@ -236,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
@@ -271,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
@@ -281,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