cocoapods 0.3.7 → 0.3.8

data/lib/cocoapods.rb

@@ -1,5 +1,5 @@
 module Pod
-  VERSION = '0.3.7'
+  VERSION = '0.3.8'
 
   class Informative < StandardError
   end

data/lib/cocoapods/installer.rb

@@ -29,8 +29,9 @@ module Pod
       def xcconfig
         @xcconfig ||= Xcodeproj::Config.new({
           # In a workspace this is where the static library headers should be found.
-          'USER_HEADER_SEARCH_PATHS' => '"$(BUILT_PRODUCTS_DIR)/Pods"',
-          'ALWAYS_SEARCH_USER_PATHS' => 'YES',
+          'PODS_ROOT' => '"$(SRCROOT)/Pods"',
+          'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/Headers"',
+          'ALWAYS_SEARCH_USER_PATHS' => 'YES', # needed to make EmbedReader build
           # This makes categories from static libraries work, which many libraries
           # require, so we add these by default.
           'OTHER_LDFLAGS'            => '-ObjC -all_load',
@@ -76,30 +77,41 @@ module Pod
         "#{@definition.lib_name}-prefix.pch"
       end
 
+      def headers_symlink_path_name
+        "#{config.project_pods_root}/Headers"
+      end
+
       # TODO move xcconfig related code into the xcconfig method, like copy_resources_script and generate_bridge_support.
       def install!
         # First add the target to the project
         @target = @project.targets.new_static_library(@definition.lib_name)
 
-        user_header_search_paths = []
+        # Clean old header symlinks
+        FileUtils.rm_r(headers_symlink_path_name, :secure => true) if File.exists?(headers_symlink_path_name)
+
+        header_search_paths = []
         build_specifications.each do |spec|
           xcconfig.merge!(spec.xcconfig)
           # Only add implementation files to the compile phase
           spec.implementation_files.each do |file|
             @target.add_source_file(file, nil, spec.compiler_flags)
           end
-          # Add header files to a `copy header build phase` for each destination
-          # directory in the pod's header directory.
+          # Symlink header files to Pods/Headers
           spec.copy_header_mappings.each do |header_dir, files|
-            copy_phase = @target.copy_files_build_phases.new_pod_dir(spec.name, header_dir)
+            target_dir = "#{headers_symlink_path_name}/#{header_dir}"
+            FileUtils.mkdir_p(target_dir)
+            target_dir_real_path = Pathname.new(target_dir).realpath
             files.each do |file|
-              @target.add_source_file(file, copy_phase)
+              source = Pathname.new("#{config.project_pods_root}/#{file}").realpath.relative_path_from(target_dir_real_path)
+              Dir.chdir(target_dir) do
+                FileUtils.ln_sf(source, File.basename(file))
+              end
             end
           end
           # Collect all header search paths
-          user_header_search_paths.concat(spec.user_header_search_paths)
+          header_search_paths.concat(spec.header_search_paths)
         end
-        xcconfig.merge!('USER_HEADER_SEARCH_PATHS' => user_header_search_paths.sort.uniq.join(" "))
+        xcconfig.merge!('HEADER_SEARCH_PATHS' => header_search_paths.sort.uniq.join(" "))
 
         # Now that we have added all the source files and copy header phases,
         # move the compile build phase to the end, so that headers are copied
@@ -120,6 +132,7 @@ module Pod
           config.baseConfiguration = xcconfig_file
           config.buildSettings['OTHER_LDFLAGS'] = ''
           config.buildSettings['GCC_PREFIX_HEADER'] = prefix_header_filename
+          config.buildSettings['PODS_ROOT'] = '$(SRCROOT)'
         end
       end
 

data/lib/cocoapods/specification.rb

@@ -294,9 +294,9 @@ module Pod
     # includes the pod's header dir root and any other directories that might
     # have been added by overriding the copy_header_mapping/copy_header_mappings
     # methods.
-    def user_header_search_paths
+    def header_search_paths
       dirs = [header_dir] + copy_header_mappings.keys
-      dirs.map { |dir| %{"$(BUILT_PRODUCTS_DIR)/Pods/#{dir}"} }
+      dirs.map { |dir| %{"$(PODS_ROOT)/Headers/#{dir}"} }
     end
 
     def to_s

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 7
-  version: 0.3.7
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - Eloy Duran