diff options
| -rwxr-xr-x | commands/build | 14 | ||||
| -rwxr-xr-x | commands/check | 12 | ||||
| -rwxr-xr-x | commands/pull | 11 | ||||
| -rwxr-xr-x | commands/run | 7 | ||||
| -rw-r--r-- | devbot/build.py | 6 | ||||
| -rw-r--r-- | devbot/clean.py | 10 |
6 files changed, 43 insertions, 17 deletions
diff --git a/commands/build b/commands/build index da62f82..9d8b51b 100755 --- a/commands/build +++ b/commands/build @@ -6,6 +6,7 @@ import sys import common from devbot import build +from devbot import system parser = argparse.ArgumentParser() parser.add_argument("module", nargs="?", help="name of the module to build") @@ -15,9 +16,14 @@ args = parser.parse_args() common.setup(log_name="build") if args.module: - success = build.build_one(args.module) + if not build.build_one(args.module): + sys.exit(1) else: - success = build.build(full=args.full) + if not system.check(lazy=True): + sys.exit(1) -if not success: - sys.exit(1) + if not build.pull(lazy=True): + sys.exit(1) + + if not build.build(full=args.full): + sys.exit(1) diff --git a/commands/check b/commands/check index ff4ac32..a283940 100755 --- a/commands/check +++ b/commands/check @@ -96,9 +96,17 @@ os.environ["SUGAR_PROFILE"] = "uitests" os.environ["GTK_MODULES"] = "gail:atk-bridge" if args.module: - check.check_one(args.module) + if not check.check_one(args.module): + sys.exit(1) else: - print "\n= Checking =\n" + if not system.check(lazy=True): + sys.exit(1) + + if not build.pull(lazy=True): + sys.exit(1) + + if not build.build(): + sys.exit(1) _check_devbot() diff --git a/commands/pull b/commands/pull index cca1ff2..7314278 100755 --- a/commands/pull +++ b/commands/pull @@ -6,6 +6,7 @@ import sys import common from devbot import build +from devbot import system parser = argparse.ArgumentParser() parser.add_argument("module", nargs="?", help="name of the module to pull") @@ -14,9 +15,11 @@ args = parser.parse_args() common.setup(log_name="pull") if args.module: - success = build.pull_one(args.module) + if not build.pull_one(args.module): + sys.exit(1) else: - success = build.pull() + if not system.check(lazy=True): + sys.exit(1) -if not success: - sys.exit(1) + if not build.pull(): + sys.exit(1) diff --git a/commands/run b/commands/run index e66eaf4..e3f311a 100755 --- a/commands/run +++ b/commands/run @@ -6,9 +6,16 @@ import common from devbot import run from devbot import build +from devbot import system common.setup(log_name="run") +if not system.check(lazy=True): + sys.exit(1) + +if not build.pull(lazy=True): + sys.exit(1) + if not build.build(): sys.exit(1) diff --git a/devbot/build.py b/devbot/build.py index 95652b5..c1a1756 100644 --- a/devbot/build.py +++ b/devbot/build.py @@ -53,8 +53,8 @@ def pull(lazy=False): def build(full=False): if full or state.full_build_is_required(): - state.clean(build_only=True) - clean() + from devbot import clean + clean.clean(build_only=True) state.full_build_touch() @@ -95,8 +95,6 @@ def distribute(): def clean(): - print "\n= Clean =\n" - print "* Emptying install directory" _empty_dir(config.install_dir) diff --git a/devbot/clean.py b/devbot/clean.py index 7601382..8d0c7a0 100644 --- a/devbot/clean.py +++ b/devbot/clean.py @@ -3,7 +3,11 @@ from devbot import logs from devbot import state -def clean(): +def clean(build_only=False): + print "\n= Clean =\n" + build.clean() - logs.clean() - state.clean() + state.clean(build_only=build_only) + + if not build_only: + logs.clean() |