Skip to content

Commit 06a817e

Browse files
committed
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: rust-lang/cargo#4463 `workspace.default-members` was added in rust-lang/cargo#4743. Older Cargo versions ignore it.
1 parent 305a885 commit 06a817e

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ members = [
88

99
"ports/cef",
1010
]
11+
default-members = [
12+
"ports/servo",
13+
"tests/unit/*",
14+
]
1115
exclude = [".cargo"]
1216

1317
[profile.dev]

python/servo/build_commands.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -402,8 +402,7 @@ def build_cef(self, jobs=None, verbose=False, release=False,
402402
self.ensure_clobbered()
403403

404404
ret = None
405-
opts = []
406-
opts += ["--manifest-path", self.cef_manifest()]
405+
opts = ["-p", "embedding"]
407406

408407
if jobs is not None:
409408
opts += ["-j", jobs]
@@ -458,8 +457,7 @@ def build_geckolib(self, jobs=None, verbose=False, release=False):
458457
env = self.build_env(is_build=True, geckolib=True)
459458

460459
ret = None
461-
opts = []
462-
opts += ["--manifest-path", self.geckolib_manifest()]
460+
opts = ["-p", "geckoservo"]
463461
features = []
464462

465463
if jobs is not None:

python/servo/devenv_commands.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def check(self, params):
9494
'params', default=None, nargs='...',
9595
help="Command-line arguments to be passed through to cargo check")
9696
def check_geckolib(self, params):
97-
return self.run_cargo(params, check=True, geckolib=True)
97+
return self.run_cargo(["-p", "geckoservo"] + (params or []), check=True, geckolib=True)
9898

9999
@Command('cargo-update',
100100
description='Same as update-cargo',

0 commit comments

Comments
 (0)