[PATCH] common: use bibtex_bibfiles for newer bibtex

Gedare Bloom gedare at rtems.org
Wed Feb 3 17:25:07 UTC 2021


Closes #4229.
---
 common/conf.py | 2 ++
 common/waf.py  | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/common/conf.py b/common/conf.py
index 8fb06db..a652e2a 100644
--- a/common/conf.py
+++ b/common/conf.py
@@ -12,6 +12,8 @@ extensions = [
 	"rtemsdomain",
 ]
 
+bibtex_bibfiles = ['../common/refs.bib']
+
 extlinks = {'release_path': ('https://ftp.rtems.org/pub/rtems/releases', None) }
 
 # Add any paths that contain templates here, relative to this directory.
diff --git a/common/waf.py b/common/waf.py
index 7027eb6..2610235 100644
--- a/common/waf.py
+++ b/common/waf.py
@@ -182,12 +182,15 @@ def check_sphinx_extension(ctx, extension):
         rst_node = bld.srcnode.make_node('testbuild/contents.rst')
         rst_node.parent.mkdir()
         rst_node.write('.. COMMENT test sphinx\n')
+        bib_node = bld.srcnode.make_node('testbuild/refs.bib')
+        conf_node = bld.srcnode.make_node('testbuild/conf.py')
+        conf_node.write("bibtex_bibfiles = ['refs.bib']\n")
         bld(rule = bld.kw['rule'], source = rst_node)
 
     ctx.start_msg("Checking for '%s'" % (extension))
     try:
         ctx.run_build(fragment = 'xx',
-                      rule = "${BIN_SPHINX_BUILD} -b html -D extensions=%s -C . out" % (extension),
+                      rule = "${BIN_SPHINX_BUILD} -b html -D extensions=%s -c . . out" % (extension),
                       build_fun = run_sphinx,
                       env = ctx.env)
     except ctx.errors.ConfigurationError:
-- 
2.25.1



More information about the devel mailing list