[PATCH] configure: replace multiple redirects with redirected block

[David Bremner]

This belatedly implements Tomi's suggestion from

 id:m25zaukv6u@guru.guru-group.fi
---
 configure | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/configure b/configure
index b4ee7f37..d3b843b9 100755
--- a/configure
+++ b/configure
@@ -1549,16 +1549,16 @@ NOTMUCH_HAVE_PYTHON3_PYTEST=${have_python3_pytest}
 PLATFORM=${platform}
 EOF
 
-cat > sphinx.config <> sphinx.config
-fi
-if [ $WITH_PYTHON_DOCS = "1" ]; then
-printf "tags.add('WITH_PYTHON')\n" >> sphinx.config
-fi
-printf "rsti_dir = '%s'\n" $(realpath emacs) >> sphinx.config
+{
+echo "# Generated by configure, run from doc/conf.py"
+if [ $WITH_EMACS = "1" ]; then
+echo "tags.add('WITH_EMACS')"
+fi
+if [ $WITH_PYTHON_DOCS = "1" ]; then
+echo "tags.add('WITH_PYTHON')"
+fi
+printf "rsti_dir = '%s'\n" $(realpath emacs)
+} > sphinx.config
 
 # Finally, after everything configured, inform the user how to continue.
 cat <

Re: [PATCH 1/2] doc: replace use of environment variables with a generated config

[David Bremner]

Tomi Ollila  writes:
>
> 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
> 

Sorry, I dropped the ball there. I did actually make this change at some
point but I rebased it away. I can do a cleanup patch.

d
___
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-le...@notmuchmail.org

Re: [PATCH] doc: set up for autoapi / readthedocs compatibility

[David Bremner]

Floris Bruynooghe  writes:

>
> I didn't actually try out how much better autodoc does, I should
> probably try that too before commenting further.

Thanks to both of you for feedback. I've applied the first two to
master.

It seems tricky to have autodoc on readthedocs without having notmuch2
in pip.  That seems like a lot of work just to have readthedocs work
(although obviously some people would be happy with it for other
reasons).

If we can't make autoapi work well enough, perhaps we can supplement /
replace the rtd version with a pointer to a self hosted version.

We should do the self hosted version of the HTML output from sphinx in
either case. I'm not sure it will fit nicely into the ikiwiki based
wiki, but it should be possible to deploy it on notmuchmail.org outside
the wiki.

d
___
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-le...@notmuchmail.org