From 26a78817c1e5d720ed4923be984d962df2f6774f Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Thu, 7 Jul 2016 17:10:30 +0200 Subject: Make "./mach geckolib" use the stable Rust compiler --- python/servo/build_commands.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'python/servo/build_commands.py') diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 7a4dba41cfa..20c9bf28c6b 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -356,6 +356,7 @@ class MachCommands(CommandBase): action='store_true', help='Build in release mode') def build_geckolib(self, jobs=None, verbose=False, release=False): + self.set_use_stable_rust() self.ensure_bootstrapped() ret = None @@ -367,11 +368,12 @@ class MachCommands(CommandBase): if release: opts += ["--release"] - build_start = time() env = self.build_env() + env["CARGO_TARGET_DIR"] = path.join(self.context.topdir, "ports/geckolib/target") + + build_start = time() with cd(path.join("ports", "geckolib")): - ret = call(["cargo", "build"] + opts, - env=env, verbose=verbose) + ret = call(["cargo", "build"] + opts, env=env, verbose=verbose) elapsed = time() - build_start # Generate Desktop Notification if elapsed-time > some threshold value -- cgit v1.2.3 From 79ef0a5d7f4930b6b970d993a633db65b5ff7349 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Thu, 7 Jul 2016 17:11:03 +0200 Subject: Remove the "./mach build-stable" subcommand It is replaced by "./mach build-gecklibo" using stable Rust. --- python/servo/build_commands.py | 37 ------------------------------------- 1 file changed, 37 deletions(-) (limited to 'python/servo/build_commands.py') diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 20c9bf28c6b..a7cfbb57d8e 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -265,43 +265,6 @@ class MachCommands(CommandBase): print("Build completed in %s" % format_duration(elapsed)) return status - @Command('build-stable', - description='Build Servo using stable rustc', - category='build') - @CommandArgument('--target', '-t', - default=None, - help='Cross compile for given target platform') - @CommandArgument('--release', '-r', - action='store_true', - help='Build in release mode') - @CommandArgument('--dev', '-d', - action='store_true', - help='Build in development mode') - @CommandArgument('--jobs', '-j', - default=None, - help='Number of jobs to run in parallel') - @CommandArgument('--features', - default=None, - help='Space-separated list of features to also build', - nargs='+') - @CommandArgument('--android', - default=None, - action='store_true', - help='Build for Android') - @CommandArgument('--debug-mozjs', - default=None, - action='store_true', - help='Enable debug assertions in mozjs') - @CommandArgument('--verbose', '-v', - action='store_true', - help='Print verbose output') - @CommandArgument('params', nargs='...', - help="Command-line arguments to be passed through to Cargo") - def build_stable(self, target=None, release=False, dev=False, jobs=None, - features=None, android=None, verbose=False, debug_mozjs=False, params=None): - self.set_use_stable_rust() - self.build(target, release, dev, jobs, features, android, verbose, debug_mozjs, params) - @Command('build-cef', description='Build the Chromium Embedding Framework library', category='build') -- cgit v1.2.3 From 24575ff226301d54091851c6638e900835a7f72f Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Fri, 8 Jul 2016 14:36:36 +0200 Subject: Move ports/geckolib/target to target/geckolib --- python/servo/build_commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'python/servo/build_commands.py') diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index a7cfbb57d8e..0e7151e5efc 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -332,7 +332,7 @@ class MachCommands(CommandBase): opts += ["--release"] env = self.build_env() - env["CARGO_TARGET_DIR"] = path.join(self.context.topdir, "ports/geckolib/target") + env["CARGO_TARGET_DIR"] = path.join(self.context.topdir, "target", "geckolib") build_start = time() with cd(path.join("ports", "geckolib")): -- cgit v1.2.3