diff options
| author | Martin Robinson <mrobinson@igalia.com> | 2023-06-28 10:07:08 +0200 |
|---|---|---|
| committer | Martin Robinson <mrobinson@igalia.com> | 2023-07-06 14:49:24 +0200 |
| commit | d31cdb682f717d6dbdbd57d60855fd92d822cd66 (patch) | |
| tree | 6dbb0c6007b545835a119bdf8e78cb5a665afa34 /python/servo | |
| parent | f11c6045e33a921f03223c313781586189309bd2 (diff) | |
| download | servo-d31cdb682f717d6dbdbd57d60855fd92d822cd66.tar.gz servo-d31cdb682f717d6dbdbd57d60855fd92d822cd66.zip | |
Make the choice of layout runtime setting
Co-authored-by: Samson <16504129+sagudev@users.noreply.github.com>
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/command_base.py | 9 | ||||
| -rw-r--r-- | python/servo/package_commands.py | 12 |
2 files changed, 2 insertions, 19 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 9faf325f4a7..afc0856767a 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -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") diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py index d0e7d84a67a..b9c70a22f50 100644 --- a/python/servo/package_commands.py +++ b/python/servo/package_commands.py @@ -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] |