X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile.local;h=8207228476c2ab4cf0f7b7df0dd8919fef7da757;hp=e7c6300f823c76ebfd94edd9d23d4c033d2ec8ff;hb=2bf06e177db923b31f12faefb328b3bfe0651d6d;hpb=9eb53a6052751d82f048a8de5ad4fcf3b5b1ce8f diff --git a/Makefile.local b/Makefile.local index e7c6300f..82072284 100644 --- a/Makefile.local +++ b/Makefile.local @@ -69,14 +69,14 @@ dist: $(TAR_FILE) # We invoke make recursively only to force ordering of our phony # targets in the case of parallel invocation of make (-j). .PHONY: release -release: - $(MAKE) verify-newer +release: verify-version $(MAKE) test $(MAKE) $(GPG_FILE) - mkdir -p releases + $(MAKE) verify-newer 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)" + 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:" @@ -127,7 +127,7 @@ verify-version: @echo "Good." .PHONY: verify-newer -verify-newer: verify-version +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)" \