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

Print the full path for errors occurring in the servo crate

Browse source
This commit is contained in:
tigercosmos 2017-10-25 23:31:21 +08:00
parent c494d25e24
commit a0ae81610d
7 changed files with 29 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

22
python/servo/build_commands.py
View file

@ -176,12 +176,14 @@ class MachCommands(CommandBase):
def build(self, target=None, release=False, dev=False, jobs=None,
features=None, android=None, verbose=False, debug_mozjs=False, params=None,
with_debug_assertions=False):
opts = params or []
opts += ["--manifest-path", self.servo_manifest()]
if android is None:
android = self.config["build"]["android"]
features = features or self.servo_features()
opts = params or []
base_path = self.get_target_dir()
release_path = path.join(base_path, "release", "servo")
dev_path = path.join(base_path, "debug", "servo")
@ -318,8 +320,7 @@ class MachCommands(CommandBase):
cargo_binary = "cargo" + BIN_SUFFIX
status = call(
[cargo_binary, "build"] + opts,
env=env, cwd=self.servo_crate(), verbose=verbose)
[cargo_binary, "build"] + opts, env=env, verbose=verbose)
elapsed = time() - build_start
# Do some additional things if the build succeeded
@ -384,6 +385,8 @@ class MachCommands(CommandBase):
ret = None
opts = []
opts += ["--manifest-path", self.cef_manifest()]
if jobs is not None:
opts += ["-j", jobs]
if verbose:
@ -407,10 +410,7 @@ class MachCommands(CommandBase):
# common dependencies with the same flags.
opts += ["--", "-C", "link-args=-Xlinker -undefined -Xlinker dynamic_lookup"]
with cd(path.join("ports", "cef")):
ret = call(["cargo", "rustc"] + opts,
env=env,
verbose=verbose)
ret = call(["cargo", "rustc"] + opts, env=env, verbose=verbose)
elapsed = time() - build_start
# Generate Desktop Notification if elapsed-time > some threshold value
@ -441,20 +441,20 @@ class MachCommands(CommandBase):
ret = None
opts = []
opts += ["--manifest-path", self.geckolib_manifest()]
features = []
if jobs is not None:
opts += ["-j", jobs]
if verbose:
opts += ["-v"]
if release:
opts += ["--release"]
if features:
opts += ["--features", ' '.join(features)]
build_start = time()
with cd(path.join("ports", "geckolib")):
ret = call(["cargo", "build"] + opts, env=env, verbose=verbose)
ret = call(["cargo", "build"] + opts, env=env, verbose=verbose)
elapsed = time() - build_start
# Generate Desktop Notification if elapsed-time > some threshold value

9
python/servo/command_base.py
View file

@ -545,6 +545,15 @@ class CommandBase(object):
def servo_crate(self):
return path.join(self.context.topdir, "ports", "servo")
def servo_manifest(self):
return path.join(self.context.topdir, "ports", "servo", "Cargo.toml")
def geckolib_manifest(self):
return path.join(self.context.topdir, "ports", "geckolib", "Cargo.toml")
def cef_manifest(self):
return path.join(self.context.topdir, "ports", "cef", "Cargo.toml")
def servo_features(self):
"""Return a list of optional features to enable for the Servo crate"""
features = []