Permalink
Browse files

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

…ild'

… 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:
rust-lang/cargo#4463

`workspace.default-members` was added in
rust-lang/cargo#4743.
Older Cargo versions ignore it.
  • Loading branch information...
SimonSapin committed Nov 30, 2017
1 parent b16f888 commit 99c3df7e1bbf472103306fc2623b84d93a2e3d70
Showing with 7 additions and 5 deletions.
  1. +4 −0 Cargo.toml
  2. +2 −4 python/servo/build_commands.py
  3. +1 −1 python/servo/devenv_commands.py
View
@@ -8,6 +8,10 @@ members = [
"ports/cef",
]
default-members = [
"ports/servo",
"tests/unit/*",
]
exclude = [".cargo"]
[profile.dev]
@@ -402,8 +402,7 @@ def build_cef(self, jobs=None, verbose=False, release=False,
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 @@ def build_geckolib(self, jobs=None, verbose=False, release=False):
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:
@@ -94,7 +94,7 @@ def check(self, params):
'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',

0 comments on commit 99c3df7

Please sign in to comment.