cocoapods-mapfile 0.2.6.1 → 0.2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 638ba36cc9be5ecffeed1c7b02cb466b173b3a74fe3b2903d049450e07a4fd18
-  data.tar.gz: 959264f5b51c9c9e0d1543306a381ca61021f2e92038300d257b3dcc0a72d4af
+  metadata.gz: aaaa78e71fbc30aa040f8a0ad7d14ad0af6691a406e40a1002119c8b39a06f7c
+  data.tar.gz: 790ac93ec756eb422472df923f99d4d706638b69141ccd43e84a515cac42cdad
 SHA512:
-  metadata.gz: f96fd831a0215bb118c568a4a03a10ef3f039f5a1f51d9edb34d8a4ca3b8a44ec9071ef5f87aeed69833fc2cb7b6d175b0e4461a06bff8b9f6247c4bb26d0719
-  data.tar.gz: 55ba2200d4aca7fe0549a4fe79ad067b2b7aec25fa4c5beccbad06cccb4d296aabdcd7fdbebe3344032ff5d72d7e03b71667536799eb43a6aadfdd81f35d2f96
+  metadata.gz: 4bca57920f0d2ef6bc29aa611c221c1e1b1f86e95abf4ac2225fa160dd44a51456a3ba4044202dde4088994d663bb30c2ed02f640947e8e825cc7e7264de63d7
+  data.tar.gz: eb3623e1250bbf2d1ae177aaf819735cd410fb43eba476727350fc0ed6d662bd8e6bc03b51e38b4377f45c665d953622fc6bf04aff9d091b92274bbf1ebe309d

data/lib/hmap/command/hmap_writer.rb

@@ -40,7 +40,7 @@ module HMap
 
       def run
         UserInterface.puts "\n[hmapfile-from-json] start"
-        if File.exist?(@json_path) && File.exist?(@output_path)
+        if File.exist?(@json_path)
           require 'json'
           json_file = File.read(@json_path)
           json = JSON.parse(json_file)

data/lib/hmap/constants.rb

@@ -39,8 +39,8 @@ module HMap
     #                     PROJECT_TEMP_DIR, CONFIGURATION_EFFECTIVE_PLATFORM,
     #                     TARGET_TEMP_DIR].join('/')
     HMAP_TARGET_ROOT = [SRCROOT, HMAP_DIR,
-                           PROJECT_TEMP_DIR, CONFIGURATION_EFFECTIVE_PLATFORM,
-                          TARGET_TEMP_DIR].join('/')
+                        PROJECT_TEMP_DIR, CONFIGURATION_EFFECTIVE_PLATFORM,
+                        TARGET_TEMP_DIR].join('/')
 
     HMAP_GEN_DIR_ATTRIBUTE = { HMAP_GEN_DIR => HMAP_TARGET_ROOT }
 
@@ -101,23 +101,23 @@ module HMap
       xc_filenames[type]
     end
 
-    def hmap_build_settings(build_as_framework)
-      build_settings(build_as_framework)
+    def hmap_build_settings
+      build_settings
     end
 
     private
 
-    def build_settings(build_as_framework)
-      return @build_as_framework[build_as_framework] unless @build_as_framework[build_as_framework].nil?
+    def build_settings
+      return @build_settings if defined? @build_settings
 
       attributes = HMAP_GEN_DIR_ATTRIBUTE
-      attributes[HEADER_SEARCH_PATHS] = build_setting_values_i(build_as_framework)
+      attributes[HEADER_SEARCH_PATHS] = build_setting_values_i
       attributes[OTHER_CFLAGS] = build_setting_values_c
       attributes[OTHER_CPLUSPLUSFLAGS] = build_setting_values_c
       attributes[OTHER_SWIFT_FLAGS] = build_setting_values_s
-      attributes[USER_HEADER_SEARCH_PATHS] = build_setting_values_iquote
+      # attributes[USER_HEADER_SEARCH_PATHS] = build_setting_values_iquote
       attributes[USE_HEADERMAP] = 'NO'
-      @build_as_framework[build_as_framework] = attributes
+      @build_settings = attributes
     end
 
     def filenames
@@ -137,14 +137,16 @@ module HMap
       %i[all_non_framework_target_headers own_target_headers all_product_headers project_headers].map do |type|
         key = build_setting_keys[type]
         value = xc_filenames[type]
-        ["-Xcc -#{key}", "-Xcc \"#{HMAP_GEN_DIR_VALUE}/#{value}\""].join(' ')
+        if key == :I
+          "-Xcc -#{key}\"#{HMAP_GEN_DIR_VALUE}/#{value}\""
+        else
+          "-Xcc -#{key} -Xcc \"#{HMAP_GEN_DIR_VALUE}/#{value}\""
+        end
       end.join(' ')
     end
 
