# 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].[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
# We invoke make recursively only to force ordering of our phony
# targets in the case of parallel invocation of make (-j).
.PHONY: release
-release: verify-version
+release: verify-no-dirty-code
$(MAKE) test
$(MAKE) $(GPG_FILE)
$(MAKE) verify-newer
@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: verify-version
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);\
+ @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."