lib/n_d_needs_upgrade: handle error return from n_d_get_version

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index 82145e1b4e8e83122f44bb3313fbe457e261bfe9..2257761727c7ecb1d4871d75e4efc5d0486c2028 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -1,7 +1,7 @@
 # -*- makefile -*-
 
 .PHONY: all
-all: notmuch notmuch-shared build-man build-info ruby-bindings
+all: notmuch notmuch-shared build-man build-info ruby-bindings python-cffi-bindings
 ifeq ($(MAKECMDGOALS),)
 ifeq ($(shell cat .first-build-message 2>/dev/null),)
        @NOTMUCH_FIRST_BUILD=1 $(MAKE) --no-print-directory all
@@ -36,14 +36,14 @@ $(TAR_FILE):
                --transform s_^_$(PACKAGE)-$(VERSION)/_  \
                --transform 's_.tmp$$__' --mtime=@$$ct version.tmp
        rm version.tmp
-       gzip -n < $(TAR_FILE).tmp > $(TAR_FILE)
+       xz -C sha256 -9 < $(TAR_FILE).tmp > $(TAR_FILE)
        @echo "Source is ready for release in $(TAR_FILE)"
 
 $(SHA256_FILE): $(TAR_FILE)
-       sha256sum $^ > $@
+       sha256sum $^ | gpg --clear-sign --output $@ -
 
-$(GPG_FILE): $(SHA256_FILE)
-       gpg --armor --sign $^
+$(DETACHED_SIG_FILE): $(TAR_FILE)
+       gpg --armor --detach-sign $^
 
 .PHONY: dist
 dist: $(TAR_FILE)
@@ -54,6 +54,7 @@ update-versions:
        sed -i -e "s/^__VERSION__[[:blank:]]*=.*$$/__VERSION__ = \'${VERSION}\'/" \
            -e "s/^SOVERSION[[:blank:]]*=.*$$/SOVERSION = \'${LIBNOTMUCH_VERSION_MAJOR}\'/" \
            ${PV_FILE}
+       cp version bindings/python-cffi
 
 # We invoke make recursively only to force ordering of our phony
 # targets in the case of parallel invocation of make (-j).
@@ -68,16 +69,16 @@ release: verify-source-tree-and-version
        $(MAKE) VERSION=$(VERSION) clean
        $(MAKE) VERSION=$(VERSION) test
        git tag -s -m "$(PACKAGE) $(VERSION) release" $(UPSTREAM_TAG)
-       $(MAKE) VERSION=$(VERSION) $(GPG_FILE)
+       $(MAKE) VERSION=$(VERSION) $(SHA256_FILE) $(DETACHED_SIG_FILE)
        ln -sf $(TAR_FILE) $(DEB_TAR_FILE)
        pristine-tar commit $(DEB_TAR_FILE) $(UPSTREAM_TAG)
        git tag -s -m "$(PACKAGE) Debian $(VERSION)-1 upload (same as $(VERSION))" $(DEB_TAG)
        mkdir -p releases
-       mv $(TAR_FILE) $(SHA256_FILE) $(GPG_FILE) releases
+       mv $(TAR_FILE) $(SHA256_FILE) $(DETACHED_SIG_FILE) releases
        $(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce
 ifeq ($(REALLY_UPLOAD),yes)
        git push origin $(VERSION) $(DEB_TAG) release pristine-tar
-       cd releases && scp $(TAR_FILE) $(SHA256_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
+       cd releases && scp $(TAR_FILE) $(SHA256_FILE) $(DETACHED_SIG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
        ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-* ; ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(TAR_FILE)"
 endif
        @echo "Please send a release announcement using $(PACKAGE)-$(VERSION).announce as a template."
@@ -88,7 +89,7 @@ pre-release:
        $(MAKE) VERSION=$(VERSION) test
        git tag -s -m "$(PACKAGE) $(VERSION) release" $(UPSTREAM_TAG)
        git tag -s -m "$(PACKAGE) Debian $(VERSION)-1 upload (same as $(VERSION))" $(DEB_TAG)
-       $(MAKE) VERSION=$(VERSION) $(TAR_FILE)
+       $(MAKE) VERSION=$(VERSION) $(SHA256_FILE) $(DETACHED_SIG_FILE)
        ln -sf $(TAR_FILE) $(DEB_TAR_FILE)
        pristine-tar commit $(DEB_TAR_FILE) $(UPSTREAM_TAG)
        mkdir -p releases
@@ -97,14 +98,16 @@ pre-release:
 .PHONY: debian-snapshot
 debian-snapshot:
        make VERSION=$(VERSION) clean
-       TMPFILE=$$(mktemp /tmp/notmuch.XXXXXX);         \
-         cp debian/changelog $${TMPFILE};              \
-         EDITOR=/bin/true dch -b -v $(VERSION)+1       \
-           -D UNRELEASED 'test build, not for upload'; \
-         echo '3.0 (native)' > debian/source/format;   \
-         debuild -us -uc;                              \
-         mv -f $${TMPFILE} debian/changelog;           \
-         echo '3.0 (quilt)' > debian/source/format
+       RETVAL=0 &&                                             \
+         TMPFILE=$$(mktemp /tmp/notmuch.XXXXXX) &&             \
+         cp debian/changelog $${TMPFILE} &&                    \
+         (EDITOR=/bin/true dch -b -v $(VERSION)+1              \
+           -D UNRELEASED 'test build, not for upload' &&       \
+         echo '3.0 (native)' > debian/source/format &&         \
+         debuild -us -uc); RETVAL=$$?                          \
+         mv -f $${TMPFILE} debian/changelog;                   \
+         echo '3.0 (quilt)' > debian/source/format;            \
+         exit $$RETVAL
 
 .PHONY: release-message
 release-message:
@@ -121,7 +124,7 @@ release-message:
        @echo -n "  "
        @cat releases/$(SHA256_FILE)
        @echo ""
-       @echo "  $(RELEASE_URL)/$(GPG_FILE)"
+       @echo "  $(RELEASE_URL)/$(DETACHED_SIG_FILE)"
        @echo "  (signed by `getent passwd "$$USER" | cut -d: -f 5 | cut -d, -f 1`)"
        @echo ""
        @echo "What's new in notmuch $(VERSION)"