-    def build_setting_values_i(build_as_framework)
-      a = %i[all_non_framework_target_headers own_target_headers]
-      a << :all_target_headers unless build_as_framework
-      a.map do |type|
+    def build_setting_values_i
+      %i[all_non_framework_target_headers own_target_headers project_headers].map do |type|
         value = xc_filenames[type]
         "\"#{HMAP_GEN_DIR_VALUE}/#{value}\""
       end.join(' ')
@@ -201,6 +203,7 @@ module HMap
                [type, case type
                       when :all_product_headers then file_name
                       else
+                        # file_name.to_s
                         "#{Constants::PRODUCT_NAME_VALUE}-#{file_name}"
                       end]
              end]

data/lib/hmap/gem_version.rb

@@ -1,5 +1,5 @@
 module HMap
   # The version of the hmapfile command line tool.
   #
-  VERSION = '0.2.6.1'.freeze unless defined? HMap::VERSION
+  VERSION = '0.2.7.1'.freeze unless defined? HMap::VERSION
 end

data/lib/hmap/xc/target/target.rb

@@ -9,11 +9,13 @@ module HMap
     include HMap::Target::Helper
 
     attr_reader :entrys, :target, :project
+    attr_accessor :xcconfig_paths
 
     def initialize(entrys, target, project)
       @entrys = entrys || []
       @target = target
       @project = project
+      @xcconfig_paths = []
     end
 
     def platforms
@@ -27,39 +29,63 @@ module HMap
     end
 
     def save_hmap_settings!
-      xcconfig_paths.each do |path|
-        settings = Constants.instance.hmap_build_settings(build_as_framework?)
+      build_setting_paths.each do |path|
+        settings = Constants.instance.hmap_build_settings
         XcodeprojHelper.new(path).add_build_settings_and_save(settings, use_origin: Resolver.instance.use_origin)
       end
     end
 
     def remove_hmap_settings!
-      xcconfig_paths.each { |path| HMap::XcodeprojHelper.new(path).remove_build_settings_and_save }
+      build_setting_paths.each { |path| HMap::XcodeprojHelper.new(path).remove_build_settings_and_save }
     end
 
     private
 
-    def xcconfig_paths
-      return @xcconfig_paths if defined?(@xcconfig_paths)
+    def build_setting_paths
+      return @build_setting_paths if defined?(@build_setting_paths)
 
-      @xcconfig_paths = target.build_configuration_list.build_configurations.flat_map do |configuration|
-        if configuration.is_a?(Constants::XCBuildConfiguration)
-          bcr = configuration.base_configuration_reference
-          # if bcr.nil?
-          #   ab_path = Pathname(project.project_dir + "hmap-#{target_name}.#{configuration.name}.xcconfig")
-          #   File.new(ab_path, 'w') unless ab_path.exist?
-          #   xc_ref = target.project.new_file(ab_path)
-          #   configuration.base_configuration_reference = xc_ref
-          #   target.project.save
-          #   ab_path
-          # else
-          unless bcr.nil?
-            s_path = PBXHelper.group_paths(bcr)
-            x = bcr.instance_variable_get('@simple_attributes_hash')['path'] || ''
-            File.expand_path File.join(project.project_dir, s_path, x)
-          end
-        end
+      @build_setting_paths = xcconfig_paths.map do |path|
+        xc = XCConfig.new(path)
+        inc = xc.includes_paths
+        path if inc.empty? || project.workspace.xcconfig_paths.none? { |pa| inc.include?(pa) }
       end.compact
     end
+
+    # def xcconfig_paths
+    #   return @xcconfig_paths if defined?(@xcconfig_paths)
+
+    #   @xcconfig_paths = target.build_configurations.flat_map do |configuration|
+    #     if configuration.is_a?(Constants::XCBuildConfiguration)
+    #       bcr = configuration.base_configuration_reference
+    #       unless bcr.nil?
+    #         s_path = PBXHelper.group_paths(bcr)
+    #         x = bcr.instance_variable_get('@simple_attributes_hash')['path'] || ''
+    #         path = File.expand_path(File.join(project.project_dir, s_path, x))
+    #         xc = XCConfig.new(path)
+    #         inc = xc.includes_paths
+    #         path if inc.empty? || project.workspace.xcconfig_paths.none? { |pa| inc.include?(pa) }
+    #       end
+    #     end
+    #   end.compact
+
+    #   @xcconfig_paths = target.build_configuration_list.build_configurations.flat_map do |configuration|
+    #     if configuration.is_a?(Constants::XCBuildConfiguration)
+    #       bcr = configuration.base_configuration_reference
+    #       # if bcr.nil?
+    #       #   ab_path = Pathname(project.project_dir + "hmap-#{target_name}.#{configuration.name}.xcconfig")
+    #       #   File.new(ab_path, 'w') unless ab_path.exist?
+    #       #   xc_ref = target.project.new_file(ab_path)
+    #       #   configuration.base_configuration_reference = xc_ref
+    #       #   target.project.save
+    #       #   ab_path
+    #       # else
+    #       unless bcr.nil?
+    #         s_path = PBXHelper.group_paths(bcr)
+    #         x = bcr.instance_variable_get('@simple_attributes_hash')['path'] || ''
+    #         File.expand_path File.join(project.project_dir, s_path, x)
+    #       end
+    #     end
+    #   end.compact
+    # end
   end
 end

