diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-12-17 09:00:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-17 09:00:08 -0500 |
| commit | a5844d5efd9135c0448ace252508bdce20e341c3 (patch) | |
| tree | af1cdce0cee40e47eb8f25c9959ea09a9277e5f6 /python/servo | |
| parent | 4458bc762c743da1e2c8b4821ac9f41c56546183 (diff) | |
| parent | d670b4420afbc6bc05a7c6bb77ca0f60e3f61595 (diff) | |
| download | servo-a5844d5efd9135c0448ace252508bdce20e341c3.tar.gz servo-a5844d5efd9135c0448ace252508bdce20e341c3.zip | |
Auto merge of #25304 - servo:with, r=jdm
Add `layout-2020` option to the `.servobuild` file
… and `--with-layout-2013` command-line option to disable it.
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/command_base.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 15ec195fd51..1a56777f14f 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -324,6 +324,7 @@ class CommandBase(object): self.config["build"].setdefault("mode", "") self.config["build"].setdefault("debug-assertions", False) self.config["build"].setdefault("debug-mozjs", False) + self.config["build"].setdefault("layout-2020", False) self.config["build"].setdefault("ccache", "") self.config["build"].setdefault("rustflags", "") self.config["build"].setdefault("incremental", None) @@ -850,6 +851,7 @@ install them, let us know by filing a bug!") ), CommandArgument('--with-raqote', default=None, action='store_true'), CommandArgument('--with-layout-2020', default=None, action='store_true'), + CommandArgument('--with-layout-2013', default=None, action='store_true'), CommandArgument('--without-wgl', default=None, action='store_true'), ] @@ -888,7 +890,8 @@ install them, let us know by filing a bug!") env=None, verbose=False, target=None, android=False, magicleap=False, libsimpleservo=False, features=None, debug_mozjs=False, with_debug_assertions=False, - with_frame_pointer=False, with_raqote=False, with_layout_2020=False, without_wgl=False, + with_frame_pointer=False, with_raqote=False, without_wgl=False, + with_layout_2020=False, with_layout_2013=False, uwp=False, media_stack=None, ): env = env or self.build_env() @@ -928,7 +931,7 @@ install them, let us know by filing a bug!") features.append("canvas2d-raqote") elif "canvas2d-raqote" not in features: features.append("canvas2d-azure") - if with_layout_2020 and "layout-2013" not in features: + if with_layout_2020 or (self.config["build"]["layout-2020"] and not with_layout_2013): features.append("layout-2020") elif "layout-2020" not in features: features.append("layout-2013") |