diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-03-02 19:06:51 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-03-02 19:06:51 -0700 |
| commit | 801b939479f359777c6ee68cd634da0f7c73984b (patch) | |
| tree | 39c8742620bf460054722e97a343ba070025e51e | |
| parent | 290b025f8992569ed98a8556b70d5ebafb57a154 (diff) | |
| parent | cb6c675b2e28e61237f2651ad0cff10e5aa137c5 (diff) | |
| download | servo-801b939479f359777c6ee68cd634da0f7c73984b.tar.gz servo-801b939479f359777c6ee68cd634da0f7c73984b.zip | |
auto merge of #5115 : psdh/servo/improveBinRun, r=mbrubeck
Fixes #5080
| -rw-r--r-- | python/servo/post_build_commands.py | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/python/servo/post_build_commands.py b/python/servo/post_build_commands.py index b28ef968091..495348c8269 100644 --- a/python/servo/post_build_commands.py +++ b/python/servo/post_build_commands.py @@ -8,6 +8,7 @@ import subprocess import SimpleHTTPServer import SocketServer import mozdebug +import sys from shutil import copytree, rmtree, ignore_patterns, copy2 from mach.registrar import Registrar @@ -33,8 +34,22 @@ class MachCommands(CommandBase): def get_binary_path(self, release): base_path = path.join("components", "servo", "target") - if release: - return path.join(base_path, "release", "servo") + release_path= path.join(base_path, "release", "servo") + + if not release: + if not os.path.exists(release_path): + if not os.path.exists(base_path): + print("Servo Binary cannot be found, please run './mach build'" + "and try again!") + sys.exit() + print("Running Debug Build") + return path.join(base_path, "servo") + else: + if os.path.exists(base_path): + print("You have multiple binaries present." + " Please specify which binary is to be run") + sys.exit() + return path.join(release_path, "servo") return path.join(base_path, "servo") @Command('run', |