Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #25304 - servo:with, r=jdm

Browse source 
Add `layout-2020` option to the `.servobuild` file

… and `--with-layout-2013` command-line option to disable it.
This commit is contained in:
bors-servo 2019-12-17 09:00:08 -05:00 • committed by GitHub
commit a5844d5efd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
python/servo/command_base.py
View file

@ -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")

3
servobuild.example
View file

@ -43,6 +43,9 @@ webgl-backtrace = false
# that triggered it.
dom-backtrace = false
# Default to the “2020” implementation of CSS layout instead of the “2013” one.
layout-2020 = false
# Set to the path to your ccache binary to enable caching of compiler outputs
#ccache = "/usr/local/bin/ccache"