diff options
| author |  Carl Worth <cworth@cworth.org> | 2010-04-15 16:23:57 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2010-04-15 16:23:57 -0700 |
| commit | 9eb53a6052751d82f048a8de5ad4fcf3b5b1ce8f (patch) | |
| tree | 7b734059b9a93c9b5d86b32841276ba97e2fe4c3 /Makefile.local | |
| parent | dd94313b302115cca67bb593572b753350984864 (diff) | |
Makefile: Simplify the release targets.
Previously, we had a separate release-upload target that a user might
mistake as something useful to call directly, (which would have the
undesired effect or uploading a new package, but without first making
all the checks that we want).
So we eliminate that target, (folding its actions into "make
release"), and we also rename the several release-verify-foo targets
to simply verify-foo. This leaves as the only targets with "release"
in the name as "release" and "release-message". Both of these are
intended for the user to call directly.
Diffstat (limited to 'Makefile.local')
| -rw-r--r-- | Makefile.local | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/Makefile.local b/Makefile.local index e8281816..e7c6300f 100644 --- a/Makefile.local +++ b/Makefile.local @@ -70,23 +70,20 @@ dist: $(TAR_FILE) # targets in the case of parallel invocation of make (-j). .PHONY: release release: + $(MAKE) verify-newer $(MAKE) test - $(MAKE) release-verify-newer - $(MAKE) release-upload - @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) + $(MAKE) $(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) + @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-message release-message: @@ -120,8 +117,8 @@ release-message: @echo "For more about notmuch, see http://notmuchmail.org" -.PHONY: release-verify-version -release-verify-version: +.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." && \ @@ -129,8 +126,8 @@ release-verify-version: else :; fi @echo "Good." -.PHONY: release-verify-newer -release-verify-newer: release-verify-version +.PHONY: verify-newer +verify-newer: 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)" \ |