[rtems-docs commit] waf: Configure check the inliner only once.

Chris Johns chrisj at rtems.org
Wed Mar 15 04:03:16 UTC 2017


Module:    rtems-docs
Branch:    master
Commit:    91d6c96b4cb8fbde4d6c38deb7c5cc6ae308e30f
Changeset: http://git.rtems.org/rtems-docs/commit/?id=91d6c96b4cb8fbde4d6c38deb7c5cc6ae308e30f

Author:    Chris Johns <chrisj at rtems.org>
Date:      Wed Mar 15 15:03:10 2017 +1100

waf: Configure check the inliner only once.

---

 common/waf.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/common/waf.py b/common/waf.py
index ad75ed5..a86737b 100644
--- a/common/waf.py
+++ b/common/waf.py
@@ -199,11 +199,13 @@ def cmd_configure(ctx):
 
     ctx.envBUILD_SINGLEHTML = 'no'
     if ctx.options.singlehtml:
-        ctx.env.BUILD_SINGLEHTML = 'yes'
-        ctx.find_program("inliner", var = "BIN_INLINER", mandatory = False)
-        if not ctx.env.BIN_INLINER:
-            ctx.fatal("Node inliner is required install with 'npm install -g inliner' " +
-                      "(https://github.com/remy/inliner)")
+        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 inliner is required install with 'npm install -g inliner' " +
+                          "(https://github.com/remy/inliner)")
 
 def doc_pdf(ctx, source_dir, conf_dir):
     buildtype = 'latex'



More information about the vc mailing list