debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-01-03 07:11:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Makefile: Rework the version checks slightly.

Browse source 
Theese were previously pointing to "make VERSION=X.Y release", but
we've recently changed to an alternate scheme involving the updated
version in a file named "version".
This commit is contained in:
Carl Worth 2010-04-16 11:03:25 -07:00
parent 0786587f3c
commit 5999ff8d3c
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Makefile.local
View file

@ -81,9 +81,9 @@ dist: $(TAR_FILE)
# version file). # version file).
.PHONY: release .PHONY: release
release: verify-no-dirty-code release: verify-no-dirty-code
$(MAKE) VERSION=$(VERSION) verify-newer
$(MAKE) VERSION=$(VERSION) test $(MAKE) VERSION=$(VERSION) test
$(MAKE) VERSION=$(VERSION) $(GPG_FILE) $(MAKE) VERSION=$(VERSION) $(GPG_FILE)
$(MAKE) VERSION=$(VERSION) verify-newer
scp $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR) scp $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
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)"
mkdir -p releases mkdir -p releases
@ -145,11 +145,7 @@ verify-version:
@echo -n "Checking that $(VERSION) consists only of digits and periods..." @echo -n "Checking that $(VERSION) consists only of digits and periods..."
@if echo $(VERSION) | grep -q -v -x '[0-9.]*'; then \ @if echo $(VERSION) | grep -q -v -x '[0-9.]*'; then \
(echo "No." && \ (echo "No." && \
echo "Remember: You need to use:" && \ echo "Please follow the instructions in RELEASING to choose a version" && false) \
echo "" && \
echo " make VERSION=X.Y release" && \
echo "" && \
echo "to release notmuch." && false); \
else :; fi else :; fi
@echo "Good." @echo "Good."
@ -158,7 +154,8 @@ verify-newer:
@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)" \
&& echo "Refusing to replace an existing release." && false) && echo "Refusing to replace an existing release." \
&& echo "Don't forget to update \"version\" as described in RELEASING before release." && false)
@echo "Good." @echo "Good."
# The user has not set any verbosity, default to quiet mode and inform the # The user has not set any verbosity, default to quiet mode and inform the