diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2017-11-30 16:52:08 +0100 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2017-12-07 13:50:10 +0100 |
| commit | 1f2b66e2d77ffbe75f9d7487db0b90fa724c4692 (patch) | |
| tree | 82c657683f9d03a9975f1ed986ea19e969f25158 /python/servo | |
| parent | 2a5c4133f9da508949e875ed41b60a2d041e17c7 (diff) | |
| download | servo-1f2b66e2d77ffbe75f9d7487db0b90fa724c4692.tar.gz servo-1f2b66e2d77ffbe75f9d7487db0b90fa724c4692.zip | |
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.
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/build_commands.py | 6 | ||||
| -rw-r--r-- | python/servo/devenv_commands.py | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 2ec27f00364..ea6ddca8725 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -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: diff --git a/python/servo/devenv_commands.py b/python/servo/devenv_commands.py index e6cb91bd20a..1ddba4af445 100644 --- a/python/servo/devenv_commands.py +++ b/python/servo/devenv_commands.py @@ -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', |