osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Adapt generated output to always print paths relative to 

the asn1/<proto>/ subdir. This makes cmake generated builds
look identical to autotools generated builds.

svn path=/trunk/; revision=51775
This commit is contained in:
Jörg Mayer 2013-09-05 07:38:32 +00:00
parent 854363611c
commit 8b842aeb02
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/asn2wrs.py
View File

@ -2914,7 +2914,14 @@ class EthOut:
out += self.outcomment(' '.join(sys.argv), comment)
out += '\n'
# Make Windows path separator look like Unix path separator
return out.replace('\\', '/')
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)
return out
#--- dbg_print -------------------------------------------------------
def dbg_print(self):