mirror of
https://gitlab.com/ita1024/waf.git
synced 2024-11-23 02:16:01 +01:00
Merge branch 'swig_module_name_cr' into 'master'
swig: skip CR (\r) if present in module name Closes #2350 See merge request ita1024/waf!2324
This commit is contained in:
commit
7f1fdd36d5
@ -17,7 +17,7 @@ tasks have to be added dynamically:
|
||||
|
||||
SWIG_EXTS = ['.swig', '.i']
|
||||
|
||||
re_module = re.compile(r'%module(?:\s*\(.*\))?\s+(.+)', re.M)
|
||||
re_module = re.compile(r'%module(?:\s*\(.*\))?\s+([^\r\n]+)', re.M)
|
||||
|
||||
re_1 = re.compile(r'^%module.*?\s+([\w]+)\s*?$', re.M)
|
||||
re_2 = re.compile(r'[#%](?:include|import(?:\(module=".*"\))+|python(?:begin|code)) [<"](.*)[">]', re.M)
|
||||
|
Loading…
Reference in New Issue
Block a user