From a0ae81610d06ee58efe855260d190b2fa4e49db8 Mon Sep 17 00:00:00 2001
From: tigercosmos <b04209032@ntu.edu.tw>
Date: Wed, 25 Oct 2017 23:31:21 +0800
Subject: Print the full path for errors occurring in the servo crate

---
 python/servo/build_commands.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'python/servo/build_commands.py')

diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index ec20f18af5a..228e0f15049 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -176,12 +176,14 @@ class MachCommands(CommandBase):
     def build(self, target=None, release=False, dev=False, jobs=None,
               features=None, android=None, verbose=False, debug_mozjs=False, params=None,
               with_debug_assertions=False):
+
+        opts = params or []
+        opts += ["--manifest-path", self.servo_manifest()]
+
         if android is None:
             android = self.config["build"]["android"]
         features = features or self.servo_features()
 
-        opts = params or []
-
         base_path = self.get_target_dir()
         release_path = path.join(base_path, "release", "servo")
         dev_path = path.join(base_path, "debug", "servo")
@@ -318,8 +320,7 @@ class MachCommands(CommandBase):
         cargo_binary = "cargo" + BIN_SUFFIX
 
         status = call(
-            [cargo_binary, "build"] + opts,
-            env=env, cwd=self.servo_crate(), verbose=verbose)
+            [cargo_binary, "build"] + opts, env=env, verbose=verbose)
         elapsed = time() - build_start
 
         # Do some additional things if the build succeeded
@@ -384,6 +385,8 @@ class MachCommands(CommandBase):
 
         ret = None
         opts = []
+        opts += ["--manifest-path", self.cef_manifest()]
+
         if jobs is not None:
             opts += ["-j", jobs]
         if verbose:
@@ -407,10 +410,7 @@ class MachCommands(CommandBase):
             # common dependencies with the same flags.
             opts += ["--", "-C", "link-args=-Xlinker -undefined -Xlinker dynamic_lookup"]
 
-        with cd(path.join("ports", "cef")):
-            ret = call(["cargo", "rustc"] + opts,
-                       env=env,
-                       verbose=verbose)
+        ret = call(["cargo", "rustc"] + opts, env=env, verbose=verbose)
         elapsed = time() - build_start
 
         # Generate Desktop Notification if elapsed-time > some threshold value
@@ -441,20 +441,20 @@ class MachCommands(CommandBase):
 
         ret = None
         opts = []
+        opts += ["--manifest-path", self.geckolib_manifest()]
         features = []
+
         if jobs is not None:
             opts += ["-j", jobs]
         if verbose:
             opts += ["-v"]
         if release:
             opts += ["--release"]
-
         if features:
             opts += ["--features", ' '.join(features)]
 
         build_start = time()
-        with cd(path.join("ports", "geckolib")):
-            ret = call(["cargo", "build"] + opts, env=env, verbose=verbose)
+        ret = call(["cargo", "build"] + opts, env=env, verbose=verbose)
         elapsed = time() - build_start
 
         # Generate Desktop Notification if elapsed-time > some threshold value
-- 
cgit v1.2.3