cocoapods 0.20.2 → 0.21.0.rc1

data/lib/cocoapods/installer/analyzer.rb

@@ -51,10 +51,11 @@ module Pod
         @result.podfile_state = generate_podfile_state
         @locked_dependencies  = generate_version_locking_dependencies
 
-        @result.libraries       = generated_libraries
+        compute_target_platforms
         fetch_external_sources if allow_fetches
         @result.specs_by_target = resolve_dependencies
         @result.specifications  = generate_specifications
+        @result.targets         = generate_targets
         @result.sandbox_state   = generate_sandbox_state
         @result
       end
@@ -158,44 +159,40 @@ module Pod
 
       # Creates the models that represent the libraries generated by CocoaPods.
       #
-      # @note   The libraries are generated before the resolution process
-      #         because it might be necessary to infer the platform from the
-      #         user targets, which in turns requires to identify the user
-      #         project.
-      #
-      # @note   The specification of the libraries are added in the
-      #         {#resolve_dependencies} step.
-      #
       # @return [Array<Libraries>] the generated libraries.
       #
-      def generated_libraries
-        libraries = []
-        podfile.target_definition_list.each do |target_definition|
-          lib = Library.new(target_definition)
-          lib.support_files_root = sandbox.library_support_files_dir(lib.name)
+      def generate_targets
+        targets = []
+        result.specs_by_target.each do |target_definition, specs|
+          target = AggregateTarget.new(target_definition, sandbox)
+          targets << target
 
           if config.integrate_targets?
             project_path = compute_user_project_path(target_definition)
             user_project = Xcodeproj::Project.new(project_path)
-            targets = compute_user_project_targets(target_definition, user_project)
+            native_targets = compute_user_project_targets(target_definition, user_project)
 
-            lib.user_project_path = project_path
-            lib.client_root = project_path.dirname
-            lib.user_target_uuids = targets.map(&:uuid)
-            lib.user_build_configurations = compute_user_build_configurations(target_definition, targets)
-            lib.platform = compute_platform_for_target_definition(target_definition, targets)
+            target.user_project_path = project_path
+            target.client_root = project_path.dirname
+            target.user_target_uuids = native_targets.map(&:uuid)
+            target.user_build_configurations = compute_user_build_configurations(target_definition, native_targets)
           else
-            unless target_definition.platform
-              raise Informative, "It is necessary to specify the platform in the Podfile if not integrating."
-            end
-            lib.client_root = config.installation_root
-            lib.user_target_uuids = []
-            lib.user_build_configurations = {}
-            lib.platform = target_definition.platform
+            target.client_root = config.installation_root
+            target.user_target_uuids = []
+            target.user_build_configurations = {}
+          end
+
+          grouped_specs = specs.map do |spec|
+            specs.select { |s| s.root == spec.root }
+          end.uniq
+
+          grouped_specs.each do |pod_specs|
+            pod_target = PodTarget.new(pod_specs, target_definition, sandbox)
+            pod_target.user_build_configurations = target.user_build_configurations
+            target.pod_targets << pod_target
           end
-          libraries << lib
         end
-        libraries
+        targets
       end
 
       # Generates dependencies that require the specific version of the Pods
@@ -263,8 +260,6 @@ module Pod
 
       # Converts the Podfile in a list of specifications grouped by target.
       #
-      # @note   In this step the specs are added to the libraries.
-      #
       # @note   As some dependencies might have external sources the resolver
       #         is aware of the {Sandbox} and interacts with it to download the
       #         podspecs of the external sources. This is necessary because the
@@ -284,17 +279,10 @@ module Pod
       #
       def resolve_dependencies
         specs_by_target = nil
-
         UI.section "Resolving dependencies of #{UI.path podfile.defined_in_file}" do
           resolver = Resolver.new(sandbox, podfile, locked_dependencies)
           specs_by_target = resolver.resolve
         end
-
-        specs_by_target.each do |target_definition, specs|
-          lib = result.libraries.find { |l| l.target_definition == target_definition}
-          lib.specs = specs
-        end
-
         specs_by_target
       end
 
@@ -449,6 +437,29 @@ module Pod
         Platform.new(name, deployment_target)
       end
 