data/lib/hmap/xc/target/target_helper.rb

@@ -16,37 +16,45 @@ module HMap
       define_method(:all_non_framework_target_headers) do
         return if build_as_framework?
 
+        return @all_non_framework_target_headers if defined? @all_non_framework_target_headers
+
         p_h = public_entrys + private_entrys
-        p_h.inject({}) do |sum, entry|
+        @all_non_framework_target_headers = p_h.inject({}) do |sum, entry|
           sum.merge!(entry.full_module_buckets(product_name)) { |_, v1, _| v1 }
         end
       end
 
       # all_targets include header full module path
       define_method(:all_target_headers) do
+        return @all_target_headers if defined? @all_target_headers
+
         p_h = public_entrys + private_entrys
-        p_h.inject({}) do |sum, entry|
+        @all_target_headers = p_h.inject({}) do |sum, entry|
           sum.merge!(entry.module_buckets(product_name)) { |_, v1, _| v1 }
           sum.merge!(entry.full_module_buckets(product_name)) { |_, v1, _| v1 }
         end
       end
 
       define_method(:project_headers) do
+        return @project_headers if defined? @project_headers
+
         p_h = public_entrys + private_entrys
         hs = p_h.inject({}) do |sum, entry|
           sum.merge!(entry.module_buckets(product_name)) { |_, v1, _| v1 }
         end
-        project_entrys.inject(hs) do |sum, entry|
+        @project_headers = project_entrys.inject(hs) do |sum, entry|
           sum.merge!(entry.project_buckets_extra) { |_, v1, _| v1 }
         end
       end
 
       define_method(:own_target_headers) do
+        return @own_target_headers if defined? @own_target_headers
+
         headers = public_entrys + private_entrys
         hs = headers.inject({}) do |sum, entry|
           sum.merge!(entry.module_buckets(product_name)) { |_, v1, _| v1 }
         end
-        project_entrys.inject(hs) do |sum, entry|
+        @own_target_headers = project_entrys.inject(hs) do |sum, entry|
           sum.merge!(entry.project_buckets) { |_, v1, _| v1 }
           sum.merge!(entry.full_module_buckets(product_name)) { |_, v1, _| v1 }
         end
@@ -65,7 +73,10 @@ module HMap
       end
 
       def product_name
-        target.product_name.gsub(/[-]/, '_')
+        product_name = target.build_settings(target.build_configurations.first.name)['PRODUCT_NAME']
+        return target_name.gsub(/-/, '_') if product_name.nil? || product_name.include?('TARGET_NAME')
+
+        product_name
       end
 
       def full_product_name
@@ -83,13 +94,14 @@ module HMap
       def build_dir
         return @build_dir if defined?(@build_dir)
 
-        b_d = xcconfig_paths.any? do |path|
-          xc = XCConfig.new(path)
-          !xc.attributes[Constants::CONFIGURATION_BUILD_DIR].nil?
-        end
+        b_d = build_setting_paths.none? { |path| XCConfig.new(path).attributes[Constants::CONFIGURATION_BUILD_DIR].nil? }
         @build_dir = target_name if b_d
       end
 
+      def app_target?
+        Xcodeproj::Constants::PRODUCT_UTI_EXTENSIONS[target.symbol_type] == 'app'
+      end
+
       def build_as_framework?
         PBXHelper.build_as_framework?(target)
       end

data/lib/hmap/xc/target/target_vfs.rb

@@ -10,6 +10,10 @@ module HMap
       @real_path = file
       @virtual_path = File.join(build_dir, File.basename(file))
     end
+
+    def eql?(other)
+      other.real_path == real_path && other.virtual_path == virtual_path
+    end
   end
 
   class TargetPlatformVFS

data/lib/hmap/xc/target/xcconfig.rb

@@ -37,6 +37,11 @@ module HMap
     #
     attr_accessor :attributes
 
+    # @return [Array] The list of the configuration files included by this
+    #         configuration file (`#include "SomeConfig"`).
+    #
+    attr_accessor :includes_paths
+
     # @return [Hash{Symbol => Set<String>}] The other linker flags by key.
     #         Xcodeproj handles them in a dedicated way to prevent duplication
     #         of the libraries and of the frameworks.
@@ -44,7 +49,9 @@ module HMap
     def initialize(xcconfig_hash_or_file = {})
       @attributes = {}
       @includes = []
