1berry/wireshark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change the regexp syntax a bit.

Browse Source 
svn path=/trunk/; revision=51778
This commit is contained in:
Jörg Mayer 2013-09-05 08:55:09 +00:00
parent 06c27f8749
commit a5e2a30fc7
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/asn2wrs.py
View File

@ -2915,12 +2915,9 @@ class EthOut:
out += '\n'
# Make Windows path separator look like Unix path separator
out = out.replace('\\', '/')
# Change abolute paths from cmake builds to relative paths as used
# in autotools for identical output of both build systems.
out = re.sub(r'( [^ ]*/tools/)', ' ../../tools/', out)
out = re.sub(r'( [^ ]*/epan/)', ' ../../epan/', out)
out = re.sub(r'( [^ ]*/asn1/[^\s/]*)', ' .', out)
out = re.sub(r'( [^ ]*/asn1/[^\s]/)', ' ./', out)
# Change abolute paths to paths relative to asn1/<proto> subdir
out = re.sub(r'(\s)/\S*(/tools/|/epan/)', r'\1../..\2', out)
out = re.sub(r'(\s)/\S*/asn1/\S*?([\s/])', r'\1.\2', out)
return out
#--- dbg_print -------------------------------------------------------