Makefile: Simplify the release targets.

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index 4a8142f03e6c9810a5d23d046ef5cbac90c74406..e7c6300f823c76ebfd94edd9d23d4c033d2ec8ff 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -7,8 +7,7 @@
 # digit when we reach particularly major milestones of usability.
 #
 # Between releases, (such as when compiling notmuch from the git
-# repository), we let git to append identification of the actual
-# commit.
+# repository), we let git append identification of the actual commit.
 PACKAGE=notmuch
 VERSION:=$(shell if [ -f version ]; then cat version; else git describe --match '[0-9].[0-9]*'; fi)
 
@@ -45,6 +44,10 @@ ifeq ($(shell cat .first-build-message),)
 endif
 endif
 
+.PHONY: test
+test: all
+       @./test/notmuch-test
+
 $(TAR_FILE):
        git archive --format=tar --prefix=$(PACKAGE)-$(VERSION)/ HEAD > $(TAR_FILE).tmp
        echo $(VERSION) > version
@@ -66,22 +69,21 @@ 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
-       $(MAKE) release-upload
-       @echo "Please send a release announcement as follows:"
-       @echo ""
-       $(MAKE) release-message
-       $(MAKE) release-message > $(PACKAGE)-$(VERSION).announce
-       @echo "(This message is also available in $(PACKAGE)-$(VERSION).announce"
-
-.PHONY: release-upload
-release-upload: $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE)
+release:
+       $(MAKE) verify-newer
+       $(MAKE) test
+       $(MAKE) $(GPG_FILE)
        mkdir -p releases
        scp $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
        mv $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) releases
        ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
        git tag -s -m "$(PACKAGE) $(VERSION) release" $(VERSION)
        git push origin $(VERSION)
+       @echo "Please send a release announcement as follows:"
+       @echo ""
+       $(MAKE) release-message
+       $(MAKE) release-message > $(PACKAGE)-$(VERSION).announce
+       @echo "(This message is also available in $(PACKAGE)-$(VERSION).announce"
 
 .PHONY: release-message
 release-message:
@@ -115,8 +117,8 @@ release-message:
        @echo "For more about notmuch, see http://notmuchmail.org"
 
 
-.PHONY: release-verify-version
-release-verify-version:
+.PHONY: verify-version
+verify-version:
        @echo -n "Checking that $(VERSION) is a two-component version..."
        @if echo $(VERSION) | grep -q -v -x '[0-9]*\.[0-9]*'; then \
                (echo "Ouch." && \
@@ -124,8 +126,8 @@ release-verify-version:
         else :; fi
        @echo "Good."
 
-.PHONY: release-verify-newer
-release-verify-newer: release-verify-version
+.PHONY: verify-newer
+verify-newer: verify-version
        @echo -n "Checking that no $(VERSION) release already exists..."
        @ssh $(RELEASE_HOST) test ! -e $(RELEASE_DIR)/$(TAR_FILE) \
                || (echo "Ouch." && echo "Found: $(RELEASE_HOST):$(RELEASE_DIR)/$(TAR_FILE)" \