Changeset 228560f in rtems-docs

Timestamp:

03/20/17 21:41:41 (7 years ago)

Author:

Chris Johns <chrisj@…>

Branches:

5, master

Children:

e7f009e

Parents:

f97be09

Message:

waf: Create the sphinx rule in one place.

File:

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

common/waf.py

@@ -229 +229 @@
                           "(https://github.com/remy/inliner)")
 
+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" % \
+           (sphinx_verbose(ctx), build_type, conf_dir, version_cmdline(ctx),
+            doctrees, source_dir, output_dir)
+    return rule
+
 def doc_pdf(ctx, source_dir, conf_dir):
     buildtype = 'latex'
     build_dir, output_node, output_dir, doctrees = build_dir_setup(ctx, buildtype)
     pdf_resources(ctx, buildtype)
-    rule = "${BIN_SPHINX_BUILD} %s -b %s -c %s %s -d %s %s %s" % \
-           (sphinx_verbose(ctx), buildtype, conf_dir, version_cmdline(ctx),
-            doctrees, source_dir, output_dir)
+    rule = sphinx_cmdline(ctx, buildtype, conf_dir, doctrees, source_dir, output_dir)
     ctx(
         rule         = rule,
@@ -285 +289 @@
     build_dir, output_node, output_dir, doctrees = build_dir_setup(ctx, buildtype)
     html_resources(ctx, buildtype)
-    rule = "${BIN_SPHINX_BUILD} %s -b %s -c %s %s -d %s %s %s" % \
-           (sphinx_verbose(ctx), buildtype, conf_dir, version_cmdline(ctx),
-            doctrees, source_dir, output_dir)
+    rule = sphinx_cmdline(ctx, buildtype, conf_dir, doctrees, source_dir, output_dir)
     ctx(
         rule         = rule,
@@ -307 +309 @@
     build_dir, output_node, output_dir, doctrees = build_dir_setup(ctx, buildtype)
     html_resources(ctx, buildtype)
-    rule = "${BIN_SPHINX_BUILD} %s -b %s -c %s %s -d %s %s %s" % \
-           (sphinx_verbose(ctx), buildtype, conf_dir, version_cmdline(ctx),
-            doctrees, source_dir, output_dir)
+    rule = sphinx_cmdline(ctx, buildtype, conf_dir, doctrees, source_dir, output_dir)
     ctx(
         rule         = rule,
@@ -344 +344 @@
                    help = "Sphinx verbose.")
     ctx.add_option('--pdf',
-                   action='store_true',
+                   action = 'store_true',
                    default = False,
                    help = "Build PDF.")
     ctx.add_option('--singlehtml',
-                   action='store_true',
+                   action = 'store_true',
                    default = False,
                    help = "Build Single HTML file, requires Node Inliner")