Swiftdiff options
Diffstat (limited to 'BuildTools/SCons/Tools/wix.py')
| -rw-r--r-- | BuildTools/SCons/Tools/wix.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/BuildTools/SCons/Tools/wix.py b/BuildTools/SCons/Tools/wix.py index 889afe4..986ea23 100644 --- a/BuildTools/SCons/Tools/wix.py +++ b/BuildTools/SCons/Tools/wix.py | |||
| @@ -15,7 +15,10 @@ def generate(env) : | |||
| 15 | 15 | ||
| 16 | def WiX_IncludeScanner(source, env, path, arg): | 16 | def WiX_IncludeScanner(source, env, path, arg): |
| 17 | wixIncludeRegexp = re.compile(r'^\s*\<\?include (\S+.wxs)\s*\?\>\S*', re.M) | 17 | wixIncludeRegexp = re.compile(r'^\s*\<\?include (\S+.wxs)\s*\?\>\S*', re.M) |
| 18 | contents = source.get_contents() | 18 | if SCons.Util.PY3: |
| 19 | contents = source.get_contents().decode("utf8") | ||
| 20 | else: | ||
| 21 | contents = source.get_contents() | ||
| 19 | includes = wixIncludeRegexp.findall(contents) | 22 | includes = wixIncludeRegexp.findall(contents) |
| 20 | return [ "" + include for include in includes ] | 23 | return [ "" + include for include in includes ] |
| 21 | 24 | ||