rtems/rtems-docs
1
0
Fork 0
mirror of https://git.rtems.org/rtems-docs/ synced 2025-07-22 22:55:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

waf: Use separate doctrees so avoid sphinx clashes.

Browse Source
This commit is contained in:
Chris Johns 2016-11-03 15:22:49 +11:00
parent d3226d3d09
commit 6207c37d9c
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/waf.py
View File

@ -83,7 +83,8 @@ def build_dir_setup(ctx, buildtype):
build_dir = ctx.path.get_bld().relpath() build_dir = ctx.path.get_bld().relpath()
output_node = ctx.path.get_bld().make_node(buildtype) output_node = ctx.path.get_bld().make_node(buildtype)
output_dir = output_node.abspath() output_dir = output_node.abspath()
return build_dir, output_node, output_dir doctrees = os.path.join(os.path.dirname(output_dir), 'doctrees', buildtype)
return build_dir, output_node, output_dir, doctrees
def html_resources(ctx, buildtype): def html_resources(ctx, buildtype):
for dir_name in ["_static", "_templates"]: for dir_name in ["_static", "_templates"]:
@ -146,10 +147,10 @@ def cmd_configure(ctx):
def doc_pdf(ctx, source_dir, conf_dir): def doc_pdf(ctx, source_dir, conf_dir):
buildtype = 'latex' buildtype = 'latex'
build_dir, output_node, output_dir = build_dir_setup(ctx, buildtype) build_dir, output_node, output_dir, doctrees = build_dir_setup(ctx, buildtype)
rule = "${BIN_SPHINX_BUILD} %s -b %s -c %s -d build/%s/doctrees %s %s" % \ rule = "${BIN_SPHINX_BUILD} %s -b %s -c %s -d %s %s %s" % \
(sphinx_verbose(ctx), buildtype, conf_dir, (sphinx_verbose(ctx), buildtype, conf_dir,
build_dir, source_dir, output_dir) doctrees, source_dir, output_dir)
ctx( ctx(
rule = rule, rule = rule,
cwd = ctx.path, cwd = ctx.path,
@ -198,11 +199,11 @@ def doc_singlehtml(ctx, source_dir, conf_dir):
return r return r
buildtype = 'singlehtml' buildtype = 'singlehtml'
build_dir, output_node, output_dir = build_dir_setup(ctx, buildtype) build_dir, output_node, output_dir, doctrees = build_dir_setup(ctx, buildtype)
html_resources(ctx, buildtype) html_resources(ctx, buildtype)
rule = "${BIN_SPHINX_BUILD} %s -b %s -c %s -d build/%s/doctrees %s %s" % \ rule = "${BIN_SPHINX_BUILD} %s -b %s -c %s -d %s %s %s" % \
(sphinx_verbose(ctx), buildtype, conf_dir, (sphinx_verbose(ctx), buildtype, conf_dir,
build_dir, source_dir, output_dir) doctrees, source_dir, output_dir)
ctx( ctx(
rule = rule, rule = rule,
cwd = ctx.path, cwd = ctx.path,
@ -220,11 +221,11 @@ def doc_singlehtml(ctx, source_dir, conf_dir):
def doc_html(ctx, conf_dir, source_dir): def doc_html(ctx, conf_dir, source_dir):
buildtype = 'html' buildtype = 'html'
build_dir, output_node, output_dir = build_dir_setup(ctx, buildtype) build_dir, output_node, output_dir, doctrees = build_dir_setup(ctx, buildtype)
html_resources(ctx, buildtype) html_resources(ctx, buildtype)
rule = "${BIN_SPHINX_BUILD} %s -b %s -c %s -d build/%s/doctrees %s %s" % \ rule = "${BIN_SPHINX_BUILD} %s -b %s -c %s -d %s %s %s" % \
(sphinx_verbose(ctx), buildtype, conf_dir, (sphinx_verbose(ctx), buildtype, conf_dir,
build_dir, source_dir, output_dir) doctrees, source_dir, output_dir)
ctx( ctx(
rule = rule, rule = rule,
cwd = ctx.path, cwd = ctx.path,