Add a Target::BuildType to represent how a target is built #8232
Conversation
This file contains hidden or 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
8000
Here's an example of your CHANGELOG entry: * Add a Target::BuildType to represent how a target is built
[segiddins](https://github.com/segiddins)
[#issue_number](https://github.com/CocoaPods/CocoaPods/issues/issue_number)note: There are two invisible spaces after the entry's text. Generated by 🚫 Danger |
amorde
reviewed
Oct 30, 2018
| 'Pods-Sample Extensions Project/Release/matryoshka-Bar-Foo', | ||
| 'Pods-Sample Extensions Project/Release/monkey', | ||
| 'Pods-Today Extension/Release/matryoshka-Bar', |
paulb777
reviewed
Oct 30, 2018
spec/unit/target/build_settings/aggregate_target_settings_spec.rb
Outdated
Show resolved
Hide resolved
| @@ -713,7 +726,7 @@ def specs | |||
| @target.pod_targets.each { |pt| pt.spec_consumers.each { |sc| sc.stubs(:frameworks => %w(UIKit), :libraries => %w(z c++)) } } | |||
|
|
|||
| @xcconfig = @generator.generate | |||
| @xcconfig.to_hash['OTHER_LDFLAGS'].should == '$(inherited) -ObjC -l"c++" -l"z" -framework "UIKit"' | |||
There was a problem hiding this comment.
Because there are actually no pod targets, and thus no static binaries being linked!
dnkoutso
reviewed
Nov 9, 2018
dnkoutso
reviewed
Nov 9, 2018
| @@ -117,6 +117,9 @@ def search_for_exceptions(exception) | |||
| inspector = GhInspector::Inspector.new 'cocoapods', 'cocoapods' | |||
| message_delegate = UserInterface::InspectorReporter.new | |||
| inspector.search_exception exception, message_delegate | |||
| rescue => e | |||
There was a problem hiding this comment.
can we merge this in a different pr?
4f47830 to
183d6b4
Compare
paulb777
approved these changes
Nov 12, 2018
amorde
approved these changes
Nov 12, 2018
|
whoohooooo |
dnkoutso
reviewed
Nov 16, 2018
| @@ -211,7 +211,7 @@ def wire_target_dependencies(project, target_installation_results) | |||
| # First, wire up all resource bundles. | |||
| pod_target_installation_result.resource_bundle_targets.each do |resource_bundle_target| | |||
| native_target.add_dependency(resource_bundle_target) | |||
| if pod_target.requires_frameworks? && pod_target.should_build? | |||
| if pod_target.build_as_dynamic_framework? && pod_target.should_build? | |||
There was a problem hiding this comment.
I think this is not the same as it used to be before
There was a problem hiding this comment.
I confirmed that the static_framework pod with resources still works.
dnkoutso
reviewed
Nov 16, 2018
| @@ -205,7 +205,7 @@ def save_as(path) | |||
|
|
|||
| # @return [String] | |||
| define_build_settings_method :code_sign_identity, :build_setting => true do | |||
| return unless target.requires_frameworks? | |||
| return unless target.build_as_dynamic? | |||
There was a problem hiding this comment.
same here, I think this is not the same as it used to be before
dnkoutso
reviewed
Nov 16, 2018
| @@ -1022,7 +1024,7 @@ def other_swift_flags_without_swift? | |||
|
|
|||
| # @return [Array<String>] | |||
| define_build_settings_method :ld_runpath_search_paths, :build_setting => true, :memoized => true, :uniqued => true do | |||
| return unless target.requires_frameworks? || any_vendored_dynamic_artifacts? | |||
| return unless pod_targets.any?(&:build_as_dynamic?) || any_vendored_dynamic_artifacts? | |||
|
@paulb777 I think there are some entries here that are not the semantically the same as before. |
dnkoutso
reviewed
Nov 16, 2018
| @@ -86,7 +86,7 @@ def install! | |||
| end | |||
| end | |||
|
|
|||
| if target.requires_frameworks? | |||
| if target.build_as_dynamic_framework? | |||
There was a problem hiding this comment.
This is the old logic, but may need to change to eliminate warnings with the new build system.
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 th
2F0C
e 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.
This centralizes logic for static/dynamic library/framework in a single place, and will make future per-target configuration much easier.