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

build: Add extra source to the sphinx build.

Browse Source 
Updates #3177.
This commit is contained in:
Chris Johns 2017-10-12 17:46:00 -07:00 committed by Joel Sherrill
parent 2c3cf2166d
commit 8e8094abc8
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
common/waf.py
View File

@ -25,7 +25,7 @@ def version_cmdline(ctx):
return '-Drelease="%s" -Dversion="%s"' % (ctx.env.VERSION, ctx.env.VERSION) return '-Drelease="%s" -Dversion="%s"' % (ctx.env.VERSION, ctx.env.VERSION)
def sphinx_cmdline(ctx, build_type, conf_dir, doctrees, source_dir, output_dir): def sphinx_cmdline(ctx, build_type, conf_dir, doctrees, source_dir, output_dir):
rule = "${BIN_SPHINX_BUILD} %s -b %s -c %s %s -d %s %s %s" % \ rule = "${BIN_SPHINX_BUILD} %s -b %s -c %s %s -d %s %s %s ${SRC}" % \
(sphinx_verbose(ctx), build_type, conf_dir, version_cmdline(ctx), (sphinx_verbose(ctx), build_type, conf_dir, version_cmdline(ctx),
doctrees, source_dir, output_dir) doctrees, source_dir, output_dir)
return rule return rule
@ -234,7 +234,7 @@ def cmd_configure(ctx):
ctx.fatal("Node inliner is required install with 'npm install -g inliner' " + ctx.fatal("Node inliner is required install with 'npm install -g inliner' " +
"(https://github.com/remy/inliner)") "(https://github.com/remy/inliner)")
def doc_pdf(ctx, source_dir, conf_dir): def doc_pdf(ctx, source_dir, conf_dir, extra_source):
buildtype = 'latex' buildtype = 'latex'
build_dir, output_node, output_dir, doctrees = build_dir_setup(ctx, buildtype) build_dir, output_node, output_dir, doctrees = build_dir_setup(ctx, buildtype)
pdf_resources(ctx, buildtype) pdf_resources(ctx, buildtype)
@ -242,7 +242,7 @@ def doc_pdf(ctx, source_dir, conf_dir):
ctx( ctx(
rule = rule, rule = rule,
cwd = ctx.path, cwd = ctx.path,
source = ctx.path.ant_glob('**/*.rst'), source = ctx.path.ant_glob('**/*.rst') + extra_source,
target = ctx.path.find_or_declare("%s/%s.tex" % (buildtype, target = ctx.path.find_or_declare("%s/%s.tex" % (buildtype,
ctx.path.name)) ctx.path.name))
) )
@ -258,7 +258,7 @@ def doc_pdf(ctx, source_dir, conf_dir):
cwd = output_node, cwd = output_node,
quiet = True) quiet = True)
def doc_singlehtml(ctx, source_dir, conf_dir): def doc_singlehtml(ctx, source_dir, conf_dir, extra_source):
# #
# Use a run command to handle stdout and stderr output from inliner. Using # Use a run command to handle stdout and stderr output from inliner. Using
# a standard rule in the build context locks up. # a standard rule in the build context locks up.
@ -292,7 +292,7 @@ def doc_singlehtml(ctx, source_dir, conf_dir):
ctx( ctx(
rule = rule, rule = rule,
cwd = ctx.path, cwd = ctx.path,
source = ctx.path.ant_glob('**/*.rst'), source = ctx.path.ant_glob('**/*.rst') + extra_source,
target = ctx.path.find_or_declare("%s/index.html" % (buildtype)), target = ctx.path.find_or_declare("%s/index.html" % (buildtype)),
install_path = None install_path = None
) )
@ -304,7 +304,7 @@ def doc_singlehtml(ctx, source_dir, conf_dir):
install_path = '${PREFIX}' install_path = '${PREFIX}'
) )
def doc_html(ctx, conf_dir, source_dir): def doc_html(ctx, source_dir, conf_dir, extra_source):
buildtype = 'html' buildtype = 'html'
build_dir, output_node, output_dir, doctrees = 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)
@ -312,7 +312,7 @@ def doc_html(ctx, conf_dir, source_dir):
ctx( ctx(
rule = rule, rule = rule,
cwd = ctx.path, cwd = ctx.path,
source = ctx.path.ant_glob('**/*.rst'), source = ctx.path.ant_glob('**/*.rst') + extra_source,
target = ctx.path.find_or_declare('%s/index.html' % buildtype), target = ctx.path.find_or_declare('%s/index.html' % buildtype),
install_path = None install_path = None
) )
@ -322,17 +322,17 @@ def doc_html(ctx, conf_dir, source_dir):
relative_trick = True, relative_trick = True,
quiet = True) quiet = True)
def cmd_build(ctx): def cmd_build(ctx, extra_source = []):
conf_dir = ctx.path.get_src() conf_dir = ctx.path.get_src()
source_dir = ctx.path.get_src() source_dir = ctx.path.get_src()
if ctx.env.BUILD_PDF == 'yes': if ctx.env.BUILD_PDF == 'yes':
doc_pdf(ctx, source_dir, conf_dir) doc_pdf(ctx, source_dir, conf_dir, extra_source)
if ctx.env.BUILD_SINGLEHTML == 'yes': if ctx.env.BUILD_SINGLEHTML == 'yes':
doc_singlehtml(ctx, source_dir, conf_dir) doc_singlehtml(ctx, source_dir, conf_dir, extra_source)
doc_html(ctx, source_dir, conf_dir) doc_html(ctx, source_dir, conf_dir, extra_source)
def cmd_options(ctx): def cmd_options(ctx):
ctx.add_option('--disable-extra-fonts', ctx.add_option('--disable-extra-fonts',