servo: Merge #8176 - Added support for using --features argument with --android (from nxnfufunezn:features-argument); r=mbrubeck

Fixes #8173
r? @mbrubeck

Source-Repo: https://github.com/servo/servo
Source-Revision: d8cb2762af389309ff9684f04194e4773ce33c3e
This commit is contained in:
nxnfufunezn 2015-10-30 22:24:40 +05:01
Родитель bf6b560a23
Коммит 40fb652360
1 изменённых файлов: 6 добавлений и 2 удалений

Просмотреть файл

@ -137,6 +137,10 @@ class MachCommands(CommandBase):
@CommandArgument('--jobs', '-j', @CommandArgument('--jobs', '-j',
default=None, default=None,
help='Number of jobs to run in parallel') help='Number of jobs to run in parallel')
@CommandArgument('--features',
default=None,
help='Space-separated list of features to also build',
nargs='+')
@CommandArgument('--android', @CommandArgument('--android',
default=None, default=None,
action='store_true', action='store_true',
@ -151,12 +155,12 @@ class MachCommands(CommandBase):
@CommandArgument('params', nargs='...', @CommandArgument('params', nargs='...',
help="Command-line arguments to be passed through to Cargo") help="Command-line arguments to be passed through to Cargo")
def build(self, target=None, release=False, dev=False, jobs=None, def build(self, target=None, release=False, dev=False, jobs=None,
android=None, verbose=False, debug_mozjs=False, params=None): features=None, android=None, verbose=False, debug_mozjs=False, params=None):
if android is None: if android is None:
android = self.config["build"]["android"] android = self.config["build"]["android"]
features = features or []
opts = params or [] opts = params or []
features = []
base_path = self.get_target_dir() base_path = self.get_target_dir()
release_path = path.join(base_path, "release", "servo") release_path = path.join(base_path, "release", "servo")