From 8b842aeb0282cd83640f0c95c1ba3636b66ff4a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Mayer?= Date: Thu, 5 Sep 2013 07:38:32 +0000 Subject: [PATCH] Adapt generated output to always print paths relative to the asn1// subdir. This makes cmake generated builds look identical to autotools generated builds. svn path=/trunk/; revision=51775 --- tools/asn2wrs.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/asn2wrs.py b/tools/asn2wrs.py index 0ee8c9ae1e..75b5830936 100755 --- a/tools/asn2wrs.py +++ b/tools/asn2wrs.py @@ -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):