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

Jump to bottom

Fix infoplist exclusivity / config inhertiance #618

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix infoplist exclusivity / config inhertiance #618

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 16 additions & 28 deletions rules/plists.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,38 +28,33 @@ def process_infoplists(name, infoplists, infoplists_by_build_setting, xcconfig,
# Final substituted infoplists_by_build_setting dict
substituted_infoplists_by_build_setting = {}

# Default infoplists are any defined in `infoplists` OR in `infoplists_by_build_setting` with the key `//conditions:default`
default_infoplists = infoplists_by_build_setting.pop("//conditions:default", infoplists)

# Default xcconfig is the one defined in `xcconfig` OR in `xcconfig_by_build_setting` with the key `//conditions:default`
default_xcconfig = xcconfig_by_build_setting.pop("//conditions:default", xcconfig)

# Substitute the default infoplists
substituted_infoplists_by_build_setting["//conditions:default"] = [
substituted_plist(
name = "_%s.%s.info" % (name, idx),
plist = plist,
xcconfig = default_xcconfig,
)
for idx, plist in enumerate(write_info_plists_if_needed(name = name, plists = default_infoplists))
]
# Default infoplists are any defined in `infoplists`
default_infoplists = infoplists if infoplists else []

# Default xcconfig is the one defined in `xcconfig`
default_xcconfig = xcconfig if xcconfig else {}

# Collect a set of config settings to iterate over
config_setting_names = sets.make(infoplists_by_build_setting.keys() + xcconfig_by_build_setting.keys())
merged_xcconfigs = {}
for config_setting_name in xcconfig_by_build_setting.keys():
xccconfig_for_build_setting = xcconfig_by_build_setting.get(config_setting_name, {})
merged_xcconfigs[config_setting_name] = merge_xcconfigs(default_xcconfig, xccconfig_for_build_setting)

# If someone hasn't specified "//conditions:default" - inject it there as upstream callers will `select` on this
if len(infoplists_by_build_setting.keys()) == 0:
infoplists_by_build_setting["//conditions:default"] = default_infoplists
Comment on lines +44 to +45
Copy link
Collaborator

Choose a reason for hiding this comment

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

I guess the confusing part is this differs from how xcconfig and xcconfig_by_build_setting work.

xcconfig gets merged into all the different ones but this seems to ignore infoplists entirely if infoplists_by_build_setting is set

Copy link
Collaborator

Choose a reason for hiding this comment

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

If we dont want users to use them both at the same time (cash doesn't use infoplists_by_build_setting at all) should we just fail instead?


# Substitute the infoplists_by_build_setting
for config_setting_name in sets.to_list(config_setting_names):
for config_setting_name in infoplists_by_build_setting.keys():
name_suffix = build_setting_name(config_setting_name)
infoplists_for_build_setting = infoplists_by_build_setting.get(config_setting_name, default_infoplists)
xccconfig_for_build_setting = xcconfig_by_build_setting.get(config_setting_name, {})
xcconfig_for_plist = merge_xcconfigs(default_xcconfig, xccconfig_for_build_setting)

# Substitute the build settings into the plists for this config_setting
substituted_infoplists_by_build_setting[config_setting_name] = [
substituted_plist(
name = "_%s.%s.%s.info" % (name, name_suffix, idx),
plist = plist,
xcconfig = xcconfig_for_plist,
xcconfig = select(merged_xcconfigs) if len(merged_xcconfigs.keys()) > 0 else None
)
for idx, plist in enumerate(write_info_plists_if_needed(name = "%s.%s" % (name, name_suffix), plists = infoplists_for_build_setting))
]
Expand Down Expand Up @@ -132,17 +127,10 @@ def _substitute_plist_vars(name, plist, xcconfig):
Returns:
The name of the substituted plist
"""

variables = {k: v for (k, v) in xcconfig.items() if types.is_string(v)}

if len(variables) == 0:
luispadron marked this conversation as resolved.
Show resolved Hide resolved
return None

substitute_build_settings(
name = name,
source = plist,
variables = variables,
variables = xcconfig,
tags = ["manual"],
)

return name