cocoapods-hmap-prebuilt 0.0.4 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5b9e2273c9a41c3d7d56211f1571629d9c63708ae26355f2e72e88e8d587e9f
-  data.tar.gz: 355cd33f067bdbde3352e02c383a7d0af592affa3a8a56b20d659400c805175e
+  metadata.gz: fe4c3bd3405bef59144321942032ab36d23823c8e2f504da5734464c01d6deb8
+  data.tar.gz: 5b7236e35e1f8e783a2907abd218f090fb0fdb9652e4b9b050665492528372fb
 SHA512:
-  metadata.gz: b589b8cca0e612543344468054d5ed3271d2b349134e8a965fc2bef6387b5f7781423a9c4e29e3c02002b89c0ea1b05ee65280e8202063a52038b90ba5b9952e
-  data.tar.gz: 2cb10dfe6b16e2940624dd34010911a5180c54b718e70259d1ab4dc432c89538c980f9bb0fa3dad84f25315ab15e52f1a7e88bdee136cd03acbdd7158e1d0328
+  metadata.gz: fafbb86fe22016979fd023261779b69e5a02d0b9bb8f502bfb11c069fd1aa2438e9251628699bb5a5c09bec4ce3853082e9b7be794673fdeb01077862c4fc49c
+  data.tar.gz: 5e50af503a030938dc92ca43b618788a3e3fd944b9a9477187c8fb99e69997488936b175fead468fa709a44eb50b60f5ef2d76f7efe6313d086e008a7a9d4dbd

data/lib/cocoapods-hmap-prebuilt/hmap_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsHmapPrebuilt
-  VERSION = "0.0.4"
+  VERSION = "0.0.7"
 end

data/lib/cocoapods-hmap-prebuilt/hmap_writer.rb

@@ -10,32 +10,45 @@ module HMap
     def initialize(context)
       hmap_dir = context.sandbox_root + '/Headers/HMap'
       aggregate_targets = context.aggregate_targets
-      Dir.mkdir(hmap_dir) if !File.exist?(hmap_dir)
+      FileUtils.rm_rf(hmap_dir) if File.exist?(hmap_dir)
+      Dir.mkdir(hmap_dir)
       gen_hmapfile(aggregate_targets, hmap_dir)
     end
 
     def gen_hmapfile(aggregate_targets, hmap_dir)
       aggregate_targets.each do |aggregate_target|
         pods_hmap = HMap::HMapConstructor.new
-        puts "- generate hmapfile of aggregate target :#{aggregate_target.name}".green
-        aggregate_target.pod_targets.each do |target|
-          puts "- generate hmapfile of pod target :#{target.name}".yellow
-          public_header_mapping = target.public_header_mappings_by_file_accessor
-          pods_hmap.add_hmap_with_header_mapping(public_header_mapping, target.name)
 
+        aggregate_target.pod_targets.each do |target|
+          pods_hmap.add_hmap_with_header_mapping(target.public_header_mappings_by_file_accessor, target.name)
           unless $skip_hmap_for_pods.include?(target.name)
             target_hmap = HMap::HMapConstructor.new
-            header_mappings = target.header_mappings_by_file_accessor
-            target_hmap.add_hmap_with_header_mapping(header_mappings, target.name)
+            dependent_target_header_search_path_setting = Array.new
+            target_hmap.add_hmap_with_header_mapping(target.header_mappings_by_file_accessor, target.name)
+
             target.dependent_targets.each do |dependent_target|
               target_hmap.add_hmap_with_header_mapping(dependent_target.public_header_mappings_by_file_accessor, dependent_target.name)
+
+              dependent_target.build_settings.each do |config, setting|
+                dependent_target_xcconfig = setting.xcconfig
+                dependent_target_header_search_paths = dependent_target_xcconfig.attributes['HEADER_SEARCH_PATHS']
+                dependent_target_header_search_paths.split(' ').each do |path|
+                  unless (path.include?('${PODS_ROOT}/Headers') || path.include?('$(inherited)'))
+                    dependent_target_header_search_path_setting << path
+                  end
+                end
+              end
+              target.dependent_target_header_search_path_setting = dependent_target_header_search_path_setting.uniq
             end
 
             target_hmap_name = "#{target.name}-prebuilt.hmap"
             target_hmap_path = hmap_dir + "/#{target_hmap_name}"
             relative_hmap_path = "Headers/HMap/#{target_hmap_name}"
             if target_hmap.save_to(target_hmap_path)
+              puts "- hmapfile of target :#{target.name} save to :#{target_hmap_path}".yellow
               target.reset_header_search_with_relative_hmap_path(relative_hmap_path)
+            else
+              $fail_generate_hmap_pods << target.name
             end
           else
             puts "- skip generate hmapfile of target :#{target.name}"
@@ -46,6 +59,7 @@ module HMap
         pods_hmap_path = hmap_dir + "/#{pods_hmap_name}"
         relative_hmap_path = "Headers/HMap/#{pods_hmap_name}"
         if pods_hmap.save_to(pods_hmap_path)
