Makefile: Print template for release announcement.

At the end of "make release" or at any point later with
"make release-message".

diff --git a/Makefile.local b/Makefile.local
index d78f61322f0b113f908bc60da061722cc6399c04..bda9ede1ce269005bfcabe6302d8d57f8a9a2019 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -15,6 +15,7 @@ VERSION=0.1.1
 
 RELEASE_HOST=notmuchmail.org
 RELEASE_DIR=/srv/notmuchmail.org/www/releases
+RELEASE_URL=http://notmuchmail.org/releases
 TAR_FILE=$(PACKAGE)-$(VERSION).tar.gz
 SHA1_FILE=$(TAR_FILE).sha1
 GPG_FILE=$(SHA1_FILE).asc
@@ -74,8 +75,15 @@ $(GPG_FILE): $(SHA1_FILE)
 .PHONY: dist
 dist: $(TAR_FILE)
 
+# We invoke make recursively only to force ordering of our phony
+# targets in the case of parallel invocation of make (-j).
 .PHONY: release
-release: release-verify-newer $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE)
+release: release-verify-newer
+       $(MAKE) release-upload
+       $(MAKE) release-message
+
+.PHONY: release-upload
+release-upload: $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE)
        mkdir -p releases
        scp $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
        mv $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) releases
@@ -83,6 +91,26 @@ release: release-verify-newer $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE)
        git tag -s -m "$(PACKAGE) $(VERSION) release" $(VERSION)
        git push origin $(VERSION)
 
+.PHONY: release-message
+release-message:
+       @echo "Please send a release announcement as follows:"
+       @echo ""
+       @echo "To: notmuch@notmuchmail.org"
+       @echo "Subject: $(PACKAGE) release $(VERSION) now available"
+       @echo ""
+       @echo "Where to obtain $(PACKAGE) $(VERSION)"
+       @echo "==========================="
+       @echo "  $(RELEASE_URL)/$(TAR_FILE)"
+       @echo ""
+       @echo "Which can be verified with:"
+       @echo ""
+       @echo "  $(RELEASE_URL)/$(SHA1_FILE)"
+       @echo -n "  "
+       @cat releases/$(SHA1_FILE)
+       @echo ""
+       @echo "  $(RELEASE_URL)/$(GPG_FILE)"
+       @echo "  (signed by `getent passwd "$$USER" | cut -d: -f 5 | cut -d, -f 1`)"
+
 .PHONY: release-verify-version
 release-verify-version:
        @echo -n "Checking that $(VERSION) is a two-component version..."

diff --git a/RELEASING b/RELEASING
index 0ee39bd1c953570912d28cf248be449d8c2d99f0..edbd9d37410737bea54c3a23f3e9260346d8b1aa 100644 (file)
--- a/RELEASING
+++ b/RELEASING
@@ -62,8 +62,8 @@ Here are the steps to follow to create a new notmuch release:
          your public-key's setting or this fails.)
        * Push that tag
        * Provide some text for the release announcement (see below).
-         If for some reason you lost this message, "make release-publish-message"
-         prints it for you.
+         If for some reason you lose this message, "make release-message"
+         prints it again for you.
 
 7) Increment the notmuch version by adding a .1 micro number, commit, and push.