+      # Precompute the platforms for each target_definition in the Podfile
+      #
+      # @note The platforms are computed and added to each target_definition
+      #       because it might be necessary to infer the platform from the
+      #       user targets.
+      #
+      # @return [void]
+      #
+      def compute_target_platforms
+        podfile.target_definition_list.each do |target_definition|
+          if config.integrate_targets?
+            project_path = compute_user_project_path(target_definition)
+            user_project = Xcodeproj::Project.new(project_path)
+            targets = compute_user_project_targets(target_definition, user_project)
+            platform = compute_platform_for_target_definition(target_definition, targets)
+          else
+            unless target_definition.platform
+              raise Informative, "It is necessary to specify the platform in the Podfile if not integrating."
+            end
+          end
+        end
+      end
+
       #-----------------------------------------------------------------------#
 
       class AnalysisResult
@@ -472,10 +483,10 @@ module Pod
         #
         attr_accessor :sandbox_state
 
-        # @return [Array<Library>] the libraries generated by the target
-        #         definitions.
+        # @return [Array<Target>] The Podfile targets containing library
+        #         dependencies.
         #
-        attr_accessor :libraries
+        attr_accessor :targets
 
       end
 

data/lib/cocoapods/installer/file_references_installer.rb

@@ -107,18 +107,19 @@ module Pod
       #
       def link_headers
         UI.message "- Linking headers" do
-
-          file_accessors.each do |file_accessor|
-            headers_sandbox = Pathname.new(file_accessor.spec.root.name)
-            sandbox.build_headers.add_search_path(headers_sandbox)
-            sandbox.public_headers.add_search_path(headers_sandbox)
-
-            header_mappings(headers_sandbox, file_accessor, file_accessor.headers).each do |namespaced_path, files|
-              sandbox.build_headers.add_files(namespaced_path, files)
-            end
-
-            header_mappings(headers_sandbox, file_accessor, file_accessor.public_headers).each do |namespaced_path, files|
-              sandbox.public_headers.add_files(namespaced_path, files)
+          libraries.each do |library|
+            library.file_accessors.each do |file_accessor|
+              headers_sandbox = Pathname.new(file_accessor.spec.root.name)
+              library.build_headers.add_search_path(headers_sandbox)
+              sandbox.public_headers.add_search_path(headers_sandbox)
+
+              header_mappings(headers_sandbox, file_accessor, file_accessor.headers).each do |namespaced_path, files|
+                library.build_headers.add_files(namespaced_path, files)
+              end
+
+              header_mappings(headers_sandbox, file_accessor, file_accessor.public_headers).each do |namespaced_path, files|
+                sandbox.public_headers.add_files(namespaced_path, files)
+              end
             end
           end
         end

data/lib/cocoapods/installer/target_installer.rb

@@ -24,30 +24,10 @@ module Pod
         @library = library
       end
 
-      # Creates the target in the Pods project and the relative support files.
-      #
-      # @return [void]
-      #
-      def install!
-        UI.message "- Installing target `#{library.name}` #{library.platform}" do
-          add_target
-          add_files_to_build_phases
-          create_suport_files_group
-
-          create_xcconfig_file
-          create_target_environment_header
-          create_prefix_header
-          create_bridge_support_file
-          create_copy_resources_script
-          create_acknowledgements
-          create_dummy_source
-        end
-      end
+      private
 
       #-----------------------------------------------------------------------#
 
-      private
-
       # @!group Installation steps
 
       # Adds the target for the library to the Pods project with the
@@ -55,11 +35,6 @@ module Pod
       #
       # @note   The `PODS_HEADERS_SEARCH_PATHS` overrides the xcconfig.
       #
-      # @todo   CocoaPods 0.16 used to add the build configurations to the build
-      #         configuration list of the project (`root object`) as well with
-      #         an empty build settings. This behaviour was changed in 0.17.
-      #         Restore if needed.
-      #
       # @return [void]
       #
       def add_target
@@ -89,154 +64,13 @@ module Pod
         library.target = @target
       end
 
-      # Adds the build files of the pods to the target and adds a reference to
-      # the frameworks of the Pods.
-      #
-      # @note   The Frameworks are used only for presentation purposes as the
-      #         xcconfig is the authoritative source about their information.
-      #
-      # @return [void]
-      #
-      def add_files_to_build_phases
-        UI.message "- Adding Build files" do
-          library.file_accessors.each do |file_accessor|
-            consumer = file_accessor.spec_consumer
-            flags = compiler_flags_for_consumer(consumer)
-            source_files = file_accessor.source_files
-            file_refs = source_files.map { |sf| project.file_reference(sf) }
-            target.add_file_references(file_refs, flags)
-
-            file_accessor.spec_consumer.frameworks.each do |framework|
-              project.add_system_framework(framework, target)
-            end
-          end
-        end
-      end
-
       # Creates the group that holds the references to the support files
       # generated by this installer.
       #
       # @return [void]
       #
       def create_suport_files_group
