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.]*')
-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
SHA1_FILE=$(TAR_FILE).sha1
GPG_FILE=$(SHA1_FILE).asc
+PV_FILE=bindings/python/notmuch/version.py
+
# Smash together user's values with our extra values
FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)
FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)
-FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Llib -lnotmuch $(AS_NEEDED_LDFLAGS) $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS)
+FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch $(AS_NEEDED_LDFLAGS) $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS)
FINAL_NOTMUCH_LINKER = CC
ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1)
FINAL_NOTMUCH_LDFLAGS += $(CONFIGURE_LDFLAGS)
.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).
#
ifeq ($(REALLY_UPLOAD),yes)
git push origin $(VERSION)
cd releases && 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)"
+ ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-* ; ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(TAR_FILE)"
endif
@echo "Please send a release announcement using $(PACKAGE)-$(VERSION).announce as a template."
mkdir -p releases
mv $(TAR_FILE) $(DEB_TAR_FILE) releases
+.PHONY: debian-snapshot
+debian-snapshot: TMPFILE := $(shell mktemp)
+debian-snapshot:
+ make VERSION=$(VERSION) clean
+ cp debian/changelog $(TMPFILE)
+ EDITOR=/bin/true dch -b -v $(VERSION)+1 -D UNRELEASED 'test build, not for upload'
+ echo '3.0 (native)' > debian/source/format
+ debuild -us -uc
+ mv -f $(TMPFILE) debian/changelog
+ echo '3.0 (quilt)' > debian/source/format
+
.PHONY: release-message
release-message:
@echo "To: notmuch@notmuchmail.org"
verify-source-tree-and-version: verify-no-dirty-code
.PHONY: verify-no-dirty-code
-verify-no-dirty-code: verify-version-debian
+verify-no-dirty-code: verify-version-debian verify-version-python verify-version-manpage
ifeq ($(IS_GIT),yes)
@printf "Checking that source tree is clean..."
ifneq ($(shell git ls-files -m),)
.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" = $$(sed '1{ s/).*//; s/.*(//; q; }' debian/changelog) ] || \
+ (echo "No." && \
+ 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)..."
+ @[ "$(VERSION)" = $$(python -c "execfile('$(PV_FILE)'); print __VERSION__") ] || \
+ (echo "No." && \
+ echo "Please edit version and $(PV_FILE) to have consistent versions." && false)
+ @echo "Good."
+
+.PHONY: verify-version-manpage
+verify-version-manpage: verify-version-components
+ @echo -n "Checking that manual page version is $(VERSION)..."
+ @[ "$(VERSION)" = $$(sed -n '/^[.]TH NOTMUCH 1/{s/.*"Notmuch //;s/".*//p;}' notmuch.1) ] || \
(echo "No." && \
- echo "Please edit version and debian/changelog to have consistent versions." && false) \
- fi
+ echo "Please edit version and notmuch.1 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
distclean: clean
notmuch_client_srcs = \
+ command-line-arguments.c\
debugger.c \
gmime-filter-reply.c \
gmime-filter-headers.c \
+ hooks.c \
notmuch.c \
notmuch-config.c \
notmuch-count.c \
notmuch-time.c \
query-string.c \
show-message.c \
- json.c \
- xutil.c
+ json.c
notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
-notmuch: $(notmuch_client_modules) lib/libnotmuch.a
+notmuch: $(notmuch_client_modules) lib/libnotmuch.a util/libutil.a
$(call quiet,CXX $(CFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -o $@
notmuch-shared: $(notmuch_client_modules) lib/$(LINKER_NAME)
projects / notmuch / blobdiff