Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move alternate icon handling to input_files.collect #2521

Merged
merged 2 commits into from
Aug 29, 2023
Merged

Move alternate icon handling to input_files.collect #2521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acb244a
Move alternate icon handling to `input_files.collect`
brentleyjones Aug 28, 2023
d47d654
Merge branch 'main' into bj/move-alternate-icon-handling-to-input_fil…
brentleyjones Aug 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion xcodeproj/internal/input_files.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ def _collect_input_files(
for attr in automatic_target_info.hdrs:
file_handlers[attr] = _handle_hdrs_file
else:
# Turn source files into extra files for non-Xcode targets
# Turn source files into extra files for unsupported targets
for attr in automatic_target_info.srcs:
file_handlers[attr] = _handle_extrafiles_file
for attr in automatic_target_info.non_arc_srcs:
Expand All @@ -267,6 +267,10 @@ def _collect_input_files(
file_handlers[attr] = _handle_extrafiles_file
for attr in automatic_target_info.launchdplists:
file_handlers[attr] = _handle_extrafiles_file
if automatic_target_info.alternate_icons:
file_handlers[automatic_target_info.alternate_icons] = (
_handle_extrafiles_file
)
if automatic_target_info.entitlements:
file_handlers[automatic_target_info.entitlements] = (
_handle_entitlements_file
Expand Down
9 changes: 0 additions & 9 deletions xcodeproj/internal/top_level_targets.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,15 +247,6 @@ def process_top_level_target(

app_icon_info = app_icons.get_info(ctx, automatic_target_info)

if automatic_target_info.alternate_icons:
additional_files.extend(
getattr(
ctx.rule.files,
automatic_target_info.alternate_icons,
[],
),
)

infoplist = info_plists.adjust_for_xcode(
info_plists.get_file(target),
app_icon_info.default_icon_path if app_icon_info else None,
Expand Down