From: Floris Bruynooghe <flub@devork.be>
To: Tomi Ollila <tomi.ollila@iki.fi>,
David Bremner <david@tethera.net>,
notmuch@notmuchmail.org
Cc: David Bremner <david@tethera.net>
Subject: Re: [PATCH 1/2] doc: replace use of environment variables with a generated config
Date: Tue, 14 Jul 2020 23:43:50 +0200 [thread overview]
Message-ID: <87imepbwmh.fsf@powell.devork.be> (raw)
In-Reply-To: <m25zaukv6u.fsf@guru.guru-group.fi>
On Sat 11 Jul 2020 at 17:00 +0300, Tomi Ollila wrote:
> 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 <<EOF
>> +# 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>&-
I'd probably prefer this last one, but I don't mind any of the solutions or
even the current one.
next prev parent reply other threads:[~2020-07-14 21:43 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-11 13:20 [PATCH 1/2] doc: replace use of environment variables with a generated config David Bremner
2020-07-11 13:20 ` [PATCH 2/2] doc: add new python bindings to main documentatation tree David Bremner
2020-07-12 12:02 ` [PATCH] doc: set up for autoapi / readthedocs compatibility David Bremner
2020-07-14 21:42 ` Floris Bruynooghe
2020-07-15 11:53 ` David Bremner
2020-07-14 21:21 ` [PATCH 2/2] doc: add new python bindings to main documentatation tree Floris Bruynooghe
2020-07-11 14:00 ` [PATCH 1/2] doc: replace use of environment variables with a generated config Tomi Ollila
2020-07-14 21:43 ` Floris Bruynooghe [this message]
2020-07-15 12:28 ` David Bremner
2020-07-15 12:36 ` [PATCH] configure: replace multiple redirects with redirected block David Bremner
2020-07-18 15:00 ` David Bremner
2020-07-14 21:15 ` [PATCH 1/2] doc: replace use of environment variables with a generated config Floris Bruynooghe
2020-07-17 10:07 ` Tomi Ollila
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=87imepbwmh.fsf@powell.devork.be \
--to=flub@devork.be \
--cc=david@tethera.net \
--cc=notmuch@notmuchmail.org \
--cc=tomi.ollila@iki.fi \
/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).