[Git][NTPsec/ntpsec][master] 2 commits: Make documentation generation more resilient.

[Amar Takhar]

Amar Takhar pushed to branch master at NTPsec / ntpsec


Commits:
5dab069e by Amar Takhar at 2016-03-25T00:27:24-04:00
Make documentation generation more resilient.

Closes #50

- - - - -
7c682d8f by Amar Takhar at 2016-03-25T00:27:24-04:00
Bump version to 0.9.3.

devel shouldn't be at 0.9.2 still as it has already been released.  This will
make the snapshots easier to understand as users are always testing the next
release not the current.

- - - - -


4 changed files:

- VERSION
- pylib/configure.py
- pylib/waf.py
- wscript


Changes:

=====================================
VERSION
=====================================
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.9.2
+0.9.3


=====================================
pylib/configure.py
=====================================
--- a/pylib/configure.py
+++ b/pylib/configure.py
@@ -69,12 +69,17 @@ def cmd_configure(ctx, config):
 	ctx.find_program("a2x", var="BIN_A2X", mandatory=False)
 	ctx.find_program("xsltproc", var="BIN_XSLTPROC", mandatory=False)
 
-	if (ctx.options.enable_doc or ctx.options.enable_doc_only) and not ctx.env.BIN_ASCIIDOC and not BIN_XSLTPROC:
+	ctx.env.ENABLE_DOC = False
+	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:
 		ctx.fatal("asciidoc and xsltproc are required in order to build documentation")
 	elif (ctx.options.enable_doc or ctx.options.enable_doc_only):
 		ctx.env.ASCIIDOC_FLAGS = ["-f", "%s/docs/asciidoc.conf" % ctx.srcnode.abspath()]
-		ctx.env.ENABLE_DOC = True
 		ctx.env.ENABLE_DOC_ONLY = ctx.options.enable_doc_only
+		ctx.env.ENABLE_DOC_USER = ctx.options.enable_doc
 		ctx.env.PATH_DOC = ctx.options.path_doc
 
 	# XXX: conditionally build this with --disable-man?  Should it build without docs enabled?
@@ -570,7 +575,7 @@ def cmd_configure(ctx, config):
 	msg_setting("PREFIX", ctx.env.PREFIX)
 	msg_setting("Debug Support", yesno(not ctx.options.disable_debug))
 	msg_setting("Refclocks", ", ".join(ctx.env.REFCLOCK_LIST))
-	msg_setting("Build Manpages", yesno((ctx.env.BIN_XSLTPROC and ctx.env.BIN_A2X) and not ctx.env.DISABLE_MANPAGE))
+	msg_setting("Build Manpages", yesno(ctx.env.ENABLE_DOC and not ctx.env.DISABLE_MANPAGE))
 
 	if ctx.options.enable_debug:
 		msg("")


=====================================
pylib/waf.py
=====================================
--- a/pylib/waf.py
+++ b/pylib/waf.py
@@ -60,7 +60,7 @@ def manpage(ctx, section, source):
 		ctx.install_files("${PREFIX}/man%s/" % section, source.replace("-man.txt", ".%s" % section))
 		return
 
-	if (not ctx.env.BIN_A2X and not ctx.env.BIN_XSLTPROC) or ctx.env.DISABLE_MANPAGE:
+	if not ctx.env.ENABLE_DOC or ctx.env.DISABLE_MANPAGE:
 		return
 
 	ctx(
@@ -72,6 +72,7 @@ def manpage(ctx, section, source):
  
 	ctx(source=source + '.man-tmp', section=section) 
 
+
 @conf
 def ntp_test(ctx, **kwargs):
 	bldnode = ctx.bldnode.abspath()


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



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/18526d28cc08228190bcd0ff91e6998795653b6c...7c682d8f06a82abf919eb21e0a95ae89525be52b
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20160325/5985b1b0/attachment.html>