Use workspace.default-members to specify default crates for 'cargo build'

… and 'cargo test', etc. Include Servo and its unit tests,
but not Stylo because that would try to compile the style
crate with incompatible feature flags:
https://github.com/rust-lang/cargo/issues/4463

`workspace.default-members` was added in
https://github.com/rust-lang/cargo/pull/4743.
Older Cargo versions ignore it.
This commit is contained in:
Simon Sapin 2017-11-30 16:52:08 +01:00
parent 2a5c4133f9
commit 1f2b66e2d7
3 changed files with 7 additions and 5 deletions

View file

@ -8,6 +8,10 @@ members = [
"ports/cef",
]
default-members = [
"ports/servo",
"tests/unit/*",
]
exclude = [".cargo"]
[profile.dev]

View file

@ -402,8 +402,7 @@ class MachCommands(CommandBase):
self.ensure_clobbered()
ret = None
opts = []
opts += ["--manifest-path", self.cef_manifest()]
opts = ["-p", "embedding"]
if jobs is not None:
opts += ["-j", jobs]
@ -458,8 +457,7 @@ class MachCommands(CommandBase):
env = self.build_env(is_build=True, geckolib=True)
ret = None
opts = []
opts += ["--manifest-path", self.geckolib_manifest()]
opts = ["-p", "geckoservo"]
features = []
if jobs is not None:

View file

@ -94,7 +94,7 @@ class MachCommands(CommandBase):
'params', default=None, nargs='...',
help="Command-line arguments to be passed through to cargo check")
def check_geckolib(self, params):
return self.run_cargo(params, check=True, geckolib=True)
return self.run_cargo(["-p", "geckoservo"] + (params or []), check=True, geckolib=True)
@Command('cargo-update',
description='Same as update-cargo',