cocoapods-mapfile 0.2.5 → 0.2.7.0

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'xcconfig'
+
 module HMap
   # A collection of xcodeproj Helper functions used throughout hmap.
   class XcodeprojHelper
@@ -12,12 +14,11 @@ module HMap
     def initialize(path)
       xc = Pathname(path)
       @xcconfig_path = xc
-      @xcconfig = Xcodeproj::Config.new(xc)
+      @xcconfig = XCConfig.new(xc)
     end
 
     def add_build_settings_and_save(settings, use_origin: true)
       add_build_settings(settings, use_origin)
-      build_settings = [Constants::HEADER_SEARCH_PATHS, Constants::USER_HEADER_SEARCH_PATHS]
       if use_origin
         remove_build_settings(settings)
       else
@@ -39,10 +40,11 @@ module HMap
         @xcconfig.attributes[key] = value
       else
         save_origin = save_build_setting(key)
-        e_value = value
-        e_value = "#{e_value} ${#{save_xckey(key)}}" 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
 
@@ -61,10 +63,9 @@ module HMap
     end
 
     def remove_build_settings_and_save
-
       hmap_ks = @xcconfig.attributes.keys.each_with_object([]) do |key, sum|
-        sum << key[HMAP_XCKEY_START.length..-1] if key.start_with?(HMAP_XCKEY_START)
-        sum << key[SAVE_XCKEY_START.length..-1] if key.start_with?(SAVE_XCKEY_START)
+        sum << key[HMAP_XCKEY_START.length..] if key.start_with?(HMAP_XCKEY_START)
+        sum << key[SAVE_XCKEY_START.length..] if key.start_with?(SAVE_XCKEY_START)
       end.compact
       remove_build_settings(hmap_ks)
       save_as
@@ -78,9 +79,7 @@ module HMap
     def remove_build_setting(setting)
       save_origin = @xcconfig.attributes[save_xckey(setting)]
       origin = @xcconfig.attributes[setting]
-      if save_origin.nil? && !origin.nil? && origin.include?(hmap_xckey(setting))
-        @xcconfig.attributes.delete(setting)
-      end
+      @xcconfig.attributes.delete(setting) if save_origin.nil? && !origin.nil? && origin.include?(hmap_xckey(setting))
       @xcconfig.attributes[setting] = save_origin unless save_origin.nil?
       @xcconfig.attributes.delete(hmap_xckey(setting))
       @xcconfig.attributes.delete(save_xckey(setting))
@@ -97,7 +96,6 @@ module HMap
       !@xcconfig.attributes[key].nil?
     end
 
-
     def hmap_xckey(key)
       "#{HMAP_XCKEY_START}#{key}"
     end

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

@@ -22,7 +22,7 @@ module HMap
       build_configurations = project.build_configuration_list.build_configurations
       build_configurations += project.targets.flat_map do |target|
         target.build_configuration_list.build_configurations
-      end 
+      end
 
       ps = build_configurations.flatten.each_with_object({}) do |configuration, sum|
         bs = configuration.build_settings
@@ -39,16 +39,15 @@ module HMap
         Platform.new_from_platforms(key, value.uniq)
       end
     end
-    
+
     def targets
       return @targets if defined?(@targets)
 
       project_dir = project.project_dir
-      
+
       h_ts = project.targets.map do |target|
         next if target.is_a?(Constants::PBXAggregateTarget)
-        
-        name = target.name
+
         headers = target.build_phases.flat_map do |phase|
           next unless phase.is_a?(Constants::PBXHeadersBuildPhase)
 
@@ -69,7 +68,11 @@ module HMap
       types = %i[all_non_framework_target_headers project_headers all_target_headers all_product_headers]
       datas = headers_hash(*types)
       hmap_writer.write_or_symlink(nil, datas, %i[all_product_headers])
-      targets.each(&:write_hmapfile!)
+      targets.each do |target|
+        target.write_hmapfile!
+        UserInterface.puts("[hmapfile] #{target.target_name} hmap files generated".green)
+      end
+      UserInterface.puts("[hmapfile] There are #{targets.length} targets hmap files generated")
     end
 
     def save_hmap_settings!

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

@@ -19,7 +19,9 @@ module HMap
       define_method(:all_non_framework_target_headers) do
         return @all_non_framework_target_headers if defined?(@all_non_framework_target_headers)
 
-        @all_non_framework_target_headers = targets.flat_map(&:all_non_framework_target_headers).compact
+        @all_non_framework_target_headers = targets.inject({}) do |sum, entry|
+          sum.merge!(entry.all_non_framework_target_headers || {}) { |_, v1, _| v1 }
+        end
       end
 
       # all_targets include header full module path
@@ -32,12 +34,24 @@ module HMap
       define_method(:project_headers) do
         return @project_headers if defined?(@project_headers)
 
