X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile.local;h=98d69c4d8dfa44772499c14793bb069201c2343b;hp=3f8f1d56c81add165cd5844cf0ed471f635bcf58;hb=2805a243b5564bb99196923f96118ace4c55e870;hpb=f3428823e5cfa8e524e3ea7be8b497020d0693ba

diff --git a/Makefile.local b/Makefile.local
index 3f8f1d56..98d69c4d 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -7,10 +7,9 @@
 # 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)
+VERSION:=$(shell if [ -f version ]; then cat version; else git describe --match '[0-9.]*'; fi)
 
 RELEASE_HOST=notmuchmail.org
 RELEASE_DIR=/srv/notmuchmail.org/www/releases
@@ -70,25 +69,22 @@ 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-version
 	$(MAKE) test
-	$(MAKE) release-verify-newer
-	$(MAKE) release-upload
+	$(MAKE) $(GPG_FILE)
+	$(MAKE) verify-newer
+	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)
 	@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)
-	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)
-
 .PHONY: release-message
 release-message:
 	@echo "To: notmuch@notmuchmail.org"
@@ -121,17 +117,21 @@ release-message:
 	@echo "For more about notmuch, see http://notmuchmail.org"
 
 
-.PHONY: release-verify-version
-release-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." && \
-	         echo "Before releasing the notmuch version should be a two-component value." && false);\
+.PHONY: verify-version
+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); \
 	 else :; fi
 	@echo "Good."
 
-.PHONY: release-verify-newer
-release-verify-newer: release-verify-version
+.PHONY: verify-newer
+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)" \