Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 15:23:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make the choice of layout runtime setting

Browse source 
Co-authored-by: Samson <16504129+sagudev@users.noreply.github.com>
This commit is contained in:
Martin Robinson 2023-06-28 10:07:08 +02:00
parent f11c6045e3
commit d31cdb682f
No known key found for this signature in database
GPG key ID: D56AA4FA55EFE6F8
262 changed files with 1740 additions and 3700 deletions
Download patch file Download diff file Expand all files Collapse all files

9
python/servo/command_base.py
View file

@ -859,11 +859,6 @@ class CommandBase(object):
action='store_true',
help='Build with frame pointer enabled, used by the background hang monitor.',
),
CommandArgument(
'--with-layout-2020', '--layout-2020',
group="Feature Selection", default=None, action='store_true'),
CommandArgument(
'--with-layout-2013', '--layout-2013', group="Feature Selection", default=None, action='store_true'),
CommandArgument('--without-wgl', group="Feature Selection", default=None, action='store_true'),
]
@ -961,10 +956,6 @@ class CommandBase(object):
features.append("native-bluetooth")
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")
if with_frame_pointer:
env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C force-frame-pointers=yes"
features.append("profilemozjs")

12
python/servo/package_commands.py
View file

@ -502,11 +502,7 @@ class PackageCommands(CommandBase):
release = nightly_repo.get_release(github_release_id)
package_hash_fileobj = io.BytesIO(package_hash.encode('utf-8'))
if '2020' in platform:
asset_name = f'servo-latest.{extension}'
else:
asset_name = f'servo-latest-legacy-layout.{extension}'
asset_name = f'servo-latest.{extension}'
release.upload_asset(package, name=asset_name)
release.upload_asset_from_memory(
package_hash_fileobj,
@ -530,11 +526,7 @@ class PackageCommands(CommandBase):
BUCKET = 'servo-builds2'
DISTRIBUTION_ID = 'EJ8ZWSJKFCJS2'
if '2020' in platform:
nightly_dir = 'nightly/{}'.format(platform.replace('-layout2020', ''))
else:
nightly_dir = 'nightly/{}-legacy-layout'.format(platform)
nightly_dir = f'nightly/{platform}'
filename = nightly_filename(package, timestamp)
package_upload_key = '{}/{}'.format(nightly_dir, filename)
extension = path.basename(package).partition('.')[2]

6
python/wpt/run.py
View file

@ -100,8 +100,11 @@ def run_tests(**kwargs):
# TODO: Delete rr traces from green test runs?
prefs = kwargs.pop("prefs")
kwargs.setdefault("binary_args", [])
if prefs:
kwargs["binary_args"] = ["--pref=" + pref for pref in prefs]
kwargs["binary_args"] += ["--pref=" + pref for pref in prefs]
if not kwargs.get("layout_2020", False):
kwargs["binary_args"] += ["--legacy-layout"]
if not kwargs.get("no_default_test_types"):
test_types = {
@ -116,6 +119,7 @@ def run_tests(**kwargs):
raw_log_outputs = kwargs.get("log_raw", [])
wptcommandline.check_args(kwargs)
update_args_for_legacy_layout(kwargs)
mozlog.commandline.log_formatters["servo"] = (