Fix resource bundle's CFBundleName #728
Merged
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
jszumski
commented
Jun 2, 2023
| @@ -121,7 +121,7 @@ def _precompiled_apple_resource_bundle_impl(ctx): | |||
| control_files = [] | |||
| input_files = [] | |||
| output_files = [] | |||
| output_bundle_dir = ctx.actions.declare_directory(paths.join(ctx.attr.name, bundle_name + ".bundle")) | |||
| output_bundle_dir = ctx.actions.declare_directory(paths.join(ctx.attr.name, bundle_name + ctx.attr.bundle_extension)) | |||
There was a problem hiding this comment.
This wasn't a functional change but seemed appropriate if the attribute exists already
| @@ -252,7 +252,7 @@ _precompiled_apple_resource_bundle = rule( | |||
| ), | |||
| bundle_extension = attr.string( | |||
| mandatory = False, | |||
| default = "bundle", | |||
| default = ".bundle", | |||
There was a problem hiding this comment.
Without the leading period this call to paths.replace_extension in rules_apple fails to remove the extension:
bundle_name_with_extension = bundle_name + bundle_extension
product_name = paths.replace_extension(bundle_name_with_extension, "")
# Values for string replacement substitutions to perform in the merged
# Info.plist
substitutions = {
"BUNDLE_NAME": bundle_name_with_extension,
"PRODUCT_NAME": product_name,
}
luispadron
approved these changes
Jun 2, 2023
mattrobmattrob
approved these changes
Jun 2, 2023
thiagohmcruz
approved these changes
Jun 2, 2023
jerrymarino
approved these changes
Jun 2, 2023
… incorrectly included the bundle extension
jszumski
force-pushed
the
jszumski/fix-bundle-product-name
branch
from
1c8aea9
to
3f45612
Compare
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.
Fix issue where a resource bundle's Info.plist value for
CFBundleNameincorrectly included the bundle extension.In the generated plist: