1 Return-Path: <too@guru-group.fi>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id C9B86431FB6
\r
6 for <notmuch@notmuchmail.org>; Sun, 2 Sep 2012 13:18:51 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"
\r
12 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id beJLrPTRprPZ for <notmuch@notmuchmail.org>;
\r
17 Sun, 2 Sep 2012 13:18:50 -0700 (PDT)
\r
18 Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
\r
19 by olra.theworths.org (Postfix) with ESMTP id 534C7431FAF
\r
20 for <notmuch@notmuchmail.org>; Sun, 2 Sep 2012 13:18:50 -0700 (PDT)
\r
21 Received: by guru.guru-group.fi (Postfix, from userid 501)
\r
22 id CF78810014E; Sun, 2 Sep 2012 23:18:56 +0300 (EEST)
\r
23 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
24 To: notmuch@notmuchmail.org
\r
25 Subject: [PATCH V2 2b/2] {.,
\r
26 man}/Makefile.local: edit/remove release-checks.sh related targets
\r
27 Date: Sun, 2 Sep 2012 23:18:46 +0300
\r
28 Message-Id: <1346491928-2356-2b-git-send-email-tomi.ollila@iki.fi>
\r
29 X-Mailer: git-send-email 1.7.1
\r
30 In-Reply-To: <1346491928-2356-1-git-send-email-tomi.ollila@iki.fi>
\r
31 References: <1346491928-2356-1-git-send-email-tomi.ollila@iki.fi>
\r
32 In-Reply-To: <1346491928-2356-1-git-send-email-tomi.ollila@iki.fi>
\r
33 References: <1346491928-2356-1-git-send-email-tomi.ollila@iki.fi>
\r
34 Cc: tomi.ollila@iki.fi
\r
35 X-BeenThere: notmuch@notmuchmail.org
\r
36 X-Mailman-Version: 2.1.13
\r
38 List-Id: "Use and development of the notmuch mail system."
\r
39 <notmuch.notmuchmail.org>
\r
40 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
41 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
42 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
43 List-Post: <mailto:notmuch@notmuchmail.org>
\r
44 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
45 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
46 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
47 X-List-Received-Date: Sun, 02 Sep 2012 20:18:51 -0000
\r
49 Use new target release-checks in place of verify-version-debian,
\r
50 verify-version-python verify-version-manpage. This target executes
\r
51 devel/release-checks.sh which does all the verifications the three
\r
52 dropped targets did, and some more.
\r
57 id:"1346491928-2356-2-git-send-email-tomi.ollila@iki.fi"
\r
59 is that 'exec' is removed from devel/release-checks.sh invocation.
\r
60 I thought it would have saved one fork but experimentation showed
\r
61 that is not the case.
\r
63 Makefile.local | 28 ++++------------------------
\r
64 man/Makefile.local | 9 +--------
\r
65 2 files changed, 5 insertions(+), 32 deletions(-)
\r
67 diff --git a/Makefile.local b/Makefile.local
\r
68 index de984ab..99f1e19 100644
\r
69 --- a/Makefile.local
\r
70 +++ b/Makefile.local
\r
71 @@ -187,7 +187,7 @@ release-message:
\r
72 verify-source-tree-and-version: verify-no-dirty-code
\r
74 .PHONY: verify-no-dirty-code
\r
75 -verify-no-dirty-code: verify-version-debian verify-version-python verify-version-manpage
\r
76 +verify-no-dirty-code: release-checks
\r
77 ifeq ($(IS_GIT),yes)
\r
78 @printf "Checking that source tree is clean..."
\r
79 ifneq ($(shell git ls-files -m),)
\r
80 @@ -204,29 +204,9 @@ else
\r
84 -.PHONY: verify-version-debian
\r
85 -verify-version-debian: verify-version-components
\r
86 - @echo -n "Checking that Debian package version is $(VERSION)-1..."
\r
87 - @[ "$(VERSION)-1" = $$(sed '1{ s/).*//; s/.*(//; q; }' debian/changelog) ] || \
\r
89 - echo "Please edit version and debian/changelog to have consistent versions." && false)
\r
92 -.PHONY: verify-version-python
\r
93 -verify-version-python: verify-version-components
\r
94 - @echo -n "Checking that python bindings version is $(VERSION)..."
\r
95 - @[ "$(VERSION)" = $$(python -c "execfile('$(PV_FILE)'); print __VERSION__") ] || \
\r
97 - echo "Please edit version and $(PV_FILE) to have consistent versions." && false)
\r
100 -.PHONY: verify-version-components
\r
101 -verify-version-components:
\r
102 - @echo -n "Checking that $(VERSION) consists only of digits and periods..."
\r
103 - @echo $(VERSION) | grep -q -x '^[0-9.]*$$' || \
\r
105 - echo "Please follow the instructions in RELEASING to choose a version" && false)
\r
107 +.PHONY: release-checks
\r
109 + devel/release-checks.sh
\r
111 .PHONY: verify-newer
\r
113 diff --git a/man/Makefile.local b/man/Makefile.local
\r
114 index d43a949..72e2a18 100644
\r
115 --- a/man/Makefile.local
\r
116 +++ b/man/Makefile.local
\r
117 @@ -32,7 +32,7 @@ COMPRESSED_MAN := $(MAN1_GZ) $(MAN5_GZ) $(MAN7_GZ)
\r
119 gzip --stdout $^ > $@
\r
121 -.PHONY: install-man update-man-versions verify-version-manpage
\r
122 +.PHONY: install-man update-man-versions
\r
124 install-man: $(COMPRESSED_MAN)
\r
125 mkdir -p "$(DESTDIR)$(mandir)/man1"
\r
126 @@ -43,13 +43,6 @@ install-man: $(COMPRESSED_MAN)
\r
127 install -m0644 $(MAN7_GZ) $(DESTDIR)/$(mandir)/man7
\r
128 cd $(DESTDIR)/$(mandir)/man1 && ln -sf notmuch.1.gz notmuch-setup.1.gz
\r
130 -verify-version-manpage: verify-version-components
\r
131 - @echo -n "Checking that manual page version is $(VERSION)..."
\r
132 - @[ "$(VERSION)" = $$(sed -n '/^[.]TH NOTMUCH 1/{s/.*"Notmuch //;s/".*//p;}' $(MAIN_PAGE)) ] || \
\r
134 - echo "Please edit version and notmuch.1 to have consistent versions." && false)
\r
137 update-man-versions: $(MAN_SOURCE)
\r
138 for file in $(MAN_SOURCE); do \
\r
139 cp $$file $$file.bak ; \
\r