Changeset 6207c37 in rtems-docs


Ignore:
Timestamp:
Nov 3, 2016, 4:22:49 AM (4 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.11, 5, am, master
Children:
72a62ad
Parents:
d3226d3
Message:

waf: Use separate doctrees so avoid sphinx clashes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • common/waf.py

    rd3226d3 r6207c37  
    8484    output_node = ctx.path.get_bld().make_node(buildtype)
    8585    output_dir = output_node.abspath()
    86     return build_dir, output_node, output_dir
     86    doctrees = os.path.join(os.path.dirname(output_dir), 'doctrees', buildtype)
     87    return build_dir, output_node, output_dir, doctrees
    8788
    8889def html_resources(ctx, buildtype):
     
    147148def doc_pdf(ctx, source_dir, conf_dir):
    148149    buildtype = 'latex'
    149     build_dir, output_node, output_dir = build_dir_setup(ctx, buildtype)
    150     rule = "${BIN_SPHINX_BUILD} %s -b %s -c %s -d build/%s/doctrees %s %s" % \
     150    build_dir, output_node, output_dir, doctrees = build_dir_setup(ctx, buildtype)
     151    rule = "${BIN_SPHINX_BUILD} %s -b %s -c %s -d %s %s %s" % \
    151152           (sphinx_verbose(ctx), buildtype, conf_dir,
    152             build_dir, source_dir, output_dir)
     153            doctrees, source_dir, output_dir)
    153154    ctx(
    154155        rule         = rule,
     
    199200
    200201    buildtype = 'singlehtml'
    201     build_dir, output_node, output_dir = build_dir_setup(ctx, buildtype)
     202    build_dir, output_node, output_dir, doctrees = build_dir_setup(ctx, buildtype)
    202203    html_resources(ctx, buildtype)
    203     rule = "${BIN_SPHINX_BUILD} %s -b %s -c %s -d build/%s/doctrees %s %s" % \
     204    rule = "${BIN_SPHINX_BUILD} %s -b %s -c %s -d %s %s %s" % \
    204205           (sphinx_verbose(ctx), buildtype, conf_dir,
    205             build_dir, source_dir, output_dir)
     206            doctrees, source_dir, output_dir)
    206207    ctx(
    207208        rule         = rule,
     
    221222def doc_html(ctx, conf_dir, source_dir):
    222223    buildtype = 'html'
    223     build_dir, output_node, output_dir = build_dir_setup(ctx, buildtype)
     224    build_dir, output_node, output_dir, doctrees = build_dir_setup(ctx, buildtype)
    224225    html_resources(ctx, buildtype)
    225     rule = "${BIN_SPHINX_BUILD} %s -b %s -c %s -d build/%s/doctrees %s %s" % \
     226    rule = "${BIN_SPHINX_BUILD} %s -b %s -c %s -d %s %s %s" % \
    226227           (sphinx_verbose(ctx), buildtype, conf_dir,
    227             build_dir, source_dir, output_dir)
     228            doctrees, source_dir, output_dir)
    228229    ctx(
    229230        rule         = rule,
Note: See TracChangeset for help on using the changeset viewer.