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

diff --git a/Makefile.local b/Makefile.local
index 3f8f1d56..b338d8b2 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -7,10 +7,19 @@
 # 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)
+
+IS_GIT=$(shell if [ -d .git ] ; then echo yes ; else echo no; fi)
+
+VERSION:=$(shell cat version)
+ifneq ($(MAKECMDGOALS),release)
+ifneq ($(MAKECMDGOALS),release-message)
+ifeq ($(IS_GIT),yes)
+VERSION:=$(shell git describe --match '[0-9.]*')
+endif
+endif
+endif
 
 RELEASE_HOST=notmuchmail.org
 RELEASE_DIR=/srv/notmuchmail.org/www/releases
@@ -51,9 +60,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)"
 
@@ -69,25 +78,24 @@ 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:
-	$(MAKE) test
-	$(MAKE) 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)
-	mkdir -p releases
+release: verify-no-dirty-code
+	$(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)
-	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)"
+	mkdir -p releases
+	mv $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) releases
 	git tag -s -m "$(PACKAGE) $(VERSION) release" $(VERSION)
 	git push origin $(VERSION)
+	$(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce
+	@echo "Please send a release announcement using $(PACKAGE)-$(VERSION).announce as a template."
 
 .PHONY: release-message
 release-message:
@@ -109,7 +117,7 @@ release-message:
 	@echo ""
 	@echo "What's new in notmuch $(VERSION)"
 	@echo "========================="
-	@sed -ne '/^[Nn]otmuch 0.1/{n;n;b NEWS}; d; :NEWS /^===/q; {p;n;b NEWS}' < NEWS | head -n -2
+	@sed -ne '/^[Nn]otmuch $(VERSION)/{n;n;b NEWS}; d; :NEWS /^===/q; {p;n;b NEWS}' < NEWS | head -n -2
 	@echo ""
 	@echo "What is notmuch"
 	@echo "==============="
@@ -120,22 +128,40 @@ release-message:
 	@echo ""
 	@echo "For more about notmuch, see http://notmuchmail.org"
 
+.PHONY: verify-no-dirty-code
+verify-no-dirty-code: verify-version
+ifeq ($(IS_GIT),yes)
+	@printf "Checking that source tree is clean..."
+ifneq ($(shell git ls-files -m),)
+	@echo "No"
+	@echo "The following files have been modified since the most recent git commit:"
+	@echo ""
+	@git ls-files -m
+	@echo ""
+	@echo "The release will be made from the committed state, but perhaps you meant"
+	@echo "to commit this code first? Please clean this up to make it more clear."
+	@false
+else
+	@echo "Good"
+endif
+endif
 
-.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 "Please follow the instructions in RELEASING to choose a version" && 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)" \
-		&& 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