X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile.local;h=e3d4d031deca420ced715335679b54473e7af1a4;hp=98d69c4d8dfa44772499c14793bb069201c2343b;hb=839b7f20f620b365c5a918691e8f84095884d2d9;hpb=2475afcf0d40d03c1a308a934c9066ad7beb94b3

diff --git a/Makefile.local b/Makefile.local
index 98d69c4d..e3d4d031 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -9,28 +9,49 @@
 # 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 ${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
+endif
+endif
+endif
+
+UPSTREAM_TAG=$(subst ~,_,$(VERSION))
+DEB_TAG=debian/$(UPSTREAM_TAG)-1
 
 RELEASE_HOST=notmuchmail.org
 RELEASE_DIR=/srv/notmuchmail.org/www/releases
 RELEASE_URL=http://notmuchmail.org/releases
 TAR_FILE=$(PACKAGE)-$(VERSION).tar.gz
+DEB_TAR_FILE=$(PACKAGE)_$(VERSION).orig.tar.gz
 SHA1_FILE=$(TAR_FILE).sha1
 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 $(AS_NEEDED_LDFLAGS) $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS)
+FINAL_NOTMUCH_LINKER = CC
 ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1)
 FINAL_NOTMUCH_LDFLAGS += $(CONFIGURE_LDFLAGS)
+FINAL_NOTMUCH_LINKER = CXX
 endif
-FINAL_LIBNOTMUCH_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS)
+ifeq ($(LIBDIR_IN_LDCONFIG),0)
+FINAL_NOTMUCH_LDFLAGS += $(RPATH_LDFLAGS)
+endif
+FINAL_LIBNOTMUCH_LDFLAGS = $(LDFLAGS) $(AS_NEEDED_LDFLAGS) $(CONFIGURE_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 +65,17 @@ 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
+	if git tag -v $(VERSION) >/dev/null 2>&1; then \
+           ref=$(VERSION); \
+        else \
+           ref="HEAD" ; \
+	   echo "Warning: No signed tag for $(VERSION)"; \
+	fi ; \
+	git archive --format=tar --prefix=$(PACKAGE)-$(VERSION)/ $$ref > $(TAR_FILE).tmp
+	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 +91,42 @@ 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 otherwise know that they
+# are part of the release and need to take the version from the
+# version file).
 .PHONY: release
-release: verify-version
-	$(MAKE) test
-	$(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)"
+release: verify-source-tree-and-version
+	$(MAKE) VERSION=$(VERSION) verify-newer
+	$(MAKE) VERSION=$(VERSION) clean
+	$(MAKE) VERSION=$(VERSION) test
+	git tag -s -m "$(PACKAGE) $(VERSION) release" $(UPSTREAM_TAG)
+	$(MAKE) VERSION=$(VERSION) $(GPG_FILE)
+	ln -sf $(TAR_FILE) $(DEB_TAR_FILE)
+	pristine-tar commit $(DEB_TAR_FILE) $(UPSTREAM_TAG)
+	git tag -s -m "$(PACKAGE) Debian $(VERSION)-1 upload (same as $(VERSION))" $(DEB_TAG)
 	mkdir -p releases
 	mv $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) releases
-	git tag -s -m "$(PACKAGE) $(VERSION) release" $(VERSION)
+	$(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce
+ifeq ($(REALLY_UPLOAD),yes)
 	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"
+	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)"
+endif
+	@echo "Please send a release announcement using $(PACKAGE)-$(VERSION).announce as a template."
+
+.PHONY: pre-release
+pre-release:
+	$(MAKE) VERSION=$(VERSION) clean
+	$(MAKE) VERSION=$(VERSION) test
+	git tag -s -m "$(PACKAGE) $(VERSION) release" $(UPSTREAM_TAG)
+	git tag -s -m "$(PACKAGE) Debian $(VERSION)-1 upload (same as $(VERSION))" $(DEB_TAG)
+	$(MAKE) VERSION=$(VERSION) $(TAR_FILE)
+	ln -sf $(TAR_FILE) $(DEB_TAR_FILE)
+	pristine-tar commit $(DEB_TAR_FILE) $(UPSTREAM_TAG)
+	mkdir -p releases
+	mv $(TAR_FILE) $(DEB_TAR_FILE) releases
 
 .PHONY: release-message
 release-message:
@@ -105,7 +148,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 "==============="
@@ -116,27 +159,61 @@ 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-debian
+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: 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 \
+		(echo "No." && \
+		 echo "Please edit version and debian/changelog to have consistent versions." && false) \
+	 fi
+	@echo "Good."
 
-.PHONY: verify-version
-verify-version:
+.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."
 
 .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 "Good."
+	@wget -q -O /dev/null $(RELEASE_URL)/$(TAR_FILE) ; \
+	case $$? in \
+          8) echo "Good." ;; \
+          0) echo "Ouch."; \
+	     echo "Found: $(RELEASE_URL)/$(TAR_FILE)"; \
+	     echo "Refusing to replace an existing release."; \
+	     echo "Don't forget to update \"version\" as described in RELEASING before release." ; \
+	     false ;; \
+	  *) echo "An unexpected error occured"; \
+	     false;; esac
 
 # The user has not set any verbosity, default to quiet mode and inform the
 # user how to enable verbose compiles.
@@ -194,14 +271,14 @@ notmuch_client_srcs =		\
 	notmuch-reply.c		\
 	notmuch-restore.c	\
 	notmuch-search.c	\
-	notmuch-search-tags.c   \
 	notmuch-setup.c		\
 	notmuch-show.c		\
 	notmuch-tag.c		\
 	notmuch-time.c		\
 	query-string.c		\
 	show-message.c		\
-	json.c
+	json.c			\
+	xutil.c
 
 notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
 
@@ -209,32 +286,43 @@ 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 $^ > $@
 
 .PHONY: install
 install: all notmuch.1.gz
-	mkdir -p $(DESTDIR)$(mandir)/man1
-	install -m0644 notmuch.1.gz $(DESTDIR)$(mandir)/man1/
-	mkdir -p $(DESTDIR)$(prefix)/bin/
-	install notmuch-shared $(DESTDIR)$(prefix)/bin/notmuch
+	mkdir -p "$(DESTDIR)$(mandir)/man1"
+	install -m0644 notmuch.1.gz "$(DESTDIR)$(mandir)/man1/"
+	mkdir -p "$(DESTDIR)$(prefix)/bin/"
+	install notmuch-shared "$(DESTDIR)$(prefix)/bin/notmuch"
 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."
+ifeq ($(WITH_EMACS), 1)
+	@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
 endif
 
 .PHONY: install-desktop
 install-desktop:
-	mkdir -p $(DESTDIR)$(desktop_dir)
-	desktop-file-install --mode 0644 --dir $(DESTDIR)$(desktop_dir) notmuch.desktop
+	mkdir -p "$(DESTDIR)$(desktop_dir)"
+	desktop-file-install --mode 0644 --dir "$(DESTDIR)$(desktop_dir)" notmuch.desktop
 
 SRCS  := $(SRCS) $(notmuch_client_srcs)
 CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules) notmuch.elc notmuch.1.gz