Changeset 8f5f371 in rtems-docs

Timestamp:

11/10/22 22:22:34 (3 months ago)

Author:

Chris Johns <chrisj@…>

Branches:

master

Children:

32de9ff

Parents:

47e1f6e

git-author:

Chris Johns <chrisj@…> (11/10/22 22:22:34)

git-committer:

Chris Johns <chrisj@…> (12/06/22 21:33:41)

Message:

waf: Handle the enable options for singlehtml and ditaa/puml

Close #4756

File:

• common/waf.py (modified) (3 diffs)

common/waf.py

@@ -276 +276 @@
         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'
@@ -286 +286 @@
         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'
@@ -305 +305 @@
         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):