make release: verify-version-*: change comparison logic

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index 6ddef5c883b56a5970a9e96cb25f5e417b5f3ae0..b6e216a28e533bce0dcb80e85f61ff96cd360095 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -12,14 +12,16 @@ PACKAGE=notmuch
 
 IS_GIT=$(shell if [ -d .git ] ; then echo yes ; else echo no; fi)
 
-VERSION:=$(shell cat ${srcdir}/version)
-ifneq ($(MAKECMDGOALS),release)
-ifneq ($(MAKECMDGOALS),release-message)
-ifneq ($(MAKECMDGOALS),pre-release)
 ifeq ($(IS_GIT),yes)
-VERSION:=$(shell git describe --match '[0-9.]*'|sed -e s/-/+/ -e s/-/~/)
-endif
+DATE:=$(shell git log --date=short -1 --pretty=format:%cd)
+else
+DATE:=$(shell date +%F)
 endif
+
+VERSION:=$(shell cat ${srcdir}/version)
+ifeq ($(filter release release-message pre-release update-versions,$(MAKECMDGOALS)),)
+ifeq ($(IS_GIT),yes)
+VERSION:=$(shell git describe --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/)
 endif
 endif
 
@@ -91,6 +93,12 @@ $(GPG_FILE): $(SHA1_FILE)
 .PHONY: dist
 dist: $(TAR_FILE)
 
+.PHONY: update-versions
+
+update-versions:
+       sed -i "s/^.TH NOTMUCH 1.*$$/.TH NOTMUCH 1 ${DATE} \"Notmuch ${VERSION}\"/" notmuch.1
+       sed -i "s/^__VERSION__[[:blank:]]*=.*$$/__VERSION__ = \'${VERSION}\'/" $(PV_FILE)
+
 # We invoke make recursively only to force ordering of our phony
 # targets in the case of parallel invocation of make (-j).
 #
@@ -199,28 +207,25 @@ endif
 .PHONY: verify-version-debian
 verify-version-debian: verify-version-components
        @echo -n "Checking that Debian package version is $(VERSION)-1..."
-       @if [ "$(VERSION)-1" != $$(dpkg-parsechangelog | grep ^Version | awk '{print $$2}') ] ; then \
+       @[ "$(VERSION)-1" = $$(dpkg-parsechangelog | grep ^Version | awk '{print $$2}') ] || \
                (echo "No." && \
-                echo "Please edit version and debian/changelog to have consistent versions." && false) \
-        fi
+                echo "Please edit version and debian/changelog to have consistent versions." && false)
        @echo "Good."
 
 .PHONY: verify-version-python
 verify-version-python: verify-version-components
        @echo -n "Checking that python bindings version is $(VERSION)..."
-       @if [ "$(VERSION)" != $$(python -c "execfile('$(PV_FILE)'); print __VERSION__") ] ; then \
+       @[ "$(VERSION)" = $$(python -c "execfile('$(PV_FILE)'); print __VERSION__") ] || \
                (echo "No." && \
-                echo "Please edit version and $(PV_FILE) to have consistent versions." && false) \
-        fi
+                echo "Please edit version and $(PV_FILE) to have consistent versions." && false)
        @echo "Good."
 
 .PHONY: verify-version-components
 verify-version-components:
        @echo -n "Checking that $(VERSION) consists only of digits and periods..."
-       @if echo $(VERSION) | grep -q -v -x '[0-9.]*'; then \
+       @echo $(VERSION) | grep -q -x '^[0-9.]*$$' || \
                (echo "No." && \
-                echo "Please follow the instructions in RELEASING to choose a version" && false) \
-        else :; fi
+                echo "Please follow the instructions in RELEASING to choose a version" && false)
        @echo "Good."
 
 .PHONY: verify-newer