Skip to content

servoshell: Delete duplicate Info.plist#42955

Merged
jschwe merged 4 commits into
servo:mainfrom
jschwe:jschwender/delete_duplicate_file
Mar 3, 2026
Merged

servoshell: Delete duplicate Info.plist#42955
jschwe merged 4 commits into
servo:mainfrom
jschwe:jschwender/delete_duplicate_file

Conversation

@jschwe
Copy link
Copy Markdown
Member

@jschwe jschwe commented Mar 2, 2026

We had two Info.plist files. The maintained one is in the root directory of this repository.
There is no reason for two plist files, so remove the unmaintained one.
Additionally, we also move the maintained version from the root directory to the servoshell directory.

Testing: We don't test the contents of the plist file.

We had two `Info.plist` files. The maintained one is in the root
directory of this repository.
I don't see a reason why we need two plist files, so remove the
unmaintained one.

Signed-off-by: Jonathan Schwender <[email protected]>
@servo-highfive servo-highfive added the S-awaiting-review There is new code that needs to be reviewed. label Mar 2, 2026
Comment thread ports/servoshell/platform/macos/mod.rs Outdated
#[unsafe(link_section = "__TEXT,__info_plist")]
#[unsafe(no_mangle)]
pub static INFO_PLIST: [u8; 619] = *include_bytes!("Info.plist");
pub static INFO_PLIST: [u8; 924] = *include_bytes!("../../../../Info.plist");
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I have a slight preference for storing the Info.plist in the servoshell subdirectory. If we ever ship another binary, I probably doesn't make sense to share a plist file.

jschwe added 2 commits March 2, 2026 18:11
Signed-off-by: Jonathan Schwender <[email protected]>
Signed-off-by: Jonathan Schwender <[email protected]>
Copy link
Copy Markdown
Member

@mrobinson mrobinson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@servo-highfive servo-highfive removed the S-awaiting-review There is new code that needs to be reviewed. label Mar 2, 2026
@TimvdLippe TimvdLippe enabled auto-merge March 2, 2026 17:24
Signed-off-by: Jonathan Schwender <[email protected]>
@servo-highfive servo-highfive added the S-awaiting-review There is new code that needs to be reviewed. label Mar 3, 2026
@TimvdLippe TimvdLippe added this pull request to the merge queue Mar 3, 2026
@servo-highfive servo-highfive added the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Mar 3, 2026
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Mar 3, 2026
@servo-highfive servo-highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Mar 3, 2026
@jschwe jschwe added this pull request to the merge queue Mar 3, 2026
@servo-highfive servo-highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-tests-failed The changes caused existing tests to fail. labels Mar 3, 2026
Merged via the queue into servo:main with commit 4e44e36 Mar 3, 2026
39 checks passed
@jschwe jschwe deleted the jschwender/delete_duplicate_file branch March 3, 2026 16:54
@servo-highfive servo-highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Mar 3, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-awaiting-review There is new code that needs to be reviewed.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants