Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id F201B431FAF for ; Sat, 1 Sep 2012 02:32:14 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vN-p3ZCpIkWD for ; Sat, 1 Sep 2012 02:32:13 -0700 (PDT) Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) by olra.theworths.org (Postfix) with ESMTP id 9D948431FBC for ; Sat, 1 Sep 2012 02:32:13 -0700 (PDT) Received: by guru.guru-group.fi (Postfix, from userid 501) id 99A0E100645; Sat, 1 Sep 2012 12:32:21 +0300 (EEST) From: Tomi Ollila To: notmuch@notmuchmail.org Subject: [PATCH V2 2/2] {., man}/Makefile.local: edit/remove release-checks.sh related targets Date: Sat, 1 Sep 2012 12:32:08 +0300 Message-Id: <1346491928-2356-2-git-send-email-tomi.ollila@iki.fi> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1346491928-2356-1-git-send-email-tomi.ollila@iki.fi> References: <1346491928-2356-1-git-send-email-tomi.ollila@iki.fi> Cc: Tomi Ollila X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Sep 2012 09:32:15 -0000 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..99f1e19 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: + exec 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.11.4