Repository: trafficserver Updated Branches: refs/heads/master 309cefa58 -> 1f6ddb284
TS-2832: Doxygen can't create output directory if doc/source directory doesn't exist. Use the default XML_OUTPUT tag instead. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/1f6ddb28 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/1f6ddb28 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/1f6ddb28 Branch: refs/heads/master Commit: 1f6ddb28475d7557416e4d319e269895c3f7333d Parents: 309cefa Author: Jack Bates <[email protected]> Authored: Sat Aug 30 17:53:04 2014 -0700 Committer: Jack Bates <[email protected]> Committed: Sat Aug 30 17:53:04 2014 -0700 ---------------------------------------------------------------------- doc/Doxyfile | 2 +- doc/ext/doxygen.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1f6ddb28/doc/Doxyfile ---------------------------------------------------------------------- diff --git a/doc/Doxyfile b/doc/Doxyfile index 2d35bfe..5c06516 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -939,7 +939,7 @@ GENERATE_XML = YES # If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `xml' will be used as the default path. -XML_OUTPUT = source/doxygen_xml_api +XML_OUTPUT = xml # The XML_SCHEMA tag can be used to specify an XML schema, # which can be used by a validating XML parser to check the http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1f6ddb28/doc/ext/doxygen.py ---------------------------------------------------------------------- diff --git a/doc/ext/doxygen.py b/doc/ext/doxygen.py index 24c4a43..b4e7741 100644 --- a/doc/ext/doxygen.py +++ b/doc/ext/doxygen.py @@ -29,13 +29,13 @@ except ImportError: if os.environ.get('READTHEDOCS'): subprocess.call('doxygen') -if etree and path.isfile('source/doxygen_xml_api/index.xml'): +if etree and path.isfile('xml/index.xml'): # Doxygen files that have already been parsed cache = {} # Doxygen index - index = etree.parse('source/doxygen_xml_api/index.xml') + index = etree.parse('xml/index.xml') def doctree_resolved(app, doctree, docname): """ @@ -64,7 +64,7 @@ def doctree_resolved(app, doctree, docname): filename = compound.get('refid') + '.xml' if filename not in cache: - cache[filename] = etree.parse('source/doxygen_xml_api/' + filename) + cache[filename] = etree.parse('xml/' + filename) # An enumvalue has no location memberdef, = cache[filename].xpath('descendant::compounddef[compoundname[text() = $name]]', name=name) or cache[filename].xpath('descendant::memberdef[name[text() = $name] | enumvalue[name[text() = $name]]]', name=name) @@ -93,7 +93,7 @@ def doctree_resolved(app, doctree, docname): doctree.insert(0, raw) def setup(app): - if etree and path.isfile('source/doxygen_xml_api/index.xml'): + if etree and path.isfile('xml/index.xml'): app.connect('doctree-resolved', doctree_resolved) else: @@ -103,8 +103,8 @@ def setup(app): for that object. Depending on your system, try installing the python-lxml package.''') - if not path.isfile('source/doxygen_xml_api/index.xml'): - app.warn('''Doxygen files not found: source/doxygen_xml_api/index.xml + if not path.isfile('xml/index.xml'): + app.warn('''Doxygen files not found: xml/index.xml The files are used to add links from an API description to the code for that object. Run "$ make doxygen" to generate these XML files.''')
