Merge branch 'doxy' into 'master'

doxygen: maintain order of lines in doxyfile

See merge request ita1024/waf!2223
This commit is contained in:
ita1024 2019-04-18 06:16:24 +00:00
commit 14ba605138
1 changed files with 8 additions and 1 deletions

View File

@ -27,6 +27,7 @@ When using this tool, the wscript will look like:
"""
import os, os.path, re
from collections import OrderedDict
from waflib import Task, Utils, Node
from waflib.TaskGen import feature
@ -40,7 +41,13 @@ inc m mm py f90c cc cxx cpp c++ java ii ixx ipp i++ inl h hh hxx
re_rl = re.compile('\\\\\r*\n', re.MULTILINE)
re_nl = re.compile('\r*\n', re.M)
def parse_doxy(txt):
tbl = {}
'''
Parses a doxygen file.
Returns an ordered dictionary. We cannot return a default dictionary, as the
order in which the entries are reported does matter, especially for the
'@INCLUDE' lines.
'''
tbl = OrderedDict()
txt = re_rl.sub('', txt)
lines = re_nl.split(txt)
for x in lines: