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.

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

Fix resource bundle paths for improved deduplication #4954

Merged
merged 4 commits into from Feb 26, 2016

Conversation

mrackwitz
Copy link
Member

While #4146 fixed one problem described in #4872, it brought up another one. The paths in the CopyResourcesScript passed to the install_resource function for resource bundles are wrong.

mrackwitz added a commit that referenced this pull request Feb 26, 2016
mrackwitz added a commit that referenced this pull request Feb 26, 2016
mrackwitz added a commit to CocoaPods/cocoapods-integration-specs that referenced this pull request Feb 26, 2016
@segiddins
Copy link
Member

\c @efirestone

@mrackwitz
Copy link
Member Author

This changes the used base path variable from BUILT_PRODUCTS_DIR to CONFIGURATION_BUILD_DIR, while the documentation states:

Run Script build phases can use the value of this build setting as a convenient way to refer to the product files built by one or more targets even when these files are scattered throughout a directory hierarchy (for example, when DEPLOYMENT_LOCATION is set to YES.

But according to the documented value of the setting BUILT_PRODUCTS_DIR, it takes only a different value when RETAIN_RAW_BINARIES is also set to YES, what doesn't seem to have much practical relevance.

@segiddins
Copy link
Member

@efirestone
Copy link
Contributor

LGTM

mrackwitz added a commit that referenced this pull request Feb 26, 2016
Fix resource bundle paths for improved deduplication
@mrackwitz mrackwitz merged commit fdf990b into master Feb 26, 2016
@mrackwitz mrackwitz deleted the mr-fix-resource-bundles branch February 26, 2016 19:13
mrackwitz added a commit to CocoaPods/cocoapods-integration-specs that referenced this pull request Feb 26, 2016
@arifken
Copy link

arifken commented Mar 1, 2016

Thanks for fixing this! i've been running into this issue as well. looking forward to it in the next beta. 👍

@gcox
Copy link

gcox commented Mar 1, 2016

Not sure this is totally fixed. It did fix the path issue I was having with the 1PasswordExtension but it caused a new issue for the google-cast-sdk pod.

The path passed to install_resource for this pod is "$CONFIGURATION_BUILD_DIR/google-cast-sdk/CastFrameworkAssets.bundle" but the actual path is "$CONFIGURATION_BUILD_DIR/CastFrameworkAssets.bundle". Not sure if this is a bug in the generation of the path or placement of CastFrameworkAssets.bundle.

@segiddins
Copy link
Member

@gcox please open a new issue with a project that reproduces the issue

mrackwitz added a commit that referenced this pull request Mar 12, 2016
Targets use since #4954 individual build directories in all cases, not only these.
mrackwitz added a commit that referenced this pull request Mar 12, 2016
The behavior changed drastically with #4954, so that relying on this outside of this class was in most cases wrong.
@ngutman ngutman mentioned this pull request Mar 30, 2016
efirestone pushed a commit to efirestone/CocoaPods that referenced this pull request May 17, 2016
efirestone pushed a commit to efirestone/CocoaPods that referenced this pull request May 17, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants