Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-29 19:43:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Support VS Build Tools 2019

Browse source
This commit is contained in:
Kagami Sascha Rosylight 2019-06-30 19:12:47 +09:00
parent 489ff5e932
commit 8cd436c892
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
python/servo/build_commands.py
View file

@ -803,12 +803,12 @@ def package_msvc_dlls(servo_exe_dir, target):
is_vs14 = True if os.path.isfile(vs14_vcvars) or vs_version == "14.0" else False is_vs14 = True if os.path.isfile(vs14_vcvars) or vs_version == "14.0" else False
if is_vs14: if is_vs14:
msvc_redist_dir = path.join(vc_dir, "redist", vs_platform, "Microsoft.VC140.CRT") msvc_redist_dir = path.join(vc_dir, "redist", vs_platform, "Microsoft.VC140.CRT")
elif vs_version == "15.0": elif vs_version in ("15.0", "16.0"):
redist_dir = path.join(vc_dir, "Redist", "MSVC") redist_dir = path.join(vc_dir, "Redist", "MSVC")
if os.path.isdir(redist_dir): if os.path.isdir(redist_dir):
for p in os.listdir(redist_dir)[::-1]: for p in os.listdir(redist_dir)[::-1]:
redist_path = path.join(redist_dir, p) redist_path = path.join(redist_dir, p)
for v in ["VC141", "VC150"]: for v in ["VC141", "VC150", "VC160"]:
# there are two possible paths # there are two possible paths
# `x64\Microsoft.VC*.CRT` or `onecore\x64\Microsoft.VC*.CRT` # `x64\Microsoft.VC*.CRT` or `onecore\x64\Microsoft.VC*.CRT`
redist1 = path.join(redist_path, vs_platform, "Microsoft.{}.CRT".format(v)) redist1 = path.join(redist_path, vs_platform, "Microsoft.{}.CRT".format(v))