From: Tomi Ollila <tomi.ollila@iki.fi>
To: notmuch@notmuchmail.org
Cc: tomi.ollila@iki.fi
Subject: [PATCH v3 2/2] {., man}/Makefile.local: edit/remove release-checks.sh related targets
Date: Tue, 4 Sep 2012 17:49:13 +0300 [thread overview]
Message-ID: <1346770153-14947-3-git-send-email-tomi.ollila@iki.fi> (raw)
In-Reply-To: <1346770153-14947-1-git-send-email-tomi.ollila@iki.fi>
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.
---
Makefile.local | 28 ++++------------------------
man/Makefile.local | 9 +--------
2 files changed, 5 insertions(+), 32 deletions(-)
diff --git a/Makefile.local b/Makefile.local
index de984ab..7f2d4f1 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -187,7 +187,7 @@ release-message:
verify-source-tree-and-version: 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)
@printf "Checking that source tree is clean..."
ifneq ($(shell git ls-files -m),)
@@ -204,29 +204,9 @@ else
endif
endif
-.PHONY: verify-version-debian
-verify-version-debian: verify-version-components
- @echo -n "Checking that Debian package version is $(VERSION)-1..."
- @[ "$(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: release-checks
+release-checks:
+ devel/release-checks.sh
.PHONY: verify-newer
verify-newer:
diff --git a/man/Makefile.local b/man/Makefile.local
index d43a949..72e2a18 100644
--- a/man/Makefile.local
+++ b/man/Makefile.local
@@ -32,7 +32,7 @@ COMPRESSED_MAN := $(MAN1_GZ) $(MAN5_GZ) $(MAN7_GZ)
%.gz: %
gzip --stdout $^ > $@
-.PHONY: install-man update-man-versions verify-version-manpage
+.PHONY: install-man update-man-versions
install-man: $(COMPRESSED_MAN)
mkdir -p "$(DESTDIR)$(mandir)/man1"
@@ -43,13 +43,6 @@ install-man: $(COMPRESSED_MAN)
install -m0644 $(MAN7_GZ) $(DESTDIR)/$(mandir)/man7
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)
for file in $(MAN_SOURCE); do \
cp $$file $$file.bak ; \
--
1.7.1
next prev parent reply other threads:[~2012-09-04 14:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-04 14:49 Release checks v3 Tomi Ollila
2012-09-04 14:49 ` [PATCH v3 1/2] devel: add release-checks.sh Tomi Ollila
2012-09-04 14:49 ` Tomi Ollila [this message]
2012-09-04 15:41 ` Release checks v3 Michal Nazarewicz
2012-09-05 11:45 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1346770153-14947-3-git-send-email-tomi.ollila@iki.fi \
--to=tomi.ollila@iki.fi \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).