+      @include_attributes = {}
       merge!(extract_hash(xcconfig_hash_or_file))
+      @includes_paths = @includes.map { |i| File.expand_path(i, @filepath.dirname) }
     end
 
     def inspect
@@ -52,7 +59,7 @@ module HMap
     end
 
     def ==(other)
-      other.attributes == attributes
+      other.attributes == attributes && other.includes_paths = @includes_paths
     end
 
     # @!group Serialization
@@ -98,8 +105,6 @@ module HMap
     # @return [Hash] The hash representation
     #
     def to_hash(prefix = nil)
-      list = []
-
       result = attributes.dup
       result.reject! { |_, v| INHERITED.any? { |i| i == v.to_s.strip } }
       if prefix
@@ -191,14 +196,14 @@ module HMap
       hash = {}
       string.split("\n").each do |line|
         uncommented_line = strip_comment(line)
-        if include = extract_include(uncommented_line)
-          @includes.push normalized_xcconfig_path(include)
-        else
+        e = extract_include(uncommented_line)
+        if e.nil?
           key, value = extract_key_value(uncommented_line)
           next unless key
-
           value.gsub!(INHERITED_REGEXP) { |m| hash.fetch(key, m) }
           hash[key] = value
+        else
+          @includes.push normalized_xcconfig_path(e)
         end
       end
       hash

data/lib/hmap/xc/target/xcconfig_helper.rb

@@ -40,10 +40,11 @@ module HMap
         @xcconfig.attributes[key] = value
       else
         save_origin = save_build_setting(key)
-        e_value = value
-        e_value = "${#{save_xckey(key)}} #{e_value} " if use_origin && !save_origin.nil?
-        @xcconfig.attributes[hmap_xckey(key)] = e_value
-        @xcconfig.attributes[key] = "${#{hmap_xckey(key)}}"
+        value = "#{value} ${#{save_xckey(key)}} " if use_origin && !save_origin.nil?
+        @xcconfig.attributes[hmap_xckey(key)] = value
+        h_value = "${#{hmap_xckey(key)}}"
+        h_value += ' $(inherited)' unless key == Constants::USE_HEADERMAP
+        @xcconfig.attributes[key] = h_value
       end
     end
 

data/lib/hmap/xc/workspace/project_helper.rb

@@ -9,11 +9,20 @@ module HMap
       define_method(:all_product_headers) do
         return @all_product_headers if defined? @all_product_headers
 
-        @all_product_headers = targets.each_with_object({}) do |target, sum|
+        hs = targets.each_with_object({}) do |target, sum|
           next if target.all_product_headers.nil?
 
           sum.merge!(target.all_product_headers) { |_, oldval, newval| newval + oldval }
         end
+
+        if targets.any?(&:app_target?)
+          workspace.projects.each do |pr|
+            next if pr == self
+
+            hs.merge!(pr.all_product_headers) { |_, v1, v2| v1 + v2 }
+          end
+        end
+        @all_product_headers = hs
       end
 
       define_method(:all_non_framework_target_headers) do
@@ -37,6 +46,13 @@ module HMap
         hs = targets.inject({}) do |sum, entry|
           sum.merge!(entry.project_headers) { |_, v1, _| v1 }
         end
+        if targets.any?(&:app_target?)
+          workspace.projects.each do |pr|
+            next if pr == self
+
+            hs.merge!(pr.project_headers) { |_, v1, _| v1 }
+          end
+        end
         @project_headers = project_entrys.inject(hs) do |sum, entry|
           sum.merge!(entry.project_buckets_extra) { |_, v1, _| v1 }
         end

data/lib/hmap/xc/workspace/workspace.rb

@@ -82,5 +82,26 @@ module HMap
         sum.merge!(entry.all_target_headers) { |_, v1, _| v1 }
       end
     end
+
+    def xcconfig_paths
+      return @xcconfig_paths if defined?(@xcconfig_paths)
+
+      @xcconfig_paths = projects.flat_map do |project|
+        project.targets.flat_map do |target|
+          target.target.build_configurations.map do |configuration|
+            next unless configuration.is_a?(Constants::XCBuildConfiguration)
+
+            bcr = configuration.base_configuration_reference
+            next if bcr.nil?
+
+            s_path = PBXHelper.group_paths(bcr)
+            x = bcr.instance_variable_get('@simple_attributes_hash')['path'] || ''
+            path = File.expand_path(File.join(project.project_dir, s_path, x))
+            target.xcconfig_paths << path
+            path
+          end.compact
+        end
+      end.uniq
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-mapfile
 version: !ruby/object:Gem::Version
-  version: 0.2.6.1
+  version: 0.2.7.1
 platform: ruby
 authors:
 - Cat1237
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-02 00:00:00.000000000 Z
+date: 2022-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler