FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-22 18:07:12 +01:00
Code Issues Projects Releases Wiki Activity

missing r for strings containing \

Browse Source
This commit is contained in:
Thomas Nagy 2012-12-10 19:32:25 +01:00
parent c7529b3a09
commit 2da7b2f549
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
waflib/Tools/msvc.py
View File

@ -493,14 +493,14 @@ def gather_intel_composer_versions(conf, versions):
setattr(conf, compilervars_warning_attr, False) setattr(conf, compilervars_warning_attr, False)
patch_url = 'http://software.intel.com/en-us/forums/topic/328487' patch_url = 'http://software.intel.com/en-us/forums/topic/328487'
compilervars_arch = os.path.join(path, 'bin', 'compilervars_arch.bat') compilervars_arch = os.path.join(path, 'bin', 'compilervars_arch.bat')
vs_express_path = os.environ['VS110COMNTOOLS']+'..\IDE\VSWinExpress.exe' vs_express_path = os.environ['VS110COMNTOOLS'] + r'..\IDE\VSWinExpress.exe'
dev_env_path = os.environ['VS110COMNTOOLS']+'..\IDE\devenv.exe' dev_env_path = os.environ['VS110COMNTOOLS'] + r'..\IDE\devenv.exe'
if (r'if exist "%VS110COMNTOOLS%..\IDE\VSWinExpress.exe"' in Utils.readf(compilervars_arch) and if (r'if exist "%VS110COMNTOOLS%..\IDE\VSWinExpress.exe"' in Utils.readf(compilervars_arch) and
not os.path.exists(vs_express_path) and not os.path.exists(dev_env_path)): not os.path.exists(vs_express_path) and not os.path.exists(dev_env_path)):
Logs.warn(('The Intel compilervar_arch.bat only checks for one Visual Studio SKU ' Logs.warn(('The Intel compilervar_arch.bat only checks for one Visual Studio SKU '
'(VSWinExpress.exe) but it does not seem to be installed at \'%s\'. ' '(VSWinExpress.exe) but it does not seem to be installed at %r. '
'The intel command line set up will fail to configure unless the file \'%s\'' 'The intel command line set up will fail to configure unless the file %r'
'is patched. See : %s') % (vs_express_path, compilervars_arch, patch_url)) 'is patched. See: %s') % (vs_express_path, compilervars_arch, patch_url))
except WindowsError: except WindowsError:
pass pass
major = version[0:2] major = version[0:2]