summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-07-14 10:18:13 -0400
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-07-17 05:57:52 -0400
commita84d9e899683cd79cb134c6d962e57d0de9446cc (patch)
tree55871c83a14b79991a5d0615a7fb8d630d486f25
parent27eed923f715f6269b98e089ad2164f9b016eace (diff)
docs: load_config.py: avoid needing a conf.py just due to LaTeX docs
Right now, for every directory that we need to have LaTeX output, a conf.py file is required. That causes an extra overhead and it is actually a hack, as the latex_documents line there are usually a copy of the ones that are there already at the main conf.py. So, instead, re-use the global latex_documents var, just adjusting the path to be relative ones. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-rw-r--r--Documentation/sphinx/load_config.py27
1 files changed, 26 insertions, 1 deletions
diff --git a/Documentation/sphinx/load_config.py b/Documentation/sphinx/load_config.py
index 301a21aa4f63..101e6f0b0fcf 100644
--- a/Documentation/sphinx/load_config.py
+++ b/Documentation/sphinx/load_config.py
@@ -21,6 +21,29 @@ def loadConfig(namespace):
21 and os.path.normpath(namespace["__file__"]) != os.path.normpath(config_file) ): 21 and os.path.normpath(namespace["__file__"]) != os.path.normpath(config_file) ):
22 config_file = os.path.abspath(config_file) 22 config_file = os.path.abspath(config_file)
23 23
24 # Let's avoid one conf.py file just due to latex_documents
25 start = config_file.find('Documentation/')
26 if start >= 0:
27 start = config_file.find('/', start + 1)
28
29 end = config_file.rfind('/')
30 if start >= 0 and end > 0:
31 dir = config_file[start + 1:end]
32
33 print("source directory: %s" % dir)
34 new_latex_docs = []
35 latex_documents = namespace['latex_documents']
36
37 for l in latex_documents:
38 if l[0].find(dir) == 0:
39 has = True
40 fn = l[0][len(dir) + 1:]
41 new_latex_docs.append((fn, l[1], l[2], l[3], l[4]))
42 break
43
44 namespace['latex_documents'] = new_latex_docs
45
46 # If there is an extra conf.py file, load it
24 if os.path.isfile(config_file): 47 if os.path.isfile(config_file):
25 sys.stdout.write("load additional sphinx-config: %s\n" % config_file) 48 sys.stdout.write("load additional sphinx-config: %s\n" % config_file)
26 config = namespace.copy() 49 config = namespace.copy()
@@ -29,4 +52,6 @@ def loadConfig(namespace):
29 del config['__file__'] 52 del config['__file__']
30 namespace.update(config) 53 namespace.update(config)
31 else: 54 else:
32 sys.stderr.write("WARNING: additional sphinx-config not found: %s\n" % config_file) 55 config = namespace.copy()
56 config['tags'].add("subproject")
57 namespace.update(config)