X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile.local;h=66ccd6d1e849b77c67940fc46399740b74808cff;hp=1c3719e73596e42bfd9e495972b5cb24f3a7b3b2;hb=c81cecf620d506653a1ead83858b8b3fc240abb5;hpb=ff13111cf36298cde09e4ff85ec83fdd42b52f0a diff --git a/Makefile.local b/Makefile.local index 1c3719e7..66ccd6d1 100644 --- a/Makefile.local +++ b/Makefile.local @@ -9,7 +9,17 @@ # 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) + +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 @@ -21,16 +31,21 @@ GPG_FILE=$(SHA1_FILE).asc # 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 +FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Llib -lnotmuch $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS) $(AS_NEEDED_LDFLAGS) +FINAL_NOTMUCH_LINKER = CC ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1) FINAL_NOTMUCH_LDFLAGS += $(CONFIGURE_LDFLAGS) +FINAL_NOTMUCH_LINKER = CXX +endif +ifeq ($(LIBDIR_IN_LDCONFIG),0) +FINAL_NOTMUCH_LDFLAGS += $(RPATH_LDFLAGS) endif -FINAL_LIBNOTMUCH_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS) +FINAL_LIBNOTMUCH_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS) $(AS_NEEDED_LDFLAGS) .PHONY: all all: notmuch notmuch-shared notmuch.1.gz ifeq ($(MAKECMDGOALS),) -ifeq ($(shell cat .first-build-message),) +ifeq ($(shell cat .first-build-message 2>/dev/null),) @NOTMUCH_FIRST_BUILD=1 $(MAKE) --no-print-directory all @echo "" @echo "Compilation of notmuch is now complete. You can install notmuch with:" @@ -44,15 +59,11 @@ ifeq ($(shell cat .first-build-message),) endif endif -.PHONY: test -test: all - @./test/notmuch-test - $(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,22 +79,30 @@ 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 +release: verify-source-tree-and-version + $(MAKE) VERSION=$(VERSION) verify-newer + $(MAKE) VERSION=$(VERSION) test + rm -rf ./debian-build + git-buildpackage + cp debian-build/notmuch_$(VERSION).tar.gz notmuch-$(VERSION).tar.gz + $(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 + (cd debian-build; dput *.changes) + mv debian-build/* releases + rmdir debian-build 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" + $(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: @@ -116,8 +135,15 @@ release-message: @echo "" @echo "For more about notmuch, see http://notmuchmail.org" +# This is a chain of dependencies rather than a simple list simply to +# avoid the messages getting interleaved in the case of a parallel +# make invocation. +.PHONY: verify-source-tree-and-version +verify-source-tree-and-version: verify-no-dirty-code + .PHONY: verify-no-dirty-code -verify-no-dirty-code: verify-version +verify-no-dirty-code: verify-version-debian +ifeq ($(IS_GIT),yes) @printf "Checking that source tree is clean..." ifneq ($(shell git ls-files -m),) @echo "No" @@ -131,17 +157,23 @@ ifneq ($(shell git ls-files -m),) else @echo "Good" endif +endif -.PHONY: verify-version -verify-version: +.PHONY: verify-version-debian +verify-version-debian: verify-version-components + @echo -n "Checking that Debian package version is $(VERSION)..." + @if [ "$(VERSION)" != $$(dpkg-parsechangelog | grep ^Version | awk '{print $$2}') ] ; then \ + (echo "No." && \ + echo "Please edit version and debian/changelog to have consistent versions." && false) \ + fi + @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 "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." @@ -150,7 +182,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 @@ -216,7 +249,8 @@ notmuch_client_srcs = \ notmuch-time.c \ query-string.c \ show-message.c \ - json.c + json.c \ + xutil.c notmuch_client_modules = $(notmuch_client_srcs:.c=.o) @@ -224,7 +258,7 @@ notmuch: $(notmuch_client_modules) lib/libnotmuch.a $(call quiet,CXX $(CFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -o $@ notmuch-shared: $(notmuch_client_modules) lib/$(LINKER_NAME) - $(call quiet,CXX $(CFLAGS)) $(notmuch_client_modules) $(FINAL_NOTMUCH_LDFLAGS) -o $@ + $(call quiet,$(FINAL_NOTMUCH_LINKER) $(CFLAGS)) $(notmuch_client_modules) $(FINAL_NOTMUCH_LDFLAGS) -o $@ notmuch.1.gz: notmuch.1 gzip --stdout $^ > $@ @@ -239,11 +273,20 @@ ifeq ($(MAKECMDGOALS), install) @echo "" @echo "Notmuch is now installed to $(DESTDIR)$(prefix)" @echo "" - @echo "To run notmuch from emacs, each user should add the following line to ~/.emacs:" + @echo "New users should simply run \"notmuch\" to be guided" + @echo "through the process of configuring notmuch and creating" + @echo "a database of existing email messages. The \"notmuch\"" + @echo "command will also offer some sample search commands." + @echo "" + @echo "Beyond the command-line interface, notmuch also offers" + @echo "a full-featured interface for reading and writing mail" + @echo "within emacs. To use this, each user should add the" + @echo "following line to the ~/.emacs file:" @echo "" @echo " (require 'notmuch)" @echo "" - @echo "And should then run \"M-x notmuch\" from within emacs or run \"emacs -f notmuch\"" + @echo "And then run emacs as \"emacs -f notmuch\" or invoke" + @echo "the command \"M-x notmuch\" from within emacs." endif .PHONY: install-desktop