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

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

diff --git a/Makefile b/Makefile
index 00f025ae4480b1da257c35bea5c768df52a276f1..89e2b41b6911c905b0d701dfff86e90b0e56bbd9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,8 @@ 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.
@@ -35,14 +37,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
@@ -131,7 +134,7 @@ check-miscaptures:
 
 .PHONY: pyflakes
 pyflakes:
-       @$(PYTHON) -OOu `which pyflakes` $(SOURCES) |sort |uniq
+       $(PYFLAKES) $(SOURCES) |sort |uniq
        @echo
 
 .PHONY: check-umids
@@ -287,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