From a9831716d757fc369779bbdb0b8259ca2b667826 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Tue, 11 Feb 2020 13:51:26 +0000 Subject: [PATCH 1/2] README.md: set PYTHON2 env for Windows builds Without this the build can fail to find a python27.exe --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 1553e0494b6..aecf062357d 100644 --- a/README.md +++ b/README.md @@ -194,6 +194,11 @@ export LIBCLANG_PATH=$(llvm-config --prefix)/lib64 You should change the installation to install the "Add python.exe to Path" feature. +You will also need to set the `PYTHON2` environment variable, e.g., to 'C:\Python27\python.exe' by doing: +``` +setx PYTHON2 "C:\Python27\python.exe" /m +``` + 2. Install Python 3.7 for Windows (https://www.python.org/downloads/release/python-374/). The Windows x86-64 MSI installer is fine. This is required in order to build the JavaScript engine, SpiderMonkey. You will also need to set the `PYTHON3` environment variable, e.g., to 'C:\Python37\python.exe' by doing: From 8902aa93e483810f688a6e3999110adb891bc9c3 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Tue, 11 Feb 2020 13:56:00 +0000 Subject: [PATCH 2/2] Build: check for VC142 MSVC redist dir --- python/servo/build_commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 2aa70862fd6..e6b2cd6722a 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -972,7 +972,7 @@ def package_msvc_dlls(servo_exe_dir, target, vcinstalldir, vs_version): 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", "VC160"]: + for v in ["VC141", "VC142", "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))