[Git][NTPsec/ntpsec][master] Add a workaround for --enable-doc-only when building the main variant.

[Amar Takhar]

Amar Takhar pushed to branch master at NTPsec / ntpsec


Commits:
cb4a163f by Amar Takhar at 2016-01-20T23:20:30-05:00
Add a workaround for --enable-doc-only when building the main variant.

 * Also remove whitespace that snuck in the last commit.

- - - - -


2 changed files:

- pylib/configure.py
- wscript


Changes:

=====================================
pylib/configure.py
=====================================
--- a/pylib/configure.py
+++ b/pylib/configure.py
@@ -14,18 +14,6 @@ def cmd_configure(ctx):
 		opt = flag.replace("--", "").upper() # XXX: find a better way.
 		opt_map[opt] = ctx.env.OPT_STORE[flag]
 
-
-
-
-
-
-
-
-
-
-
-
-
 	msg("--- Configuring host ---")
 	ctx.setenv('host', ctx.env.derive())
 
@@ -70,9 +58,6 @@ def cmd_configure(ctx):
 	if not ctx.options.enable_a2x_xmllint:
 		ctx.env.A2X_FLAGS += ["--no-xmllint"]
 
-	# The rest is not needed for documentation building.
-	if ctx.options.enable_doc_only:
-		return
 
 	# Disable manpages within build()
 	if ctx.options.disable_manpage:
@@ -101,14 +86,16 @@ def cmd_configure(ctx):
 	ctx.end_msg(ctx.env.NTPS_VERSION_STRING)
 
 
-
-
-
-
-
 	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 check_type import check_type
 	from check_sizeof import check_sizeof
 	from check_structfield import check_structfield


=====================================
wscript
=====================================
--- a/wscript
+++ b/wscript
@@ -176,7 +176,8 @@ def build(ctx):
 	ctx.load('rtems_trace', tooldir='pylib/')
 
 	if ctx.env.ENABLE_DOC:
-		ctx.recurse("docs")
+		if ctx.variant != "main":
+			ctx.recurse("docs")
 
 	if ctx.env.ENABLE_DOC_ONLY:
 		return



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