mirror of
https://git.notmuchmail.org/git/notmuch
synced 2025-01-18 09:15:56 +01:00
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.
This commit is contained in:
parent
dd94313b30
commit
9eb53a6052
1 changed files with 11 additions and 14 deletions
|
@ -70,23 +70,20 @@ dist: $(TAR_FILE)
|
||||||
# targets in the case of parallel invocation of make (-j).
|
# targets in the case of parallel invocation of make (-j).
|
||||||
.PHONY: release
|
.PHONY: release
|
||||||
release:
|
release:
|
||||||
|
$(MAKE) verify-newer
|
||||||
$(MAKE) test
|
$(MAKE) test
|
||||||
$(MAKE) release-verify-newer
|
$(MAKE) $(GPG_FILE)
|
||||||
$(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)
|
|
||||||
mkdir -p releases
|
mkdir -p releases
|
||||||
scp $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
|
scp $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
|
||||||
mv $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) releases
|
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)"
|
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 tag -s -m "$(PACKAGE) $(VERSION) release" $(VERSION)
|
||||||
git push origin $(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
|
.PHONY: release-message
|
||||||
release-message:
|
release-message:
|
||||||
|
@ -120,8 +117,8 @@ release-message:
|
||||||
@echo "For more about notmuch, see http://notmuchmail.org"
|
@echo "For more about notmuch, see http://notmuchmail.org"
|
||||||
|
|
||||||
|
|
||||||
.PHONY: release-verify-version
|
.PHONY: verify-version
|
||||||
release-verify-version:
|
verify-version:
|
||||||
@echo -n "Checking that $(VERSION) is a two-component version..."
|
@echo -n "Checking that $(VERSION) is a two-component version..."
|
||||||
@if echo $(VERSION) | grep -q -v -x '[0-9]*\.[0-9]*'; then \
|
@if echo $(VERSION) | grep -q -v -x '[0-9]*\.[0-9]*'; then \
|
||||||
(echo "Ouch." && \
|
(echo "Ouch." && \
|
||||||
|
@ -129,8 +126,8 @@ release-verify-version:
|
||||||
else :; fi
|
else :; fi
|
||||||
@echo "Good."
|
@echo "Good."
|
||||||
|
|
||||||
.PHONY: release-verify-newer
|
.PHONY: verify-newer
|
||||||
release-verify-newer: release-verify-version
|
verify-newer: verify-version
|
||||||
@echo -n "Checking that no $(VERSION) release already exists..."
|
@echo -n "Checking that no $(VERSION) release already exists..."
|
||||||
@ssh $(RELEASE_HOST) test ! -e $(RELEASE_DIR)/$(TAR_FILE) \
|
@ssh $(RELEASE_HOST) test ! -e $(RELEASE_DIR)/$(TAR_FILE) \
|
||||||
|| (echo "Ouch." && echo "Found: $(RELEASE_HOST):$(RELEASE_DIR)/$(TAR_FILE)" \
|
|| (echo "Ouch." && echo "Found: $(RELEASE_HOST):$(RELEASE_DIR)/$(TAR_FILE)" \
|
||||||
|
|
Loading…
Reference in a new issue