diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-06-30 08:50:50 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-30 08:50:50 -0400 |
commit | 3e446ef7181ea742b1a3de0162217d98e7b8cbc5 (patch) | |
tree | 9cd7e9ba2659060a99badaee9f6f9bf2eef4b454 /python/servo/build_commands.py | |
parent | 489ff5e9322f363a9d7621829b865fefd56108e1 (diff) | |
parent | 8cd436c89292d23eab1ba81061e2bfd45dcd4eff (diff) | |
download | servo-3e446ef7181ea742b1a3de0162217d98e7b8cbc5.tar.gz servo-3e446ef7181ea742b1a3de0162217d98e7b8cbc5.zip |
Auto merge of #23667 - saschanaz:msbuild2019, r=jdm
Support VS Build Tools 2019
<!-- Please describe your changes on the following line: -->
This detects VS Build Tools 2019 installation, which optionally provides VC2017 to be compatible with Servo.
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #23666
<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because ___
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23667)
<!-- Reviewable:end -->
Diffstat (limited to 'python/servo/build_commands.py')
-rw-r--r-- | python/servo/build_commands.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 582da195356..2010bfbce9b 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -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 if is_vs14: 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") if os.path.isdir(redist_dir): for p in os.listdir(redist_dir)[::-1]: redist_path = path.join(redist_dir, p) - for v in ["VC141", "VC150"]: + for v in ["VC141", "VC150", "VC160"]: # there are two possible paths # `x64\Microsoft.VC*.CRT` or `onecore\x64\Microsoft.VC*.CRT` redist1 = path.join(redist_path, vs_platform, "Microsoft.{}.CRT".format(v)) |