-        name = target_definition.label
-        @support_files_group = project.support_files_group.new_group(name)
-      end
-
-      #--------------------------------------#
-
-      # Generates the contents of the xcconfig file and saves it to disk.
-      #
-      # @note   The `ALWAYS_SEARCH_USER_PATHS` flag is enabled to support
-      #         libraries like `EmbedReader`.
-      #
-      # @return [void]
-      #
-      def create_xcconfig_file
-        path = library.xcconfig_path
-        UI.message "- Generating xcconfig file at #{UI.path(path)}" do
-          gen = Generator::XCConfig.new(sandbox, spec_consumers, library.relative_pods_root)
-          gen.set_arc_compatibility_flag = target_definition.podfile.set_arc_compatibility_flag?
-          gen.save_as(path)
-          library.xcconfig = gen.xcconfig
-          xcconfig_file_ref = add_file_to_support_group(path)
-
-          target.build_configurations.each do |c|
-            c.base_configuration_reference = xcconfig_file_ref
-            Generator::XCConfig.pods_project_settings.each do |key, value|
-              c.build_settings[key] = value
-            end
-          end
-        end
-      end
-
-      # Generates a header which allows to inspect at compile time the installed
-      # pods and the installed specifications of a pod.
-      #
-      def create_target_environment_header
-        path = library.target_environment_header_path
-        UI.message "- Generating target environment header at #{UI.path(path)}" do
-          generator = Generator::TargetEnvironmentHeader.new(library.specs)
-          generator.save_as(path)
-          add_file_to_support_group(path)
-        end
-      end
-
-      # Creates a prefix header file which imports `UIKit` or `Cocoa` according
-      # to the platform of the target. This file also include any prefix header
-      # content reported by the specification of the pods.
-      #
-      # @return [void]
-      #
-      def create_prefix_header
-        path = library.prefix_header_path
-        UI.message "- Generating prefix header at #{UI.path(path)}" do
-          generator = Generator::PrefixHeader.new(library.file_accessors, library.platform)
-          generator.imports << library.target_environment_header_path.basename
-          generator.save_as(path)
-          add_file_to_support_group(path)
-
-          target.build_configurations.each do |c|
-            relative_path = path.relative_path_from(sandbox.root)
-            c.build_settings['GCC_PREFIX_HEADER'] = relative_path.to_s
-          end
-        end
-      end
-
-      # Generates the bridge support metadata if requested by the {Podfile}.
-      #
-      # @note   The bridge support metadata is added to the resources of the
-      #         library because it is needed for environments interpreted at
-      #         runtime.
-      #
-      # @return [void]
-      #
-      def create_bridge_support_file
-        if target_definition.podfile.generate_bridge_support?
-          path = library.bridge_support_path
-          UI.message "- Generating BridgeSupport metadata at #{UI.path(path)}" do
-            headers = target.headers_build_phase.files.map { |bf| sandbox.root + bf.file_ref.path }
-            generator = Generator::BridgeSupport.new(headers)
-            generator.save_as(path)
-            add_file_to_support_group(path)
-            @bridge_support_file = path.relative_path_from(sandbox.root)
-          end
-        end
-      end
-
-      # Creates a script that copies the resources to the bundle of the client
-      # target.
-      #
-      # @note   The bridge support file needs to be created before the prefix
-      #         header, otherwise it will not be added to the resources script.
-      #
-      # @return [void]
-      #
-      def create_copy_resources_script
-        path = library.copy_resources_script_path
-        UI.message "- Generating copy resources script at #{UI.path(path)}" do
-          resources = library.file_accessors.map { |accessor| accessor.resources.flatten.map {|res| project.relativize(res)} }.flatten
-          resources << bridge_support_file if bridge_support_file
-          generator = Generator::CopyResourcesScript.new(resources, library.platform)
-          generator.save_as(path)
-          add_file_to_support_group(path)
-        end
-      end
-
-      # Generates the acknowledgement files (markdown and plist) for the target.
-      #
-      # @return [void]
-      #
-      def create_acknowledgements
-        basepath = library.acknowledgements_basepath
-        Generator::Acknowledgements.generators.each do |generator_class|
-          path = generator_class.path_from_basepath(basepath)
-          UI.message "- Generating acknowledgements at #{UI.path(path)}" do
-            generator = generator_class.new(library.file_accessors)
-            generator.save_as(path)
-            add_file_to_support_group(path)
-          end
-        end
+        @support_files_group = project.support_files_group.new_group(library.name)
       end
 
       # Generates a dummy source file for each target so libraries that contain
