Messages in this thread Patch in this message | | | Date | Mon, 15 Jul 2019 04:57:02 -0300 | From | Mauro Carvalho Chehab <> | Subject | Re: [PATCH 8/8] docs: remove extra conf.py files |
| |
Em Mon, 15 Jul 2019 08:16:54 +0200 Markus Heiser <markus.heiser@darmarit.de> escreveu:
> Hi Mauro, > > sorry, I havn't tested your patch, but one question ... > > Am 14.07.19 um 17:10 schrieb Mauro Carvalho Chehab: > > Now that the latex_documents are handled automatically, we can > > remove those extra conf.py files. > > We need these conf.py also for compiling books' into HTML. For this > the tags.add("subproject") is needed. Should we realy drop this feature? > > -- Markus --
You're right: adding "subproject" tags is needed for html. Folding this to patch 7/8 makes both htmldocs and pdfdocs to work with SPHINXDIRS without the need of a per-subdir conf.py.
Regards, Mauro
diff --git a/Documentation/sphinx/load_config.py b/Documentation/sphinx/load_config.py index 75f527ff4c95..e4a04f367b41 100644 --- a/Documentation/sphinx/load_config.py +++ b/Documentation/sphinx/load_config.py @@ -51,3 +51,7 @@ def loadConfig(namespace): execfile_(config_file, config) del config['__file__'] namespace.update(config) + else: + config = namespace.copy() + config['tags'].add("subproject") + namespace.update(config) Thanks, Mauro
| |