sconsDoxy: Better fix: get_contents() -> get_text_contents().
This commit is contained in:
parent
865fe4e3c5
commit
035a38b177
1 changed files with 4 additions and 3 deletions
|
|
@ -57,7 +57,7 @@ def DoxyfileParse(file_contents, conf_dir, data=None):
|
||||||
|
|
||||||
import shlex
|
import shlex
|
||||||
|
|
||||||
lex = shlex.shlex(instream=file_contents.decode("utf-8"), posix=True)
|
lex = shlex.shlex(instream=file_contents, posix=True)
|
||||||
lex.wordchars += "*+./-:@"
|
lex.wordchars += "*+./-:@"
|
||||||
lex.whitespace = lex.whitespace.replace("\n", "")
|
lex.whitespace = lex.whitespace.replace("\n", "")
|
||||||
lex.escape = ""
|
lex.escape = ""
|
||||||
|
|
@ -181,7 +181,7 @@ def DoxySourceFiles(node, env):
|
||||||
# go onto the sources list
|
# go onto the sources list
|
||||||
conf_dir = os.path.dirname(str(node))
|
conf_dir = os.path.dirname(str(node))
|
||||||
|
|
||||||
data = DoxyfileParse(node.get_contents(), conf_dir)
|
data = DoxyfileParse(node.get_text_contents(), conf_dir)
|
||||||
|
|
||||||
if data.get("RECURSIVE", "NO") == "YES":
|
if data.get("RECURSIVE", "NO") == "YES":
|
||||||
recursive = True
|
recursive = True
|
||||||
|
|
@ -291,7 +291,8 @@ def DoxyEmitter(target, source, env):
|
||||||
"""Doxygen Doxyfile emitter"""
|
"""Doxygen Doxyfile emitter"""
|
||||||
doxy_fpath = str(source[0])
|
doxy_fpath = str(source[0])
|
||||||
conf_dir = os.path.dirname(doxy_fpath)
|
conf_dir = os.path.dirname(doxy_fpath)
|
||||||
data = DoxyfileParse(source[0].get_contents(), conf_dir)
|
|
||||||
|
data = DoxyfileParse(source[0].get_text_contents(), conf_dir)
|
||||||
|
|
||||||
targets = []
|
targets = []
|
||||||
out_dir = data.get("OUTPUT_DIRECTORY", ".")
|
out_dir = data.get("OUTPUT_DIRECTORY", ".")
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue