From 1f2b66e2d77ffbe75f9d7487db0b90fa724c4692 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Thu, 30 Nov 2017 16:52:08 +0100
Subject: [PATCH] Use workspace.default-members to specify default crates for
 'cargo build'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

… 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.
---
 Cargo.toml                      | 4 ++++
 python/servo/build_commands.py  | 6 ++----
 python/servo/devenv_commands.py | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 7c32ef6cf8ec..3bde2968df81 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,6 +8,10 @@ members = [
 
     "ports/cef",
 ]
+default-members = [
+    "ports/servo",
+    "tests/unit/*",
+]
 exclude = [".cargo"]
 
 [profile.dev]
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index 2ec27f00364c..ea6ddca87250 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -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:
diff --git a/python/servo/devenv_commands.py b/python/servo/devenv_commands.py
index e6cb91bd20a8..1ddba4af4452 100644
--- a/python/servo/devenv_commands.py
+++ b/python/servo/devenv_commands.py
@@ -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',