[Git][NTPsec/ntpsec][master] Remove --enable-doc-only option.

[Eric S. Raymond]

Eric S. Raymond pushed to branch master at NTPsec / ntpsec


Commits:
ccb86158 by Eric S. Raymond at 2017-02-02T08:36:48-05:00
Remove --enable-doc-only option.

It was silly, amd the recipe is overcomplicated.  Removing silly options is
a start on that.

- - - - -


2 changed files:

- wafhelpers/configure.py
- wafhelpers/options.py


Changes:

=====================================
wafhelpers/configure.py
=====================================
--- a/wafhelpers/configure.py
+++ b/wafhelpers/configure.py
@@ -114,14 +114,12 @@ def cmd_configure(ctx, config):
     if ctx.env.BIN_ASCIIDOC and ctx.env.BIN_XSLTPROC and ctx.env.BIN_A2X:
         ctx.env.ENABLE_DOC = True
 
-    if (((ctx.options.enable_doc or ctx.options.enable_doc_only)
-         and not ctx.env.ENABLE_DOC)):
+    if ctx.options.enable_doc and not ctx.env.ENABLE_DOC:
         ctx.fatal("asciidoc and xsltproc are required in order "
                   "to build documentation")
-    elif (ctx.options.enable_doc or ctx.options.enable_doc_only):
+    elif ctx.options.enable_doc:
         ctx.env.ASCIIDOC_FLAGS = ["-f", "%s/docs/asciidoc.conf"
                                   % ctx.srcnode.abspath()]
-        ctx.env.ENABLE_DOC_ONLY = ctx.options.enable_doc_only
         ctx.env.ENABLE_DOC_USER = ctx.options.enable_doc
         ctx.env.HTMLDIR = ctx.options.htmldir
 
@@ -168,13 +166,6 @@ def cmd_configure(ctx, config):
     msg("--- Configuring main ---")
     ctx.setenv("main", ctx.env.derive())
 
-    # XXX: temp hack to fix --enable-doc-only
-    ctx.env.ENABLE_DOC_ONLY = ctx.options.enable_doc_only
-
-    # The rest is not needed for documentation building.
-    if ctx.options.enable_doc_only:
-        return
-
     from wafhelpers.check_type import check_type
     from wafhelpers.check_sizeof import check_sizeof
     from wafhelpers.check_structfield import check_structfield


=====================================
wafhelpers/options.py
=====================================
--- a/wafhelpers/options.py
+++ b/wafhelpers/options.py
@@ -93,8 +93,6 @@ def options_cmd(ctx, config):
     grp = ctx.add_option_group("NTP documentation configure options")
     grp.add_option('--enable-doc', action='store_true',
                    default=False, help="Build NTP documentation")
-    grp.add_option('--enable-doc-only', action='store_true',
-                   default=False, help="Only build NTP documentation")
     grp.add_option('--enable-a2x-xmllint', action='store_true',
                    default=False,
                    help="Build NTP documentation with a2x XML lint")



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/ccb86158d387db153fc43e8a04415750820246e6
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170202/ea0f52d3/attachment.html>