-        @project_headers = all_target_headers + project_entrys.flat_map { |entry| entry.project_buckets_extra }
+        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
       end
 
       def project_references
         return @project_references if defined? @project_references
-  
+
         project_references = PBXHelper.project_references(project)
         @project_references = project_references.map { |pr| Project.new(pr, workspace) }
       end
@@ -56,28 +70,21 @@ module HMap
         project.project_dir
       end
 
-      def temp_name
-        "#{project_name}.build"
-      end
-
-      def temp_root
-        File.join(workspace.obj_root, temp_name)
-      end
-
       def build_root
         workspace.build_root
       end
 
       def temp_dir
-        workspace.obj_root
+        File.join(workspace.obj_root, temp_name)
       end
 
       def hmap_root
-        File.join(workspace.hmap_root, temp_name)
+        # File.join(workspace.hmap_root, temp_name)
+        File.join(project_dir, Constants::HMAP_DIR, temp_name)
       end
 
       def build_data_dir
-        Constants::XCBuildData
+        Constants::XC_BUILD_DATA
       end
 
       def context

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

@@ -48,36 +48,58 @@ module HMap
     end
 
     def hmap_root
-      dir = build_root.dirname.dirname
+      # dir = build_root.dirname.dirname
+      dir = workspace_dir
       File.join(dir, Constants::HMAP_DIR)
     end
 
     def write_save!
-      UserInterface.puts("[hmapfile] Got workspace/project build directory..............")
-      UserInterface.puts("[hmapfile] #{name} Build directory: #{hmap_root} ..............")
+      UserInterface.puts('[hmapfile] Got workspace/project build directory')
+      UserInterface.puts("[hmapfile] #{name} hmapfile gen directory: #{hmap_root} ")
       write_hmapfile!
       save_hmap_settings!
     end
 
     def write_hmapfile!
-      UserInterface.puts('[hmapfile] Starting generate hmap file..............')
+      UserInterface.puts('[hmapfile] Starting generate hmap file')
       projects.each(&:write_hmapfile!)
     end
 
     def save_hmap_settings!
-      UserInterface.puts('[hmapfile] Saving hmap settings..............')
+      UserInterface.puts('[hmapfile] Saving hmap settings')
 
       projects.each(&:save_hmap_settings!)
     end
 
     def remove_hmap_settings!
-      UserInterface.puts('[hmapfile] Cleanning hmap settings..............')
+      UserInterface.puts('[hmapfile] Cleanning hmap settings')
       FileUtils.rm_rf(hmap_root) if Dir.exist?(hmap_root)
       projects.each(&:remove_hmap_settings!)
     end
 
     def all_target_headers
-      @projects.flat_map(&:targets).flat_map(&:all_target_headers)
+      @projects.flat_map(&:targets).inject({}) do |sum, entry|
+        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'] || ''
+            File.expand_path(File.join(project.project_dir, s_path, x))
+          end.compact
+        end
+      end.uniq
     end
   end
 end

data/lib/hmap.rb

@@ -7,7 +7,7 @@ module HMap
   require 'pathname'
   require 'claide'
 
-  require_relative 'hmap/version'
+  require 'hmap/gem_version'
   require_relative 'hmap/user_interface'
 
   # autoload registers a file path to be loaded the first time

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-mapfile
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7.0
 platform: ruby
 authors:
 - Cat1237
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-16 00:00:00.000000000 Z
+date: 2022-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,6 +120,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.4
+- !ruby/object:Gem::Dependency
+  name: hashtable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 description: header_reader lets your read Xcode header map file. header-writer lets
   your analyze the project pod dependencies and gen header map file for all pods.
 email:
@@ -140,6 +154,7 @@ files:
 - lib/hmap/command/hmap_writer.rb
 - lib/hmap/constants.rb
 - lib/hmap/exceptions.rb
+- lib/hmap/gem_version.rb
 - lib/hmap/helper/executable.rb
 - lib/hmap/helper/utils.rb
 - lib/hmap/hmap/hmap_bucketstr.rb
@@ -149,7 +164,6 @@ files:
 - lib/hmap/hmap/hmap_writer.rb
 - lib/hmap/hmap/mapfile.rb
 - lib/hmap/user_interface.rb
-- lib/hmap/version.rb
 - lib/hmap/xc/context.rb
 - lib/hmap/xc/header_entry.rb
 - lib/hmap/xc/header_type.rb
@@ -161,6 +175,7 @@ files:
 - lib/hmap/xc/target/target_context.rb
 - lib/hmap/xc/target/target_helper.rb
 - lib/hmap/xc/target/target_vfs.rb
+- lib/hmap/xc/target/xcconfig.rb
 - lib/hmap/xc/target/xcconfig_helper.rb
 - lib/hmap/xc/workspace/project.rb
 - lib/hmap/xc/workspace/project_helper.rb
@@ -177,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/hmap/version.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-module HMap
-  VERSION = '0.2.5'
-end