diff options
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/build_commands.py | 11 | ||||
| -rw-r--r-- | python/servo/package_commands.py | 2 | ||||
| -rw-r--r-- | python/servo/packages.py | 2 | ||||
| -rw-r--r-- | python/servo/testing_commands.py | 2 |
4 files changed, 11 insertions, 6 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index cb54497377a..3b87e9aba7e 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -256,10 +256,11 @@ class MachCommands(CommandBase): vs_dirs = self.vs_dirs() if host != target_triple and 'windows' in target_triple: - if os.environ.get('VisualStudioVersion'): + if os.environ.get('VisualStudioVersion') or os.environ.get('VCINSTALLDIR'): print("Can't cross-compile for Windows inside of a Visual Studio shell.\n" "Please run `python mach build [arguments]` to bypass automatic " - "Visual Studio shell.") + "Visual Studio shell, and make sure the VisualStudioVersion and " + "VCINSTALLDIR environment variables are not set.") sys.exit(1) vcinstalldir = vs_dirs['vcdir'] if not os.path.exists(vcinstalldir): @@ -315,11 +316,15 @@ class MachCommands(CommandBase): process = subprocess.Popen('("%s" %s > nul) && "python" -c "import os; print(repr(os.environ))"' % (os.path.join(vs_dirs['vcdir'], "Auxiliary", "Build", "vcvarsall.bat"), "x64"), stdout=subprocess.PIPE, shell=True) - stdout, _ = process.communicate() + stdout, stderr = process.communicate() exitcode = process.wait() encoding = locale.getpreferredencoding() # See https://stackoverflow.com/a/9228117 if exitcode == 0: os.environ.update(eval(stdout.decode(encoding))) + else: + print("Failed to run vcvarsall. stderr:") + print(stderr.decode(encoding)) + exit(1) # Ensure that GStreamer libraries are accessible when linking. if 'windows' in target_triple: diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py index a0aa3865b6f..8df106e2a9e 100644 --- a/python/servo/package_commands.py +++ b/python/servo/package_commands.py @@ -31,7 +31,7 @@ from mach.decorators import ( from mach.registrar import Registrar # Note: mako cannot be imported at the top level because it breaks mach bootstrap sys.path.append(path.join(path.dirname(__file__), "..", "..", - "components", "style", "properties", "Mako-0.9.1.zip")) + "components", "style", "properties", "Mako-1.1.2-py2.py3-none-any.whl")) from servo.command_base import ( archive_deterministically, diff --git a/python/servo/packages.py b/python/servo/packages.py index db22558f0d4..ea903a3913b 100644 --- a/python/servo/packages.py +++ b/python/servo/packages.py @@ -4,7 +4,7 @@ WINDOWS_MSVC = { "cmake": "3.14.3", - "llvm": "8.0.1", + "llvm": "9.0.0", "moztools": "3.2", "ninja": "1.7.1", "nuget": "08-08-2019", diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py index 3fad465277b..7bee7633f90 100644 --- a/python/servo/testing_commands.py +++ b/python/servo/testing_commands.py @@ -49,7 +49,7 @@ WEB_PLATFORM_TESTS_PATH = os.path.join("tests", "wpt", "web-platform-tests") SERVO_TESTS_PATH = os.path.join("tests", "wpt", "mozilla", "tests") CLANGFMT_CPP_DIRS = ["support/hololens/"] -CLANGFMT_VERSION = "8" +CLANGFMT_VERSION = "9" TEST_SUITES = OrderedDict([ ("tidy", {"kwargs": {"all_files": False, "no_progress": False, "self_test": False, |