Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 5 commits into from Dec 7, 2017
Prev

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 Dec 7, 2017
commit 1f2b66e2d77ffbe75f9d7487db0b90fa724c4692
@@ -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',
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.