# 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)
+VERSION:=$(shell if [ -f version ]; then cat version; else git describe --match '[0-9.]*'; fi)
RELEASE_HOST=notmuchmail.org
RELEASE_DIR=/srv/notmuchmail.org/www/releases
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
+ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1)
+FINAL_NOTMUCH_LDFLAGS += $(CONFIGURE_LDFLAGS)
+endif
FINAL_LIBNOTMUCH_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS)
.PHONY: all
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
# We invoke make recursively only to force ordering of our phony
# targets in the case of parallel invocation of make (-j).
.PHONY: release
-release: release-verify-newer
- $(MAKE) release-upload
+release: verify-no-dirty-code
+ $(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)"
+ mkdir -p releases
+ mv $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) releases
+ 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"
-.PHONY: release-upload
-release-upload: $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE)
- mkdir -p releases
- 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)"
- git tag -s -m "$(PACKAGE) $(VERSION) release" $(VERSION)
- git push origin $(VERSION)
-
.PHONY: release-message
release-message:
@echo "To: notmuch@notmuchmail.org"
@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 "==============="
@echo ""
@echo "For more about notmuch, see http://notmuchmail.org"
+.PHONY: verify-no-dirty-code
+verify-no-dirty-code: verify-version
+ @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
-.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 "Remember: You need to use:" && \
+ echo "" && \
+ echo " make VERSION=X.Y release" && \
+ echo "" && \
+ echo "to release notmuch." && 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)" \