Skip to content

Commit

Permalink
Auto merge of #10616 - autrilla:10614, r=edunham
Browse files Browse the repository at this point in the history
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10616)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Apr 15, 2016
2 parents 44d7657 + 739410e commit 7c61523
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 8 deletions.
14 changes: 12 additions & 2 deletions python/servo/command_base.py
Expand Up @@ -103,6 +103,14 @@ def check_call(*args, **kwargs):
return subprocess.check_call(*args, shell=sys.platform == 'win32', **kwargs)


class BuildNotFound(Exception):
def __init__(self, message):
self.message = message

def __str__(self):
return self.message


class CommandBase(object):
"""Base class for mach command providers.
Expand Down Expand Up @@ -203,6 +211,8 @@ def get_target_dir(self):
return path.join(self.context.topdir, "target")

def get_binary_path(self, release, dev, android=False):
# TODO(autrilla): this function could still use work - it shouldn't
# handle quitting, or printing. It should return the path, or an error.
base_path = self.get_target_dir()

if android:
Expand All @@ -220,8 +230,8 @@ def get_binary_path(self, release, dev, android=False):
dev_exists = path.exists(dev_path)

if not release_exists and not dev_exists:
print("No Servo binary found. Please run './mach build' and try again.")
sys.exit()
raise BuildNotFound('No Servo binary found.'
' Perhaps you forgot to run `./mach build`?')

if release and release_exists:
return release_path
Expand Down
21 changes: 15 additions & 6 deletions python/servo/post_build_commands.py
Expand Up @@ -23,7 +23,7 @@
Command,
)

from servo.command_base import CommandBase, cd, call, check_call
from servo.command_base import CommandBase, cd, call, check_call, BuildNotFound


def read_file(filename, if_exists=False):
Expand Down Expand Up @@ -263,11 +263,20 @@ def package(self, release=False, dev=False, debug=False, debugger=None):
@CommandArgument('--dev', '-d', action='store_true',
help='Package the dev build')
def install(self, release=False, dev=False):
binary_path = self.get_binary_path(release, dev, android=True)
if not path.exists(binary_path):
# TODO: Run the build command automatically?
print("Servo build not found. Please run `./mach build` to compile Servo.")
return 1
try:
binary_path = self.get_binary_path(release, dev, android=True)
except BuildNotFound:
print("Servo build not found. Building servo...")
result = Registrar.dispatch(
"build", context=self.context, release=release, dev=dev
)
if result:
return result
try:
binary_path = self.get_binary_path(release, dev, android=True)
except BuildNotFound:
print("Rebuilding Servo did not solve the missing build problem.")
return 1

apk_path = binary_path + ".apk"
if not path.exists(apk_path):
Expand Down

0 comments on commit 7c61523

Please sign in to comment.