From 62d9782c01328baa1866f061f49cd88b47a7cc9a Mon Sep 17 00:00:00 2001 From: William Deegan Date: Wed, 14 Jun 2017 16:09:37 -0400 Subject: docbook force order used to search for fop tool to fop, xep, jw. It looks like jw command line may be incorrect as it doesn't work on ubuntu 14.04 16.06 or macports installs of docbook-utils --- src/engine/SCons/Tool/docbook/__init__.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/engine/SCons/Tool/docbook/__init__.py b/src/engine/SCons/Tool/docbook/__init__.py index d3ea8aeb..d60789d0 100644 --- a/src/engine/SCons/Tool/docbook/__init__.py +++ b/src/engine/SCons/Tool/docbook/__init__.py @@ -43,6 +43,8 @@ import SCons.Script import SCons.Tool import SCons.Util + +__debug_tool_location = False # Get full path to this script scriptpath = os.path.dirname(os.path.realpath(__file__)) @@ -182,8 +184,12 @@ def __detect_cl_tool(env, chainkey, cdict, cpriority=None): if cpriority is None: cpriority = cdict.keys() for cltool in cpriority: + if __debug_tool_location: + print("DocBook: Looking for %s"%cltool) clpath = env.WhereIs(cltool) if clpath: + if __debug_tool_location: + print("DocBook: Found:%s"%cltool) env[chainkey] = clpath if not env[chainkey + 'COM']: env[chainkey + 'COM'] = cdict[cltool] @@ -204,7 +210,7 @@ def _detect(env): __detect_cl_tool(env, 'DOCBOOK_XSLTPROC', xsltproc_com, xsltproc_com_priority) __detect_cl_tool(env, 'DOCBOOK_XMLLINT', xmllint_com) - __detect_cl_tool(env, 'DOCBOOK_FOP', fop_com) + __detect_cl_tool(env, 'DOCBOOK_FOP', fop_com, ['fop','xep','jw']) # # Scanners -- cgit v1.2.1