+          puts "- hmapfile of target :#{aggregate_target.name} save to :#{pods_hmap_path}".green
           aggregate_target.reset_header_search_with_relative_hmap_path(relative_hmap_path)
         end
       end

data/lib/cocoapods-hmap-prebuilt/pod_target.rb

@@ -1,23 +1,26 @@
 # !/usr/bin/env ruby
 
 require_relative 'pod_xcconfig'
+require_relative 'podfile_dsl'
+
+$fail_generate_hmap_pods = []
 
 module Pod
   class PodTarget
+    attr_accessor :dependent_target_header_search_path_setting
+
     def reset_header_search_with_relative_hmap_path(hmap_path)
       if build_settings.instance_of?(Hash)
         build_settings.each do |config_name, setting|
           config_file = setting.xcconfig
-          config_file.reset_header_search_with_relative_hmap_path(hmap_path)
-          # https://github.com/CocoaPods/CocoaPods/issues/1216
+          config_file.reset_header_search_with_relative_hmap_path(hmap_path, @dependent_target_header_search_path_setting)
           config_file.set_use_hmap(false)
           config_path = xcconfig_path(config_name)
           config_file.save_as(config_path)
         end
       elsif build_settings.instance_of?(BuildSettings::PodTargetSettings)
         config_file = build_settings.xcconfig
-        config_file.reset_header_search_with_relative_hmap_path(hmap_path)
-        # https://github.com/CocoaPods/CocoaPods/issues/1216
+        config_file.reset_header_search_with_relative_hmap_path(hmap_path, @dependent_target_header_search_path_setting)
         config_file.set_use_hmap(false)
         config_path = xcconfig_path
         config_file.save_as(config_path)
@@ -25,16 +28,38 @@ module Pod
         puts 'Unknown build settings'.red
       end
     end
+
+    def addition_aggregate_hmapfile_to_pod_target(hmap_path)
+      if build_settings.instance_of?(Hash)
+        build_settings.each do |name, setting|
+          config_file = setting.xcconfig
+          config_file.addition_aggregate_hmapfile_to_pod_target(hmap_path)
+          config_file.save_as(xcconfig_path(name))
+        end
+      elsif build_settings.instance_of?(BuildSettings::PodTargetSettings)
+        config_file = build_settings.xcconfig
+        config_file.addition_aggregate_hmapfile_to_pod_target(hmap_path)
+        config_file.save_as(xcconfig_path)
+      else
+        puts 'Unknown build settings'.red
+      end
+    end
+
   end
 
   class AggregateTarget
     def reset_header_search_with_relative_hmap_path(hmap_path)
-      # override xcconfig
       xcconfigs.each do |config_name, config_file|
         config_file.reset_header_search_with_relative_hmap_path(hmap_path)
         config_path = xcconfig_path(config_name)
         config_file.save_as(config_path)
       end
+
+      pod_targets.each do |target|
+        unless ($skip_hmap_for_pods.include?(target.name) || $fail_generate_hmap_pods.include?(target.name))
+          target.addition_aggregate_hmapfile_to_pod_target(hmap_path)
+        end
+      end
     end
   end
 end

data/lib/cocoapods-hmap-prebuilt/pod_xcconfig.rb

@@ -13,8 +13,8 @@ module Xcodeproj
       if header_search_paths
         new_paths = Array.new
         header_search_paths.split(' ').each do |path|
-          unless path.include?('${PODS_ROOT}/Headers')
-            new_paths << p
+          unless (path.include?('${PODS_ROOT}/Headers/Public') || path.include?('${PODS_ROOT}/Headers/Private') || path.include?('$(inherited)'))
+            new_paths << path
           end
         end
         if new_paths.size > 0
@@ -53,14 +53,26 @@ module Xcodeproj
       end
     end
 
-    def reset_header_search_with_relative_hmap_path(hmap_path)
+    def reset_header_search_with_relative_hmap_path(hmap_path, dependent_header_search_path_setting = nil)
       remove_header_search_path
       # add build flags
-      new_paths = Array["${PODS_ROOT}/#{hmap_path}"]
+      new_paths = Array.new
+      new_paths << "${PODS_ROOT}/#{hmap_path}"
       header_search_paths = @attributes['HEADER_SEARCH_PATHS']
       if header_search_paths
         new_paths.concat(header_search_paths.split(' '))
       end
+      new_paths.concat(dependent_header_search_path_setting) if dependent_header_search_path_setting
+      @attributes['HEADER_SEARCH_PATHS'] = new_paths.join(' ')
+    end
+
+    def addition_aggregate_hmapfile_to_pod_target(hmap_path)
+      new_paths = Array.new
+      header_search_paths = @attributes['HEADER_SEARCH_PATHS']
+      if header_search_paths
+        new_paths.concat(header_search_paths.split(' '))
+      end
+      new_paths << "${PODS_ROOT}/#{hmap_path}"
       @attributes['HEADER_SEARCH_PATHS'] = new_paths.join(' ')
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-hmap-prebuilt
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.7
 platform: ruby
 authors:
 - EricLou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-05 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler