Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-19 14:48:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #14381 - servo:workspaces, r=SimonSapin

Browse source 
Move to Cargo workspaces

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14381)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-11-28 01:44:40 -08:00 • committed by GitHub
commit eb7032f6dd
9 changed files with 130 additions and 3812 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python/servo/command_base.py
View file

@ -427,8 +427,6 @@ class CommandBase(object):
env["CARGO_HOME"] = self.config["tools"]["cargo-home-dir"]
env["CARGO_TARGET_DIR"] = path.join(self.context.topdir, "target")
if extra_lib:
if sys.platform == "darwin":
env["DYLD_LIBRARY_PATH"] = "%s%s%s" % \

20
python/servo/devenv_commands.py
View file

@ -21,12 +21,6 @@ from mach.decorators import (
from servo.command_base import CommandBase, cd, call
CARGO_PATHS = [
path.join('ports', 'cef'),
path.join('ports', 'geckolib'),
path.join('ports', 'servo'),
]
@CommandProvider
class MachCommands(CommandBase):
@ -89,11 +83,9 @@ class MachCommands(CommandBase):
self.ensure_bootstrapped()
for cargo_path in CARGO_PATHS:
with cd(cargo_path):
print(cargo_path)
call(["cargo", "update"] + params,
env=self.build_env())
with cd(self.context.topdir):
call(["cargo", "update"] + params,
env=self.build_env())
@Command('clippy',
description='Run Clippy',
@ -165,10 +157,8 @@ class MachCommands(CommandBase):
self.ensure_bootstrapped()
# Fetch Cargo dependencies
for cargo_path in CARGO_PATHS:
with cd(cargo_path):
print(cargo_path)
call(["cargo", "fetch"], env=self.build_env())
with cd(self.context.topdir):
call(["cargo", "fetch"], env=self.build_env())
@Command('wptrunner-upgrade',
description='upgrade wptrunner.',