AuroraMiddleware/winpty
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Actually use an XP toolset for XP builds

Browse Source
This commit is contained in:
Ryan Prichard 2018-10-14 22:43:15 -07:00
parent dcb2df4a4e
commit ceecad1551
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ship/make_msvc_package.py
View File

@ -96,6 +96,7 @@ def build(arch, packageDir, xp=False):
if not os.path.isfile(devCmdPath): if not os.path.isfile(devCmdPath):
sys.exit("Error: MSVC environment script missing: " + devCmdPath) sys.exit("Error: MSVC environment script missing: " + devCmdPath)
toolsetArgument = " --toolset {}".format(versionInfo["xp_toolset"]) if xp else ""
newEnv = os.environ.copy() newEnv = os.environ.copy()
newEnv["PATH"] = os.path.dirname(sys.executable) + ";" + common_ship.defaultPathEnviron newEnv["PATH"] = os.path.dirname(sys.executable) + ";" + common_ship.defaultPathEnviron
commandLine = ( commandLine = (
@ -103,7 +104,8 @@ def build(arch, packageDir, xp=False):
" vcbuild.bat" + " vcbuild.bat" +
" --gyp-msvs-version " + versionInfo["gyp_version"] + " --gyp-msvs-version " + versionInfo["gyp_version"] +
" --msvc-platform " + archInfo["msvc_platform"] + " --msvc-platform " + archInfo["msvc_platform"] +
" --commit-hash " + common_ship.commitHash " --commit-hash " + common_ship.commitHash +
toolsetArgument
) )
subprocess.check_call(commandLine, shell=True, env=newEnv) subprocess.check_call(commandLine, shell=True, env=newEnv)