Merge pull request #4341 from layerhq/coleman-vendored-static-linking-patch

[XCConfig Helper] Only link dynamic vendored frameworks and libraries

lib/cocoapods/generator/xcconfig/xcconfig_helper.rb

@@ -52,11 +52,12 @@ module Pod
         def self.add_settings_for_file_accessors_of_target(target, xcconfig)
           target.file_accessors.each do |file_accessor|
             XCConfigHelper.add_spec_build_settings_to_xcconfig(file_accessor.spec_consumer, xcconfig)
+            XCConfigHelper.add_static_dependency_build_settings(target, xcconfig, file_accessor)
           end
-          XCConfigHelper.add_vendored_dependency_build_settings(target, xcconfig)
+          XCConfigHelper.add_dynamic_dependency_build_settings(target, xcconfig)
         end
 
-        # Adds build settings for vendored frameworks and libraries.
+        # Adds build settings for static vendored frameworks and libraries.
         #
         # @param [PodTarget] target
         #        The pod target, which holds the list of +Spec::FileAccessor+.
@@ -64,19 +65,39 @@ module Pod
         # @param [Xcodeproj::Config] xcconfig
         #        The xcconfig to edit.
         #
-        def self.add_vendored_dependency_build_settings(target, xcconfig)
+        # @param [Spec::FileAccessor] file_accessor
+        #        The file accessor, which holds the list of static frameworks.
+        #
+        def self.add_static_dependency_build_settings(target, xcconfig, file_accessor)
+          file_accessor.vendored_static_frameworks.each do |vendored_static_framework|
+            XCConfigHelper.add_framework_build_settings(vendored_static_framework, xcconfig, target.sandbox.root)
+          end
+          file_accessor.vendored_static_libraries.each do |vendored_static_library|
+            XCConfigHelper.add_library_build_settings(vendored_static_library, xcconfig, target.sandbox.root)
+          end
+        end
+
+        # Adds build settings for dynamic vendored frameworks and libraries.
+        #
+        # @param [PodTarget] target
+        #        The pod target, which holds the list of +Spec::FileAccessor+.
+        #
+        # @param [Xcodeproj::Config] xcconfig
+        #        The xcconfig to edit.
+        #
+        def self.add_dynamic_dependency_build_settings(target, xcconfig)
           if target.requires_frameworks?
             target.dependent_targets.each do |dependent_target|
-              XCConfigHelper.add_vendored_dependency_build_settings(dependent_target, xcconfig)
+              XCConfigHelper.add_dynamic_dependency_build_settings(dependent_target, xcconfig)
             end
           end
 
           target.file_accessors.each do |file_accessor|
-            file_accessor.vendored_frameworks.each do |vendored_framework|
-              XCConfigHelper.add_framework_build_settings(vendored_framework, xcconfig, target.sandbox.root)
+            file_accessor.vendored_dynamic_frameworks.each do |vendored_dynamic_framework|
+              XCConfigHelper.add_framework_build_settings(vendored_dynamic_framework, xcconfig, target.sandbox.root)
             end
-            file_accessor.vendored_libraries.each do |vendored_library|
-              XCConfigHelper.add_library_build_settings(vendored_library, xcconfig, target.sandbox.root)
+            file_accessor.vendored_dynamic_libraries.each do |vendored_dynamic_library|
+              XCConfigHelper.add_library_build_settings(vendored_dynamic_library, xcconfig, target.sandbox.root)
             end
           end
         end

spec/fixtures/monkey/monkey.podspec

@@ -7,6 +7,8 @@ Pod::Spec.new do |s|
   s.homepage         = "http://httpbin.org/html"
   s.source           = { :git => "http://monkey.local/monkey.git", :tag => s.version.to_s }
   s.license          = 'MIT'
+
+  s.vendored_framework    = 'dynamic-monkey.framework'
   s.vendored_library      = 'monkey.a'
   s.public_header_files   = 'monkey.h'
 end

spec/unit/generator/xcconfig/aggregate_xcconfig_spec.rb

@@ -157,8 +157,8 @@ module Pod
               fixture_spec('monkey/monkey.podspec')
             end
 
-            it 'does not add the framework build path to the xcconfig' do
-              @xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS'].should.be.nil
+            it 'does add the framework build path to the xcconfig' do
+              @xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS'].should.not.be.nil
             end
 
             it 'configures the project to load all members that implement Objective-c classes or categories' do

spec/unit/generator/xcconfig/pod_xcconfig_spec.rb

@@ -7,7 +7,6 @@ module Pod
         describe 'in general' do
           before do
             @monkey_spec = fixture_spec('monkey/monkey.podspec')
-            @monkey_spec.vendored_framework = 'monkey.framework'
             @monkey_pod_target = fixture_pod_target(@monkey_spec)
 
             @spec = fixture_spec('banana-lib/BananaLib.podspec')
@@ -53,7 +52,11 @@ module Pod
           end
 
           it 'includes the vendored dynamic frameworks for dependecy pods of the specification' do
-            @xcconfig.to_hash['OTHER_LDFLAGS'].should.include('-framework "monkey"')
+            @xcconfig.to_hash['OTHER_LDFLAGS'].should.include('-framework "dynamic-monkey"')
+          end
+
+          it 'does not include vendored static frameworks for dependecy pods of the specification' do
+            @xcconfig.to_hash['OTHER_LDFLAGS'].should.not.include('-l"monkey.a"')
           end
 
           it 'does not configure the project to load all members that implement Objective-c classes or categories from the static library' do