From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id kFaANLIBZGKgaQEAbAwnHQ (envelope-from ) for ; Sat, 23 Apr 2022 15:40:02 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id CMx+NLIBZGIlvQAAauVa8A (envelope-from ) for ; Sat, 23 Apr 2022 15:40:02 +0200 Received: from mail.notmuchmail.org (yantan.tethera.net [IPv6:2a01:4f9:c011:7a79::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 94D2B2A69F for ; Sat, 23 Apr 2022 15:40:02 +0200 (CEST) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 4E1F45F78F; Sat, 23 Apr 2022 13:39:17 +0000 (UTC) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id 7EEDB5F77F for ; Sat, 23 Apr 2022 13:39:14 +0000 (UTC) Received: by fethera.tethera.net (Postfix, from userid 1001) id EED755FC2C; Sat, 23 Apr 2022 09:39:12 -0400 (EDT) Received: (nullmailer pid 3856539 invoked by uid 1000); Sat, 23 Apr 2022 13:38:57 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH 01/16] nmbug: promote to user tool "notmuch-git" Date: Sat, 23 Apr 2022 10:38:33 -0300 Message-Id: <20220423133848.3852688-2-david@tethera.net> X-Mailer: git-send-email 2.35.2 In-Reply-To: <20220423133848.3852688-1-david@tethera.net> References: <20220423133848.3852688-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: Y6WBE7JQOQJRBUB3SEHRR7FIOUMSOX7R X-Message-ID-Hash: Y6WBE7JQOQJRBUB3SEHRR7FIOUMSOX7R X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.3 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: DE ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1650721202; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-owner:list-unsubscribe:list-subscribe:list-post; bh=HaKhFnbinbPQFzBBU44c7MhDFYOm0ZP7vf6E+Dy4aAY=; b=rhni78hLKfhoZRZ+u5eHCeoYMVRD9uZDy8lvjgi3QEvQvj8PVXdWGJObwU0EmSHq/IgRbq ctg68auMlP+baNb7HSSVx0vY4oqZxed0wvRsZXLkNP6Zy7iwA+KJ85LWlePRSV2QMt9vZv pq8wD9DOLjZ37j6nLMmUHhs0axyDl4+Mm+q7X3r5CXV5ZNHFfnyhwZ1xcaS3+WCEcUqxxO GAyikQ/xa9JK6f3jQXrhOLxoAAG3tkF8MKCs+Z2fBIj1ebVZAGjxi7+pGdQb8cV26IN9jL bC3SFI5d1DtRpF3pVtpYNOVjOWZTOY0YP0GNZunhCyjkguWbwcjI6PDpbnkHzQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1650721202; a=rsa-sha256; cv=none; b=Pfzr43PNIzmKrEjRiT6hb/f0TK+0BaQcYJJ2RgRUuOSYOvjVDr3COH+u5TU6lehI5B+IEl hW2584Z5dDTmCFR8Tg9Q4Swu/RVSazc7zV1FCXQeTvhRCob3Lcy+XCuSygL29s1x4qHt9F Mi/L4YsdLzYdlD7eipEZDtXZhiJAO8a1gikrLVcfhExGTOTw5sYhisNUNnAVK3X0qtEMSP sZWi5uT0I1ajZqQ++i7od5g1reI9lNGVHKqLe754ej6aNDSN2kA9jVFaWn6uRZ/e5Ux9uQ jMP5vI++uZtoFrx6e/vX6IajQXG08zhQ3xCEIFiVilNt7EsuSDByhbo4mvtaBQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2a01:4f9:c011:7a79::1 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -1.01 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2a01:4f9:c011:7a79::1 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 94D2B2A69F X-Spam-Score: -1.01 X-Migadu-Scanner: scn1.migadu.com X-TUID: LGMfUN+bO9jp So far this is just a rename. Documentation and tests to follow. --- Makefile.local | 7 +++++-- devel/nmbug/nmbug => notmuch-git.in | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) rename devel/nmbug/nmbug => notmuch-git.in (99%) diff --git a/Makefile.local b/Makefile.local index d8bbf3e1..ca2310f4 100644 --- a/Makefile.local +++ b/Makefile.local @@ -1,7 +1,7 @@ # -*- makefile-gmake -*- .PHONY: all -all: notmuch notmuch-shared build-man build-info ruby-bindings python-cffi-bindings +all: notmuch notmuch-shared build-man build-info ruby-bindings python-cffi-bindings notmuch-git ifeq ($(MAKECMDGOALS),) ifeq ($(shell cat .first-build-message 2>/dev/null),) @NOTMUCH_FIRST_BUILD=1 $(MAKE) --no-print-directory all @@ -294,7 +294,7 @@ endif SRCS := $(SRCS) $(notmuch_client_srcs) CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules) CLEAN := $(CLEAN) version.stamp notmuch-*.tar.gz.tmp -CLEAN := $(CLEAN) .deps +CLEAN := $(CLEAN) .deps notmuch-git DISTCLEAN := $(DISTCLEAN) .first-build-message Makefile.config sh.config sphinx.config @@ -307,6 +307,9 @@ cppcheck: @echo "No cppcheck found during configure; skipping static checking" endif +notmuch-git: notmuch-git.in + sed s/@NOTMUCH_VERSION@/${VERSION}/ < notmuch-git.in > notmuch-git + chmod ugo+rx notmuch-git DEPS := $(SRCS:%.c=.deps/%.d) DEPS := $(DEPS:%.cc=.deps/%.d) diff --git a/devel/nmbug/nmbug b/notmuch-git.in similarity index 99% rename from devel/nmbug/nmbug rename to notmuch-git.in index 043c1863..dd30b5be 100755 --- a/devel/nmbug/nmbug +++ b/notmuch-git.in @@ -51,7 +51,7 @@ except ImportError: # Python 2 from urllib import unquote as _unquote -__version__ = '0.3' +__version__ = '@NOTMUCH_VERSION@' _LOG = _logging.getLogger('nmbug') _LOG.setLevel(_logging.WARNING) -- 2.35.2