diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-06-15 01:21:38 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-06-15 01:21:38 (GMT) |
| commit | 2b7d176087d63dcb6da9f450c34747eff5df8d89 (patch) | |
| tree | b0ac20f2456b418532f484cf9aab2ec2165b6860 | |
| parent | fe48d8b9b53a296304ee17ef0e8a91aa5729ed3a (diff) | |
| parent | bacf54039eceff118f7d05522331851ba41d1e25 (diff) | |
| download | SCons-2b7d176087d63dcb6da9f450c34747eff5df8d89.zip SCons-2b7d176087d63dcb6da9f450c34747eff5df8d89.tar.gz SCons-2b7d176087d63dcb6da9f450c34747eff5df8d89.tar.bz2 | |
merge
| -rw-r--r-- | src/engine/SCons/Tool/docbook/__init__.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/docbook/__init__.py b/src/engine/SCons/Tool/docbook/__init__.py index d3ea8ae..d60789d 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 |