diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-11-22 10:01:28 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-11-22 11:31:22 +0000 |
| commit | 805395f1d17cacaadb90af546bf8227501b525c7 (patch) | |
| tree | 8430f1d14b2496dfe40b3cda95f019e8c5de8197 | |
| parent | ca749e01f3150add7f235cec7b87536427978682 (diff) | |
| download | wireshark-805395f1d17cacaadb90af546bf8227501b525c7.tar.gz | |
asn2wrs.py: fix path substitution when generating ASN.1 dissectors with CMake on Windows
Change-Id: I48e7d48544274f27d276e7128f8d2a2727c0b9cd
Reviewed-on: https://code.wireshark.org/review/12031
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
(cherry picked from commit d61c3d592b88ab9685b10552b29ab799a89ff0b7)
Reviewed-on: https://code.wireshark.org/review/12032
| -rwxr-xr-x | tools/asn2wrs.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/asn2wrs.py b/tools/asn2wrs.py index 064029798f..cbeb49f881 100755 --- a/tools/asn2wrs.py +++ b/tools/asn2wrs.py @@ -2943,8 +2943,8 @@ class EthOut: out = out.replace('\\', '/') # Change absolute paths and relative paths generated outside # source directory 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) + out = re.sub(r'(\s)[./A-Z]\S*(/tools/|/epan/)', r'\1../..\2', out) + out = re.sub(r'(\s)[./A-Z]\S*/asn1/\S*?([\s/])', r'\1.\2', out) return out #--- dbg_print ------------------------------------------------------- |