Fix a subtle bug in the overwrite algorithm.

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

diff --git a/Makefile b/Makefile
index 00f025ae4480b1da257c35bea5c768df52a276f1..abda237a31a4c5f999d3550bdfa894d520d2113a 100644 (file)
--- 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
@@ -82,6 +83,11 @@ _tmpfstest: make-version
        sudo umount '$(TMPDIR)'
        rmdir '$(TMPDIR)'
 
+.PHONY: smoketest
+smoketest:
+       -python ./src/allmydata/test/check_magicfolder_smoke.py kill
+       -rm -rf smoke_magicfolder/
+       python ./src/allmydata/test/check_magicfolder_smoke.py
 
 # code coverage: install the "coverage" package from PyPI, do "make test-coverage" to
 # do a unit test run with coverage-gathering enabled, then use "make coverage-output" to
@@ -287,6 +293,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