summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2022-11-11 09:22:34 +1100
committerChris Johns <chrisj@rtems.org>2022-12-07 08:33:41 +1100
commit8f5f371b3deedd73a9bac58a0aadb889b8e063df (patch)
tree751954a3a9c65bdd4ef766ee705b6f5a2d039c7d
parentDocument CONFIGURE_RECORD_INTERRUPTS_ENABLED (diff)
downloadrtems-docs-master.tar.bz2
waf: Handle the enable options for singlehtml and ditaa/pumlHEADmaster
Close #4756
Diffstat (limited to '')
-rw-r--r--common/waf.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/common/waf.py b/common/waf.py
index 8584f88..0bd166a 100644
--- a/common/waf.py
+++ b/common/waf.py
@@ -275,21 +275,21 @@ def cmd_configure(ctx):
if ctx.options.singlehtml:
check_inliner = not ctx.env.BIN_INLINER
if check_inliner:
- ctx.env.BUILD_SINGLEHTML = 'yes'
ctx.find_program("inliner", var = "BIN_INLINER", mandatory = False)
if not ctx.env.BIN_INLINER:
ctx.fatal("Node.js inliner is required install with 'npm install -g inliner' " +
"(https://github.com/remy/inliner)")
+ ctx.env.BUILD_SINGLEHTML = 'yes'
ctx.env.BUILD_PLANTUML = 'no'
if ctx.options.plantuml:
check_plantuml = not ctx.env.BIN_PUML
if check_plantuml:
- ctx.env.BUILD_PLANTUML = 'yes'
ctx.find_program("puml", var = "BIN_PUML", mandatory = False)
if not ctx.env.BIN_PUML:
ctx.fatal("Node.js puml is required install with 'npm install -g node-plantuml' " +
"(https://www.npmjs.com/package/node-plantuml)")
+ ctx.env.BUILD_PLANTUML = 'yes'
ctx.env.BUILD_DITAA = 'no'
if ctx.options.ditaa:
@@ -304,10 +304,10 @@ def cmd_configure(ctx):
"(https://www.npmjs.com/package/node-plantuml)")
check_ditaa = not ctx.env.BIN_DITAA
if check_ditaa:
- ctx.env.BUILD_DITAA = 'yes'
ctx.find_program("ditaa", var = "BIN_DITAA", mandatory = False)
if not ctx.env.BIN_DITAA:
ctx.fatal("DITAA not found, plase install")
+ ctx.env.BUILD_DITAA = 'yes'
def sources_exclude(ctx, sources):
exclude = sources.get('exclude', [])