diff options
| author | Anthony Ramine <n.oxyde@gmail.com> | 2016-11-27 19:10:09 +0100 |
|---|---|---|
| committer | Anthony Ramine <n.oxyde@gmail.com> | 2016-11-28 09:44:20 +0100 |
| commit | dfb35db6d3971e041e3f56fcc5ce665889058cad (patch) | |
| tree | eb161343dfbe124bb2cb549aa49a98525fd6f943 /python | |
| parent | 7d69f53794c9f823d524d0d4382c04c4a57bea65 (diff) | |
| download | servo-dfb35db6d3971e041e3f56fcc5ce665889058cad.tar.gz servo-dfb35db6d3971e041e3f56fcc5ce665889058cad.zip | |
Move to Cargo workspaces
Diffstat (limited to 'python')
| -rw-r--r-- | python/servo/command_base.py | 2 | ||||
| -rw-r--r-- | python/servo/devenv_commands.py | 20 | ||||
| -rw-r--r-- | python/tidy/servo_tidy/tidy.py | 2 |
3 files changed, 7 insertions, 17 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index d277bff55ae..8e239df8737 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -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" % \ diff --git a/python/servo/devenv_commands.py b/python/servo/devenv_commands.py index 665d8f3c798..e2acab9b979 100644 --- a/python/servo/devenv_commands.py +++ b/python/servo/devenv_commands.py @@ -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.', diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py index 005a1bed24a..18bfcb6713e 100644 --- a/python/tidy/servo_tidy/tidy.py +++ b/python/tidy/servo_tidy/tidy.py @@ -359,6 +359,8 @@ def check_toml(file_name, lines): raise StopIteration ok_licensed = False for idx, line in enumerate(lines): + if idx == 0 and "[workspace]" in line: + raise StopIteration if line.find("*") != -1: yield (idx + 1, "found asterisk instead of minimum version number") for license_line in licenses_toml: |