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

mach: Fix cargo-geckolib check / cargo-geckolib build after #19476.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2017-12-09 20:44:55 +01:00
parent 5f4f355cea
commit f2314c10ca
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

27
python/servo/devenv_commands.py
View file

@ -29,22 +29,31 @@ from servo.util import STATIC_RUST_LANG_ORG_DIST, URLOPEN_KWARGS
@CommandProvider @CommandProvider
class MachCommands(CommandBase): class MachCommands(CommandBase):
def run_cargo(self, params, geckolib=False, check=False): def run_cargo(self, params, geckolib=False, check=False):
if geckolib: if not params:
self.set_use_stable_rust() params = []
crate_dir = path.join('ports', 'geckolib')
else:
crate_dir = path.join('ports', 'servo')
self.ensure_bootstrapped() self.ensure_bootstrapped()
self.ensure_clobbered() self.ensure_clobbered()
env = self.build_env(geckolib=geckolib) env = self.build_env(geckolib=geckolib)
if not params:
params = []
if check: if check:
params = ['check'] + params params = ['check'] + params
if geckolib:
# for c in $(cargo --list | tail -$(($(cargo --list | wc -l) - 1))); do
# (cargo help $c 2>&1 | grep "\\--package" >/dev/null 2>&1) && echo $c
# done
if params[0] and params[0] in [
'bench', 'build', 'check', 'clean', 'doc', 'fmt', 'pkgid',
'run', 'rustc', 'rustdoc', 'test', 'update',
]:
params[1:1] = ['--package', 'geckoservo']
self.set_use_stable_rust()
crate_dir = path.join('ports', 'geckolib')
else:
crate_dir = path.join('ports', 'servo')
build_start = time() build_start = time()
if self.context.topdir == getcwd(): if self.context.topdir == getcwd():
with cd(crate_dir): with cd(crate_dir):
@ -94,7 +103,7 @@ class MachCommands(CommandBase):
'params', default=None, nargs='...', 'params', default=None, nargs='...',
help="Command-line arguments to be passed through to cargo check") help="Command-line arguments to be passed through to cargo check")
def check_geckolib(self, params): def check_geckolib(self, params):
return self.run_cargo(["-p", "geckoservo"] + (params or []), check=True, geckolib=True) return self.run_cargo(params, check=True, geckolib=True)
@Command('cargo-update', @Command('cargo-update',
description='Same as update-cargo', description='Same as update-cargo',