@@ -254,10 +88,6 @@ module Pod
         end
       end
 
-      #-----------------------------------------------------------------------#
-
-      private
-
       # @return [PBXNativeTarget] the target generated by the installation
       #         process.
       #
@@ -265,6 +95,10 @@ module Pod
       #
       attr_reader :target
 
+      private
+
+      #-----------------------------------------------------------------------#
+
       # @!group Private helpers.
 
       # @return [Project] the Pods project of the sandbox.
@@ -279,24 +113,11 @@ module Pod
         library.target_definition
       end
 
-      # @return [Specification::Consumer] the consumer for the specifications.
-      #
-      def spec_consumers
-         @spec_consumers ||= library.file_accessors.map(&:spec_consumer)
-      end
-
       # @return [PBXGroup] the group where the file references to the support
       #         files should be stored.
       #
       attr_reader :support_files_group
 
-      # @return [Pathname] the path of the bridge support file relative to the
-      #         sandbox.
-      #
-      # @return [Nil] if no bridge support file was generated.
-      #
-      attr_reader :bridge_support_file
-
       # Adds a reference to the given file in the support group of this target.
       #
       # @param  [Pathname] path
@@ -309,62 +130,6 @@ module Pod
         support_files_group.new_file(relative_path)
       end
 
-      ENABLE_OBJECT_USE_OBJC_FROM = {
-        :ios => Version.new('6'),
-        :osx => Version.new('10.8')
-      }
-
-      # Returns the compiler flags for the source files of the given specification.
-      #
-      # The following behavior is regarding the `OS_OBJECT_USE_OBJC` flag. When
-      # set to `0`, it will allow code to use `dispatch_release()` on >= iOS 6.0
-      # and OS X 10.8.
-      #
-      # * New libraries that do *not* require ARC don’t need to care about this
-      #   issue at all.
-      #
-      # * New libraries that *do* require ARC _and_ have a deployment target of
-      #   >= iOS 6.0 or OS X 10.8:
-      #
-      #   These no longer use `dispatch_release()` and should *not* have the
-      #   `OS_OBJECT_USE_OBJC` flag set to `0`.
-      #
-      #   **Note:** this means that these libraries *have* to specify the
-      #             deployment target in order to function well.
-      #
-      # * New libraries that *do* require ARC, but have a deployment target of
-      #   < iOS 6.0 or OS X 10.8:
-      #
-      #   These contain `dispatch_release()` calls and as such need the
-      #   `OS_OBJECT_USE_OBJC` flag set to `1`.
-      #
-      #   **Note:** libraries that do *not* specify a platform version are
-      #             assumed to have a deployment target of < iOS 6.0 or OS X 10.8.
-      #
-      #  For more information, see: http://opensource.apple.com/source/libdispatch/libdispatch-228.18/os/object.h
-      #
-      # @param  [Specification::Consumer] consumer
-      #         The consumer for the specification for which the compiler flags
-      #         are needed.
-      #
-      # @return [String] The compiler flags.
-      #
-      def compiler_flags_for_consumer(consumer)
-        flags = consumer.compiler_flags.dup
-        if consumer.requires_arc
-          flags << '-fobjc-arc'
-          platform_name = consumer.platform_name
-          spec_deployment_target = consumer.spec.deployment_target(platform_name)
-          if spec_deployment_target.nil? || Version.new(spec_deployment_target) < ENABLE_OBJECT_USE_OBJC_FROM[platform_name]
-            flags << '-DOS_OBJECT_USE_OBJC=0'
-          end
-        end
-        if target_definition.inhibits_warnings_for_pod?(consumer.spec.root.name)
-          flags << '-w -Xanalyzer -analyzer-disable-checker'
-        end
-        flags * " "
-      end
-
       #-----------------------------------------------------------------------#
 
     end