Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Salt for mach bootstrap #14974

Merged
merged 5 commits into from Jan 20, 2017
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Next

Remove unusable --android flag for `mach bootstrap`

`mach` can't do any bootstrapping for Android, so the flag is useless.
  • Loading branch information
aneeshusa committed Jan 14, 2017
commit 5b8d783f4cb622fa68c5270b27ebad1e838ee7cb
@@ -136,17 +136,14 @@ def env(self):
@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 @@ def install_system_packages(self):
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 @@ def __init__(self, context):
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 @@ def install_system_packages(self, packages=deps):
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 @@ def install_system_packages(self, packages=deps):
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!')
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.