Merge commit '0.1'

This is a merge of the few changes I made to release 0.1
retroactively, (after having incremented the version to 0.1.1).

Conflicts:
	Makefile.local (renamed NOTMUCH_VERSION to VERSION)

1 files changed, 46 insertions, 5 deletions

diff --git a/Makefile.local b/Makefile.local
index b35cbdd8..4a6e3aeb 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -10,7 +10,14 @@
 # repository), we add a third digit, (0.1.1, 0.1.2, etc.), and
 # increment it occasionally, (such as after a big batch of commits are
 # merged.
-NOTMUCH_VERSION=0.1.1
+PACKAGE=notmuch
+VERSION=0.1.1
+
+RELEASE_HOST=notmuchmail.org
+RELEASE_DIR=/srv/notmuchmail.org/www/releases
+TAR_FILE=$(PACKAGE)-$(VERSION).tar.gz
+SHA1_FILE=$(TAR_FILE).sha1
+GPG_FILE=$(SHA1_FILE).asc
 
 # Get settings from the output of configure by running it to generate
 # Makefile.config if it doesn't exist yet. And add Makefile.config to
@@ -32,7 +39,7 @@ extra_cflags :=
 extra_cxxflags :=
 
 # Smash together user's values with our extra values
-FINAL_CFLAGS = -DNOTMUCH_VERSION=$(NOTMUCH_VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)
+FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)
 FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)
 FINAL_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS)
 
@@ -53,10 +60,44 @@ ifeq ($(shell cat .first-build-message),)
 endif
 endif
 
+$(TAR_FILE):
+	git archive --format=tar --prefix=$(PACKAGE)-$(VERSION)/ HEAD | gzip > $(TAR_FILE)
+	@echo "Source is ready for release in $(TAR_FILE)"
+
+$(SHA1_FILE): $(TAR_FILE)
+	sha1sum $^ > $@
+
+$(GPG_FILE): $(SHA1_FILE)
+	@echo "Please enter your GPG password to sign the checksum."
+	gpg --armor --sign $^ 
+
 .PHONY: dist
-dist:
-	git archive --format=tar --prefix=notmuch-$(NOTMUCH_VERSION)/ HEAD | gzip > notmuch-$(NOTMUCH_VERSION).tar.gz
-	@echo "Source is ready for release in notmuch-$(NOTMUCH_VERSION).tar.gz"
+dist: $(TAR_FILE)
+
+.PHONY: release
+release: release-verify-newer $(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)
+
+.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);\
+	 else :; fi
+	@echo "Good."
+
+.PHONY: release-verify-newer
+release-verify-newer: release-verify-version
+	@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."
 
 # The user has not set any verbosity, default to quiet mode and inform the
 # user how to enable verbose compiles.