{., man}/Makefile.local: edit/remove release-checks.sh related targets

Use new target release-checks in place of verify-version-debian,
verify-version-python verify-version-manpage. This target executes
devel/release-checks.sh which does all the verifications the three
dropped targets did, and some more.
This commit is contained in:
Tomi Ollila 2012-09-04 17:49:13 +03:00 committed by David Bremner
parent a0ce84c3af
commit 69843dd628
2 changed files with 5 additions and 32 deletions

View file

@ -187,7 +187,7 @@ release-message:
verify-source-tree-and-version: verify-no-dirty-code verify-source-tree-and-version: verify-no-dirty-code
.PHONY: verify-no-dirty-code .PHONY: verify-no-dirty-code
verify-no-dirty-code: verify-version-debian verify-version-python verify-version-manpage verify-no-dirty-code: release-checks
ifeq ($(IS_GIT),yes) ifeq ($(IS_GIT),yes)
@printf "Checking that source tree is clean..." @printf "Checking that source tree is clean..."
ifneq ($(shell git ls-files -m),) ifneq ($(shell git ls-files -m),)
@ -204,29 +204,9 @@ else
endif endif
endif endif
.PHONY: verify-version-debian .PHONY: release-checks
verify-version-debian: verify-version-components release-checks:
@echo -n "Checking that Debian package version is $(VERSION)-1..." devel/release-checks.sh
@[ "$(VERSION)-1" = $$(sed '1{ s/).*//; s/.*(//; q; }' debian/changelog) ] || \
(echo "No." && \
echo "Please edit version and debian/changelog to have consistent versions." && false)
@echo "Good."
.PHONY: verify-version-python
verify-version-python: verify-version-components
@echo -n "Checking that python bindings version is $(VERSION)..."
@[ "$(VERSION)" = $$(python -c "execfile('$(PV_FILE)'); print __VERSION__") ] || \
(echo "No." && \
echo "Please edit version and $(PV_FILE) to have consistent versions." && false)
@echo "Good."
.PHONY: verify-version-components
verify-version-components:
@echo -n "Checking that $(VERSION) consists only of digits and periods..."
@echo $(VERSION) | grep -q -x '^[0-9.]*$$' || \
(echo "No." && \
echo "Please follow the instructions in RELEASING to choose a version" && false)
@echo "Good."
.PHONY: verify-newer .PHONY: verify-newer
verify-newer: verify-newer:

View file

@ -32,7 +32,7 @@ COMPRESSED_MAN := $(MAN1_GZ) $(MAN5_GZ) $(MAN7_GZ)
%.gz: % %.gz: %
gzip --stdout $^ > $@ gzip --stdout $^ > $@
.PHONY: install-man update-man-versions verify-version-manpage .PHONY: install-man update-man-versions
install-man: $(COMPRESSED_MAN) install-man: $(COMPRESSED_MAN)
mkdir -p "$(DESTDIR)$(mandir)/man1" mkdir -p "$(DESTDIR)$(mandir)/man1"
@ -43,13 +43,6 @@ install-man: $(COMPRESSED_MAN)
install -m0644 $(MAN7_GZ) $(DESTDIR)/$(mandir)/man7 install -m0644 $(MAN7_GZ) $(DESTDIR)/$(mandir)/man7
cd $(DESTDIR)/$(mandir)/man1 && ln -sf notmuch.1.gz notmuch-setup.1.gz cd $(DESTDIR)/$(mandir)/man1 && ln -sf notmuch.1.gz notmuch-setup.1.gz
verify-version-manpage: verify-version-components
@echo -n "Checking that manual page version is $(VERSION)..."
@[ "$(VERSION)" = $$(sed -n '/^[.]TH NOTMUCH 1/{s/.*"Notmuch //;s/".*//p;}' $(MAIN_PAGE)) ] || \
(echo "No." && \
echo "Please edit version and notmuch.1 to have consistent versions." && false)
@echo "Good."
update-man-versions: $(MAN_SOURCE) update-man-versions: $(MAN_SOURCE)
for file in $(MAN_SOURCE); do \ for file in $(MAN_SOURCE); do \
cp $$file $$file.bak ; \ cp $$file $$file.bak ; \