From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id mCf6BPLHCV/XDwAA0tVLHw (envelope-from ) for ; Sat, 11 Jul 2020 14:08:50 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 0FzXAPLHCV+kXwAAB5/wlQ (envelope-from ) for ; Sat, 11 Jul 2020 14:08:50 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [IPv6:2607:5300:201:3100::1657]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BBA74940D35 for ; Sat, 11 Jul 2020 14:08:47 +0000 (UTC) Received: from [144.217.243.247] (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id ED3CD1FCAF; Sat, 11 Jul 2020 10:08:39 -0400 (EDT) X-Greylist: delayed 443 seconds by postgrey-1.36 at nmbug; Sat, 11 Jul 2020 10:08:37 EDT Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [IPv6:2a0b:5c81:1c1::37]) by mail.notmuchmail.org (Postfix) with ESMTPS id 5FADC1F70C for ; Sat, 11 Jul 2020 10:08:37 -0400 (EDT) Received: from guru.guru-group.fi (unknown [IPv6:2a02:2380:1:9:5054:ff:feb7:a4bc]) (using TLSv1.2 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: too) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id DCA0C1B00145; Sat, 11 Jul 2020 17:00:59 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1594476059; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=AY4JZz0xA6T8b0CoAAkE8F0vk9UUm+uvWLyen54OaZg=; b=ozts7mb/F1+uU01zZDOr8asgq/W1teizuYTqEVY3x/Ec2HaEG2HlzDqcV2fr0WF7b0joC4 ab/kEhNO87MQLg/VzeexVxWEmRSZPLcJAcbClqHaJLxX18Wq2DI4WpsUoomy6a38KjdTIx BFh9XVNjhbAquwhzcwsdqY5RbpHuN87/+JOijVFWygYS6SagfLl7cVlIRYamGX0VMSv+Qm S58JlIOUAaOig4PZjVxJb46Wpm+g6gAju+PuX1vK7e04ph0WarDS8kEthA9++6grAp5gfy yu0Ry0V0nLVKbBxbSbN/iSbJjh2mcirZVLZ9z4YVnYkwGhqK493eXdsue96lWA== From: Tomi Ollila To: David Bremner , notmuch@notmuchmail.org Cc: flub@devork.be, David Bremner Subject: Re: [PATCH 1/2] doc: replace use of environment variables with a generated config In-Reply-To: <20200711132027.1449094-1-david@tethera.net> References: <20200711132027.1449094-1-david@tethera.net> User-Agent: Notmuch/0.28.3+84~g41389bb (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) X-Face: HhBM'cA~ MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1594476059; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=AY4JZz0xA6T8b0CoAAkE8F0vk9UUm+uvWLyen54OaZg=; b=Vd1/A4WppmmB5wt2NG4D5rjA6fOphMQXf5TmciNnYlUbmxDv17IUz83LJQjHiyWXGEEBNy KAS8H90jupyon1L9MD2FjVDo6sqYHeOVAx066IUT4e13fwywYofAwIHXUw8XDPZnz9hNCf V4zI/Drd0h1DQU1NU471Ry8bxN7RXD0ZDJRWMqm3X0uihQrsiw0AcZ7AJnU5RsU8raSkY8 Kn/T8z3/KtxMjmBcm9cZvok0NVI6kTbz6AKV2znzeG4+u239o7XbF8OnUTlBAeH1caxhLF 07oogGOnexza+jNgChsKYUbHbv1zXaQjoU2nJKY0r+BucPyX+RSlL977EFuUxg== ARC-Seal: i=1; s=lahtoruutu; d=iki.fi; t=1594476059; a=rsa-sha256; cv=none; b=XOwYZSvIRYH+NKE/oGx51yIa9OpDsaH24RlMR2zMvuuYowf8H0phKWiOYRnxm7MFpDJCuk uTqld2ycpuomFDBRvcQUkxkx/5Vq107JCquI000gu4MWj9V4Li7ELVVDYPd1GUXIQ5g9KZ UyLuzNeoGfFHYL0IfB5aqCUfsR0NLFi4IISG7WtgdWVAYG2lzenAf/hpj2fvU948vFYM8U DTRJECkhbzzSQSsP6vVCJNKf/29kPd5eUQYvYKuWz5H9oKFt3k7AbORYzi5OJCfcp4MatA CfSHPdw/pKDueHwXujpHvmY82WzPHMoDk+4lfrlN5wzwE8Jo9mhfYy8rfQp3Kw== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=too smtp.mailfrom=tomi.ollila@iki.fi Message-ID-Hash: RT7SSHHGZDJIXUFELVZWMF3UU7ASGSWI X-Message-ID-Hash: RT7SSHHGZDJIXUFELVZWMF3UU7ASGSWI X-MailFrom: tomi.ollila@iki.fi 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; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (body hash did not verify) header.d=iki.fi header.s=lahtoruutu header.b=ozts7mb/; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Spam-Score: 3.53 X-TUID: j/1d+H+S7Nco On Sat, Jul 11 2020, David Bremner wrote: > I don't love the use of exec, but it is getting unwieldy to pass > configuration options on the sphinx-build command line, and I > anticipate further use of conditionals. Perhaps less "opinions" in commit message. (and as I think I don't comment 2/2, s/seperate/separate/ there) > --- > configure | 8 ++++++++ > doc/Makefile.local | 2 +- > doc/conf.py | 11 ++++++++--- > 3 files changed, 17 insertions(+), 4 deletions(-) > > diff --git a/configure b/configure > index 80cbac4f..177432db 100755 > --- a/configure > +++ b/configure > @@ -1548,6 +1548,14 @@ NOTMUCH_HAVE_PYTHON3_PYTEST=${have_python3_pytest} > PLATFORM=${platform} > EOF > > +cat > sphinx.config < +# Generate by configure, run from doc/conf.py > +EOF > +if [ $WITH_EMACS = "1" ]; then > + printf "tags.add('WITH_EMACS')\n" >> sphinx.config > +fi > +printf "rsti_dir = '%s'\n" $(realpath emacs) >> sphinx.config > + perhaps instead of multiple redirections to the file, { echo "# Generated by configure, run from doc/conf.py" echo if [ $WITH_EMACS = "1" ]; then printf "tags.add('WITH_EMACS')\n" fi printf "rsti_dir = '%s'\n" "$(realpath emacs)" } > sphinx.config alternative (someone might think less readable... ;/): exec 3>&1 1> sphinx.config echo "# Generated by configure, run from doc/conf.py" ... exec 1>&3 3>&- > # Finally, after everything configured, inform the user how to continue. > cat <