BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bindings: Fix doc extraction for enums 

The source file enum.hpp was not found when not building in the source
tree.  Also, extraction of the brief description did not work correctly
when there was additional XML markup inside the <para> element.
This commit is contained in:
Marcus Comstedt 2015-11-08 17:37:34 +01:00 committed by Uwe Hermann
parent 8abdf0066e
commit 8eb4299c5b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bindings/cxx/Doxyfile
View File

@ -744,7 +744,7 @@ WARN_LOGFILE =
# Note: If this tag is empty the current directory is searched. # Note: If this tag is empty the current directory is searched.
INPUT = include/libsigrokcxx/libsigrokcxx.hpp \ INPUT = include/libsigrokcxx/libsigrokcxx.hpp \
include/libsigrokcxx/enums.hpp $(BUILDDIR)include/libsigrokcxx/enums.hpp
# This tag can be used to specify the character encoding of the source files # This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

2
bindings/swig/doc.py
View File

@ -30,7 +30,7 @@ index = ElementTree.parse(input_file)
def get_text(node): def get_text(node):
paras = node.findall('para') paras = node.findall('para')
return str.join('\n\n', [p.text.rstrip() for p in paras if p.text]) return str.join('\n\n', [("".join(l)).rstrip() for l in [list(p.itertext()) for p in paras] if l])
for compound in index.findall('compound'): for compound in index.findall('compound'):
if compound.attrib['kind'] != 'class': if compound.attrib['kind'] != 'class':