ScmRevGen: Don't generate Info.plist files directly #13210
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ifying the bundle path ourselves
|
Since you seem to be merging in place, how does PlistBuddy Merge handle the case when the key already exists in the plist? |
Some generators (like Unix Makefiles and Xcode) copy an app's Info.plist at configure time. This causes a problem when we need to generate the Info.plist at build time, like how we currently do it with ScmRevGen. Instead of generating the Info.plist directly in ScmRevGen, provide an Info.plist without any version information to CMake at configure time, have ScmRevGen generate a separate plist file with the version information at build time, and then merge the two together to create the final Info.plist.
OatmealDome
force-pushed
the
fix-scmrevgen
branch
from
59e1fdf to
e05b033
Compare
|
When I was testing it, I think that the base Info.plist was being re-copied on every build so there weren't any duplicate keys. I've went ahead and added some protection against duplicate keys just in case, though. |
TellowKrinkle
approved these changes
Dec 6, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some generators (like
Unix MakefilesandXcode) copy an app'sInfo.plistat configure time. This causes a problem when we need to generate theInfo.plistat build time, like how we currently do it with ScmRevGen.Instead of generating the
Info.plistdirectly in ScmRevGen, provide anInfo.plistwithout any version information to CMake at configure time, have ScmRevGen generate a separate plist file with the version information at build time, and then merge the two together to create the finalInfo.plist.Fixes https://bugs.dolphin-emu.org/issues/13669.
(This PR also includes a bonus fix for codesigning in Xcode.)