Makefile: Rework the version checks slightly.

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index 53a4a94bd9e8b83ddc1f54f919012dee051e5bb8..aefbb9e811ff38d66ca96e6f9af33f76792ed248 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -9,7 +9,13 @@
 # Between releases, (such as when compiling notmuch from the git
 # 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.]*'; fi)
+
+VERSION:=$(shell cat version)
+ifneq ($(MAKECMDGOALS),release)
+ifneq ($(MAKECMDGOALS),release-message)
+VERSION:=$(shell if git describe > /dev/null 2>&1; then git describe --match '[0-9.]*'; else cat version; fi)
+endif
+endif
 
 RELEASE_HOST=notmuchmail.org
 RELEASE_DIR=/srv/notmuchmail.org/www/releases
@@ -50,9 +56,9 @@ test: all
 
 $(TAR_FILE):
        git archive --format=tar --prefix=$(PACKAGE)-$(VERSION)/ HEAD > $(TAR_FILE).tmp
-       echo $(VERSION) > version
-       tar --append -f $(TAR_FILE).tmp --transform s_^_$(PACKAGE)-$(VERSION)/_ version
-       rm version
+       echo $(VERSION) > version.tmp
+       tar --append -f $(TAR_FILE).tmp --transform s_^_$(PACKAGE)-$(VERSION)/_  --transform 's_.tmp$$__' version.tmp
+       rm version.tmp
        gzip < $(TAR_FILE).tmp > $(TAR_FILE)
        @echo "Source is ready for release in $(TAR_FILE)"
 
@@ -68,18 +74,23 @@ dist: $(TAR_FILE)
 
 # We invoke make recursively only to force ordering of our phony
 # targets in the case of parallel invocation of make (-j).
+#
+# We carefully ensure that our VERSION variable is passed down to any
+# sub-ordinate make invocations (which won't otherwhise know that they
+# are part of the release and need to take the version from the
+# version file).
 .PHONY: release
 release: verify-no-dirty-code
-       $(MAKE) test
-       $(MAKE) $(GPG_FILE)
-       $(MAKE) verify-newer
+       $(MAKE) VERSION=$(VERSION) verify-newer
+       $(MAKE) VERSION=$(VERSION) test
+       $(MAKE) VERSION=$(VERSION) $(GPG_FILE)
        scp $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
        ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
        mkdir -p releases
        mv $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) releases
        git tag -s -m "$(PACKAGE) $(VERSION) release" $(VERSION)
        git push origin $(VERSION)
-       $(MAKE) release-message > $(PACKAGE)-$(VERSION).announce
+       $(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce
        @echo "Please send a release announcement using $(PACKAGE)-$(VERSION).announce as a template."
 
 .PHONY: release-message
@@ -134,11 +145,7 @@ verify-version:
        @echo -n "Checking that $(VERSION) consists only of digits and periods..."
        @if echo $(VERSION) | grep -q -v -x '[0-9.]*'; then \
                (echo "No." && \
-                echo "Remember: You need to use:" && \
-                echo "" && \
-                echo " make VERSION=X.Y release" && \
-                echo "" && \
-                echo "to release notmuch." && false); \
+                echo "Please follow the instructions in RELEASING to choose a version" && false) \
         else :; fi
        @echo "Good."
 
@@ -147,7 +154,8 @@ verify-newer:
        @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)" \
-               && echo "Refusing to replace an existing release." && false)
+               && echo "Refusing to replace an existing release." \
+               && echo "Don't forget to update \"version\" as described in RELEASING before release." && false)
        @echo "Good."
 
 # The user has not set any verbosity, default to quiet mode and inform the