Merge pull request #2352 from hugovk/fix-invalid-string-escapes

Fix invalid string escapes in winbuild
This commit is contained in:
wiredfool 2017-01-16 11:05:20 +00:00 committed by GitHub
commit eb8f6aa566
2 changed files with 3 additions and 2 deletions

View File

@ -16,7 +16,7 @@ def setup_vms():
for arch in ('', X64_EXT):
ret.append("virtualenv -p c:/Python%s%s/python.exe --clear %s%s%s"
% (py, arch, VIRT_BASE, py, arch))
ret.append("%s%s%s\Scripts\pip.exe install nose" %
ret.append(r"%s%s%s\Scripts\pip.exe install nose" %
(VIRT_BASE, py, arch))
return "\n".join(ret)

View File

@ -13,6 +13,7 @@ def _relpath(*args):
def _relbuild(*args):
return _relpath('build', *args)
build_dir = _relpath('build')
inc_dir = _relpath('depends')
@ -108,7 +109,7 @@ set MSBUILD=C:\Windows\Microsoft.NET\Framework64\v4.0.30319\MSBuild.exe
set CMAKE="cmake.exe"
set INCLIB=%~dp0\depends
set BUILD=%~dp0\build
""" + "\n".join('set %s=%%BUILD%%\%s' % (k.upper(), v['dir'])
""" + "\n".join(r'set %s=%%BUILD%%\%s' % (k.upper(), v['dir'])
for (k, v) in libs.items() if v['dir'])