mirror of
https://github.com/servo/servo.git
synced 2025-07-24 07:40:27 +01:00
Remove unusable --android flag for mach bootstrap
`mach` can't do any bootstrapping for Android, so the flag is useless.
This commit is contained in:
parent
2fb9a345d6
commit
5b8d783f4c
5 changed files with 4 additions and 23 deletions
|
@ -136,17 +136,14 @@ class MachCommands(CommandBase):
|
|||
@CommandArgument('--interactive', "-i",
|
||||
action='store_true',
|
||||
help='Need to answer any (Y/n) interactive prompts.')
|
||||
@CommandArgument('--android',
|
||||
action='store_true',
|
||||
help='Install required packages for Android')
|
||||
@CommandArgument('--force', '-f',
|
||||
action='store_true',
|
||||
help='Force reinstall packages')
|
||||
def bootstrap(self, android=False, interactive=False, force=False):
|
||||
def bootstrap(self, interactive=False, force=False):
|
||||
from servo.bootstrapper.bootstrap import Bootstrapper
|
||||
|
||||
bootstrapper = Bootstrapper(self.context)
|
||||
bootstrapper.bootstrap(android=android, interactive=interactive, force=force)
|
||||
bootstrapper.bootstrap(interactive=interactive, force=force)
|
||||
|
||||
@Command('bootstrap-rust',
|
||||
description='Download the Rust compiler',
|
||||
|
|
|
@ -29,14 +29,6 @@ class BaseBootstrapper(object):
|
|||
raise NotImplementedError('%s must implement install_system_packages()' %
|
||||
__name__)
|
||||
|
||||
def install_mobile_android_packages(self):
|
||||
'''
|
||||
Install packages required to build Servo for Android.
|
||||
'''
|
||||
raise NotImplementedError('Cannot bootstrap Servo for Android: '
|
||||
'%s does not yet implement install_mobile_android_packages()'
|
||||
% __name__)
|
||||
|
||||
def which(self, name):
|
||||
"""Python implementation of which.
|
||||
|
||||
|
|
|
@ -30,13 +30,11 @@ class Bootstrapper(object):
|
|||
self.instance = cls(**args)
|
||||
self.instance.context = context
|
||||
|
||||
def bootstrap(self, android=False, interactive=False, force=False):
|
||||
def bootstrap(self, interactive=False, force=False):
|
||||
self.instance.interactive = interactive
|
||||
self.instance.force = force
|
||||
|
||||
if android:
|
||||
self.instance.install_mobile_android_packages()
|
||||
elif force:
|
||||
if force:
|
||||
self.instance.install_system_packages()
|
||||
else:
|
||||
self.instance.ensure_system_packages()
|
||||
|
|
|
@ -32,9 +32,6 @@ class WindowsGnuBootstrapper(BaseBootstrapper):
|
|||
self._ensure_package_manager_updated()
|
||||
self.pacman_install(*packages)
|
||||
|
||||
def install_mobile_android_packages(self):
|
||||
sys.exit('We do not support building Android on Windows. Sorry!')
|
||||
|
||||
def _update_package_manager(self):
|
||||
self.pacman_update()
|
||||
|
||||
|
|
|
@ -81,6 +81,3 @@ class WindowsMsvcBootstrapper(BaseBootstrapper):
|
|||
with open(installed_deps_file, 'w') as installed_file:
|
||||
for line in packages:
|
||||
installed_file.write(line + "\n")
|
||||
|
||||
def install_mobile_android_packages(self):
|
||||
sys.exit('We do not support building Android on Windows. Sorry!')
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue