cocoapods-util 0.0.16 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83da9a9a68fa2cc89f013255846c38e0ff5f7dd8631c96ac21555b4a30d58e14
-  data.tar.gz: 39a88b6de2d54f2d68a3ae0b84727650a3b89fb006d5a3aa3f03eef7070d0f06
+  metadata.gz: ed124ed9b4a0655908453f9b89e4729a3eb97b630467ce449b736854c506b887
+  data.tar.gz: 1518420abc20def846321a27d5a593bd32daf39311d051f4e508928fb099ff5f
 SHA512:
-  metadata.gz: 17ad6705b93f62ed103cccf0d8c102c684bc662506c682053b2e1c2120aa6f70522c24af830b1e7f8ac5148a6ae4096525889c4de1abab1d254d5f254d0db913
-  data.tar.gz: '09847e25cdcd0f23b107322a2ab76fb47f792031824bce7d0ef369d161765c144c80c56f9b566cf5374f9e612c21a160c22577c73c863528803a9523bf6c7c2a'
+  metadata.gz: 33eaf3e82c99f71d98769fa3fa5490b66719ab02a4b46023ec8216381a127a07a9e73da868bb22797e76c5111789af095120e51043080accbe9ec998738f7e32
+  data.tar.gz: 147b2480fa760a6ca5003a9d5cac6a2b4165e6ac1dc02a6358b53c50e7574d6c188b5b00ae177156aae66239a95bc8e4c00f6f7660ec276d08c8afeb69807859

data/lib/cocoapods-util/binary/Intergation.rb

@@ -0,0 +1,300 @@
+require_relative 'helper/podfile_options'
+require_relative 'helper/names'
+require_relative 'helper/target_checker'
+
+
+# NOTE:
+# This file will only be loaded on normal pod install step
+# so there's no need to check is_prebuild_stage
+
+
+
+# Provide a special "download" process for prebuilded pods.
+#
+# As the frameworks is already exsited in local folder. We
+# just create a symlink to the original target folder.
+#
+module Pod
+    class Installer
+        class PodSourceInstaller
+
+            def install_for_prebuild!(standard_sanbox)
+                prebuild_sandbox = BinaryPrebuild::Sandbox.from_sandbox(standard_sanbox)
+                return if prebuild_sandbox.nil?
+                target_names = prebuild_sandbox.existed_target_names(self.name)
+                
+                def walk(path, &action)
+                    return unless path.exist?
+                    path.children.each do |child|
+                        result = action.call(child, &action)
+                        if child.directory?
+                            walk(child, &action) if result
+                        end
+                    end
+                end
+                def make_link(source, target)
+                    source = Pathname.new(source)
+                    target = Pathname.new(target)
+                    target.parent.mkpath unless target.parent.exist?
+                    relative_source = source.relative_path_from(target.parent)
+                    FileUtils.ln_sf(relative_source, target)
+                end
+                def mirror_with_symlink(source, basefolder, target_folder)
+                    relative_path = source.relative_path_from(basefolder)
+                    if relative_path.to_s =~ /^(Debug|Release)\/.*/
+                        new_relative_path = relative_path.to_s.gsub!(/^(Debug|Release)/) { |match| "#{BinaryPrebuild.config.xcconfig_replace_path}-#{match}" }
+                        target = Pathname.new("#{target_folder}/#{new_relative_path}")
+                        make_link(source, target)
+                    else
+                        target = Pathname.new("#{target_folder}/#{relative_path}")
+                        make_link(source, target)
+                    end
+                end
+                
+                target_names.each do |name|
+
+                    # symbol link copy all substructure
+                    real_file_folder = prebuild_sandbox.framework_folder_path_for_target_name(name)
+                    
+                    # If have only one platform, just place int the root folder of this pod.
+                    # If have multiple paths, we use a sperated folder to store different
+                    # platform frameworks. e.g. AFNetworking/AFNetworking-iOS/AFNetworking.framework
+                    
+                    target_folder = standard_sanbox.pod_dir(self.name) +  "_Prebuild"
+                    target_folder.rmtree if target_folder.exist?
+                    target_folder.mkpath
+
+
+                    walk(real_file_folder) do |child|
+                        source = child
+                        # only make symlink to file and `.framework` folder
+                        if child.directory? and [".framework", ".xcframework", ".bundle", ".dSYM"].include? child.extname
+                            mirror_with_symlink(source, real_file_folder, target_folder)
+                            next false  # return false means don't go deeper
+                        elsif child.file?
+                            mirror_with_symlink(source, real_file_folder, target_folder)
+                            next true
+                        else
+                            next true
+                        end
+                    end
+                end # of for each 
+
+            end # of method
+
+        end
+    end
+end
+
+
+# Let cocoapods use the prebuild framework files in install process.
+#
+# the code only effect the second pod install process.
+#
+module Pod
+    class Installer
+        # Modify specification to use only the prebuild framework after analyzing
+        old_method2 = instance_method(:resolve_dependencies)
+        define_method(:resolve_dependencies) do
+            # call original
+            old_method2.bind(self).()
+            # ...
+            # ...
+            # ...
+            # after finishing the very complex orginal function
+
+            # check the pods
+            # Although we have did it in prebuild stage, it's not sufficient.
+            # Same pod may appear in another target in form of source code.
+            # Prebuild.check_one_pod_should_have_only_one_target(self.prebuild_pod_targets)
+            # self.validate_every_pod_only_have_one_form
+
+            # prepare
+            cache = []
+
+            def add_vendered_framework(spec, platform, added_framework_file_path)
+                if spec.attributes_hash[platform] == nil
+                    spec.attributes_hash[platform] = {}
+                end
+                vendored_frameworks = spec.attributes_hash[platform]["vendored_frameworks"] || []
+                vendored_frameworks = [vendored_frameworks] if vendored_frameworks.kind_of?(String)
+                vendored_frameworks += [added_framework_file_path]
+                spec.attributes_hash[platform]["vendored_frameworks"] = vendored_frameworks
+            end
+            def empty_source_files(spec)
+                spec.attributes_hash["source_files"] = []
+                spec.attributes_hash["public_header_files"] = []
+                spec.attributes_hash["private_header_files"] = []
+                ["ios", "watchos", "tvos", "osx"].each do |plat|
+                    if spec.attributes_hash[plat] != nil
+                        spec.attributes_hash[plat]["source_files"] = []
+                        spec.attributes_hash[plat]["public_header_files"] = []
+                        spec.attributes_hash[plat]["private_header_files"] = []
+                    end
+                end
+            end
+
+            prebuild_sandbox = BinaryPrebuild::Sandbox.from_sandbox(self.sandbox)
+            return if prebuild_sandbox.nil?
+
+            specs = self.analysis_result.specifications
+            prebuilt_specs = (specs.select do |spec|
+                # rmtree
+                target_prebuild_files = self.sandbox.root + spec.root.name + "_Prebuild"
+                target_prebuild_files.rmtree if target_prebuild_files.exist?
+
+                self.prebuild_pod_names.include? spec.root.name
+            end)
+
+            prebuilt_specs.each do |spec|
+
+                # Use the prebuild framworks as vendered frameworks
+                # get_corresponding_targets
+                targets = Pod.fast_get_targets_for_pod_name(spec.root.name, self.pod_targets, cache)
+                targets.each do |target|
+                    # the framework_file_path rule is decided when `install_for_prebuild`,
+                    # as to compitable with older version and be less wordy.
+                    prebuild_sandbox.prebuild_vendored_frameworks(spec.root.name).each do |frame_file_path|
+                        framework_file_path = "_Prebuild/" + frame_file_path
+                        add_vendered_framework(spec, target.platform.name.to_s, framework_file_path)
+                    end
+                end
+                # Clean the source files
+                # we just add the prebuilt framework to specific platform and set no source files 
+                # for all platform, so it doesn't support the sence that 'a pod perbuild for one
+                # platform and not for another platform.'
+                empty_source_files(spec)
+
+                # to remove the resurce bundle target. 
+                # When specify the "resource_bundles" in podspec, xcode will generate a bundle 
+                # target after pod install. But the bundle have already built when the prebuit
+                # phase and saved in the framework folder. We will treat it as a normal resource
+                # file.
+                # https://github.com/leavez/cocoapods-binary/issues/29
+                if spec.attributes_hash["resource_bundles"]
+                    # bundle_names = spec.attributes_hash["resource_bundles"].keys
+                    spec.attributes_hash["resource_bundles"] = nil 
+                    spec.attributes_hash["resources"] ||= []
+                    resources = spec.attributes_hash["resources"] || []
+                    resources = [resources] if resources.kind_of?(String)
+                    spec.attributes_hash["resources"] = resources
+                    # spec.attributes_hash["resources"] += bundle_names.map{|n| n+".bundle"}
+                    prebuild_bundles = prebuild_sandbox.prebuild_bundles(spec.root.name).each.map do |bundle_path|
+                        "_Prebuild/" + bundle_path
+                    end
+                    spec.attributes_hash["resources"] += prebuild_bundles
+                end
+
+                # to avoid the warning of missing license
+                spec.attributes_hash["license"] = {}
+                spec.attributes_hash["preserve_paths"] = "**/*"
+
+            end
+
+        end
+
+
+        # Override the download step to skip download and prepare file in target folder
+        old_method = instance_method(:install_source_of_pod)
+        define_method(:install_source_of_pod) do |pod_name|
+
+            # copy from original
+            pod_installer = create_pod_installer(pod_name)
+            # \copy from original
+
+             # copy from original
+             pod_installer.install!
+             # \copy from original
+
+            if self.prebuild_pod_names.include? pod_name
+                pod_installer.install_for_prebuild!(self.sandbox)
+            end
+
+            # copy from original
+            @installed_specs.concat(pod_installer.specs_by_platform.values.flatten.uniq)
+            # \copy from original
+        end
+
+        alias_method :old_create_pod_installer, :create_pod_installer
+        def create_pod_installer(pod_name)
+            pod_installer = old_create_pod_installer(pod_name)
+
+            pods_to_install = sandbox_state.added | sandbox_state.changed
+            unless pods_to_install.include?(pod_name)
+                pod_installer.install_for_prebuild!(self.sandbox) if self.prebuild_pod_names.include? pod_name
+            end
+            pod_installer
+        end
+    end
+end
+
+# A fix in embeded frameworks script.
+#
+# The framework file in pod target folder is a symblink. The EmbedFrameworksScript use `readlink`
+# to read the read path. As the symlink is a relative symlink, readlink cannot handle it well. So 
+# we override the `readlink` to a fixed version.
+#
+module Pod
+    module Generator
+        class EmbedFrameworksScript
+
+            old_method = instance_method(:script)
+            define_method(:script) do
+
+                script = old_method.bind(self).()
+                patch = <<-SH.strip_heredoc
+                    #!/bin/sh
+                
+                    # ---- this is added by cocoapods-binary ---
+                    # Readlink cannot handle relative symlink well, so we override it to a new one
+                    # If the path isn't an absolute path, we add a realtive prefix.
+                    old_read_link=`which readlink`
+                    readlink () {
+                        path=`$old_read_link "$1"`;
+                        if [ $(echo "$path" | cut -c 1-1) = '/' ]; then
+                            echo $path;
+                        else
+                            echo "`dirname $1`/$path";
+                        fi
+                    }
+                    # --- 
+                SH
+
+                # patch the rsync for copy dSYM symlink
+                script = script.gsub "rsync --delete", "rsync --copy-links --delete"
+                
+                patch + script
+            end
+        end
+    end
+end
+
+module Pod
+    module Generator
+      class CopyXCFrameworksScript
+
+        alias_method :old_install_xcframework_args, :install_xcframework_args
+        def install_xcframework_args(xcframework, slices)
+            args = old_install_xcframework_args(xcframework, slices)
+            xcconfig_replace_path = BinaryPrebuild.config.xcconfig_replace_path
+            args.gsub!(/#{xcconfig_replace_path}-(Debug|Release)/, "#{xcconfig_replace_path}-${CONFIGURATION}")
+            args
+          end
+      end
+    end
+end
+
+module Pod
+    module Generator
+      class CopyResourcesScript
+
+        alias_method :old_script, :script
+        def script
+            script = old_script
+            xcconfig_replace_path = BinaryPrebuild.config.xcconfig_replace_path
+            script.gsub!(/#{xcconfig_replace_path}-(Debug|Release)/, "#{xcconfig_replace_path}-${CONFIGURATION}")
+            script
+        end
+      end
+    end
+end

data/lib/cocoapods-util/binary/config.rb

@@ -4,20 +4,49 @@ module BinaryPrebuild
     end
 
     class Config 
-        attr_accessor :enable_all, :enable_targets
-    
+        attr_accessor :dsl_config
+
+        APPLICABLE_DSL_CONFIG = [
+            :all_binary,
+            :binary_dir,
+            :dev_pods_enabled,
+            :xcconfig_replace_path,
+        ].freeze
+
         def initialize()
-            @enable_all = false
-            @enable_targets = []
+            @dsl_config = {}
         end
     
         def self.instance
           @instance ||= new()
         end
 
-        def add_enable_target(name)
-            @enable_targets.push name
-            @enable_targets.uniq!
+        def validate_dsl_config
+            inapplicable_options = @dsl_config.keys - APPLICABLE_DSL_CONFIG
+            return if inapplicable_options.empty?
+            
+            message = <<~HEREDOC
+              [WARNING] The following options (in `config_cocoapods_util`) are not correct: #{inapplicable_options}.
+              Available options: #{APPLICABLE_DSL_CONFIG}.
+            HEREDOC
+      
+            Pod::UI.puts message.yellow
+        end
+
+        def all_binary_enable?
+            @dsl_config[:all_binary] || false
+        end
+
+        def dev_pods_enabled?
+            @dsl_config[:dev_pods_enabled] || false
+        end
+
+        def binary_dir
+            @dsl_config[:binary_dir] || '_Prebuild'
+        end
+
+        def xcconfig_replace_path
+            @dsl_config[:xcconfig_replace_path] || "cocoapods-util-binary"
         end
     end
 end

data/lib/cocoapods-util/binary/helper/names.rb

@@ -0,0 +1,78 @@
+# ABOUT NAMES
+#
+# There are many kinds of name in cocoapods. Two main names are widely used in this plugin.
+# - root_spec.name (spec.root_name, targe.pod_name):
+#   aka "pod_name"
+#   the name we use in podfile. the concept.
+# 
+# - target.name:
+#   aka "target_name"
+#   the name of the final target in xcode project. the final real thing.
+#
+# One pod may have multiple targets in xcode project, due to one pod can be used in mutiple 
+# platform simultaneously. So one `root_spec.name` may have multiple coresponding `target.name`s.
+# Therefore, map a spec to/from targets is a little complecated. It's one to many.
+#
+
+# Tool to transform Pod_name to target efficiently
+module Pod
+    def self.fast_get_targets_for_pod_name(pod_name, targets, cache)
+        pod_name_to_targets_hash = nil
+        if cache.empty?
+            pod_name_to_targets_hash = targets.reduce({}) do |sum, target|
+                array = sum[target.pod_name] || []
+                array << target
+                sum[target.pod_name] = array
+                sum
+            end
+            cache << pod_name_to_targets_hash
+        else
+            pod_name_to_targets_hash = cache.first
+        end
+        
+        pod_name_to_targets_hash[pod_name] || []
+    end
+end
+
+
+
+
+
+
+# Target:
+   
+#     def pod_name
+#       root_spec.name
+#     end
+
+#     def name
+# 	    pod_name + #{scope_suffix}
+#     end	
+
+#     def product_module_name
+#       root_spec.module_name
+#     end
+  
+#     def framework_name
+#       "#{product_module_name}.framework"
+#     end
+
+#    def product_name
+#       if requires_frameworks?
+#         framework_name
+#       else
+#         static_library_name
+#       end
+#     end
+
+#     def product_basename
+#       if requires_frameworks?
+#         product_module_name
+#       else
+#         label
+#       end
+#     end
+
+#     def framework_name
+#       "#{product_module_name}.framework"
+#     end

data/lib/cocoapods-util/binary/helper/podfile_options.rb

@@ -0,0 +1,120 @@
+
+module Pod
+    class Podfile
+      class TargetDefinition
+        def detect_prebuilt_pod(name, requirements)
+          options = requirements.last || {}
+
+          # prebuild
+          @explicit_prebuild_pod_names ||= []
+          @reject_prebuild_pod_names ||= []
+          @explicit_prebuild_pod_names << Specification.root_name(name) if options.is_a?(Hash) && options[:binary]
+          @reject_prebuild_pod_names << Specification.root_name(name) if options.is_a?(Hash) && options.include?(:binary) && !options[:binary]
+          
+          # header search path
+          @explicit_header_search_pod_names ||= []
+          @reject_header_search_pod_names ||= []
+          @explicit_header_search_pod_names << Specification.root_name(name) if options.is_a?(Hash) && options[:framework_search_header]
+          @reject_header_search_pod_names << Specification.root_name(name) if options.is_a?(Hash) && options.include?(:framework_search_header) && !options[:framework_search_header]
+
+          options.delete(:binary) if options.is_a?(Hash)
+          options.delete(:framework_search_header) if options.is_a?(Hash)
+          requirements.pop if options.empty?
+        end
+  
+        # Returns the names of pod targets explicitly declared as prebuilt in Podfile using `:binary => true`.
+        def explicit_prebuild_pod_names
+          names = @explicit_prebuild_pod_names || []
+          names += parent.explicit_prebuild_pod_names if !parent.nil? && parent.is_a?(TargetDefinition)
+          names
+        end
+
+        def reject_prebuild_pod_names
+          names = @reject_prebuild_pod_names || []
+          names += parent.reject_prebuild_pod_names if !parent.nil? && parent.is_a?(TargetDefinition)
+          names
+        end
+
+        def explicit_header_search_pod_names
+          names = @explicit_header_search_pod_names || []
+          names += parent.explicit_header_search_pod_names if !parent.nil? && parent.is_a?(TargetDefinition)
+          names
+        end
+
+        def reject_header_search_pod_names
+          names = @reject_header_search_pod_names || []
+          names += parent.reject_header_search_pod_names if !parent.nil? && parent.is_a?(TargetDefinition)
+          names
+        end
+  
+        # ---- patch method ----
+        # We want modify `store_pod` method, but it's hard to insert a line in the
+        # implementation. So we patch a method called in `store_pod`.
+        original_parse_inhibit_warnings = instance_method(:parse_inhibit_warnings)
+        define_method(:parse_inhibit_warnings) do |name, requirements|
+          detect_prebuilt_pod(name, requirements)
+          original_parse_inhibit_warnings.bind(self).call(name, requirements)
+        end
+      end
+    end
+end
+
+module Pod
+    class Installer
+      # Returns the names of pod targets detected as prebuilt, including
+      # those declared in Podfile and their dependencies
+      def prebuild_pod_names
+        prebuilt_pod_targets.map(&:name).to_set
+      end
+  
+      # Returns the pod targets detected as prebuilt, including
+      # those declared in Podfile and their dependencies
+      def prebuilt_pod_targets
+        @prebuilt_pod_targets ||= begin
+          explicit_prebuild_pod_names = aggregate_targets.flat_map { |target| 
+            target.target_definition.explicit_prebuild_pod_names
+          }.uniq
+
+          reject_prebuild_pod_names = aggregate_targets.flat_map { |target| 
+            target.target_definition.reject_prebuild_pod_names 
+          }.uniq
+          
+          available_pod_names = []
+          prebuild_sandbox = BinaryPrebuild::Sandbox.from_sandbox(self.sandbox)
+          available_pod_names = prebuild_sandbox.target_paths.map {|path| path.basename.to_s } unless prebuild_sandbox.nil?
+          if BinaryPrebuild.config.all_binary_enable?
+            explicit_prebuild_pod_names = available_pod_names
+          else
+            explicit_prebuild_pod_names = (explicit_prebuild_pod_names & available_pod_names).uniq
+          end
+          explicit_prebuild_pod_names -= reject_prebuild_pod_names
+          
+          targets = pod_targets.select { |target| 
+            explicit_prebuild_pod_names.include?(target.pod_name)
+          }
+          targets = targets.reject { |target| sandbox.local?(target.pod_name) } unless BinaryPrebuild.config.dev_pods_enabled?
+          targets.map { |target| target.use_binary = true }
+          targets
+        end
+      end
+    end
+end
+
+module Pod
+  class Target
+    attr_accessor :use_binary
+
+    def frame_header_search_paths_enable?
+      return true if self.use_binary
+      header_search_pod_names.include? self.name
+    end
+
+    def header_search_pod_names
+      @explicit_header_search_pod_names ||= begin
+        target_definitions.flat_map { |target_definition|
+          target_definition.explicit_header_search_pod_names - target_definition.reject_header_search_pod_names
+        }.uniq
+      end
+    end
+  end
+end

data/lib/cocoapods-util/binary/helper/target_checker.rb

@@ -0,0 +1,49 @@
+
+module Pod
+    class Prebuild
+  
+      # Check the targets, for the current limitation of the plugin
+      #
+      # @param [Array<PodTarget>] prebuilt_targets
+      def self.check_one_pod_should_have_only_one_target(prebuilt_targets)
+  
+        targets_have_different_platforms = prebuilt_targets.select {|t| t.pod_name != t.name }
+  
+        if targets_have_different_platforms.count > 0
+          names = targets_have_different_platforms.map(&:pod_name)
+          raw_names = targets_have_different_platforms.map(&:name)
+          message = "Oops, you came across a limitation of cocoapods-binary.
+  
+  The plugin requires that one pod should have ONLY ONE target in the 'Pod.xcodeproj'. There are mainly 2 situations \
+  causing this problem:
+  
+  1. One pod integrates in 2 or more different platforms' targets. e.g.
+      ```
+      target 'iphoneApp' do
+        pod 'A', :binary => true
+      end
+      target 'watchApp' do
+        pod 'A'
+      end
+      ```
+  
+  2. Use different subspecs in multiple targets. e.g.
+      ```
+      target 'iphoneApp' do
+        pod 'A/core'
+        pod 'A/network'
+      end
+      target 'iphoneAppTest' do
+        pod 'A/core'
+      end
+      ```
+  
+  Related pods: #{names}, target names: #{raw_names}
+          "
+          raise Informative, message
+        end
+      end
+  
+  
+    end
+end

data/lib/cocoapods-util/binary/hooks/CocoapodsUtilHook.rb

@@ -1,8 +1,6 @@
-require_relative 'pre_install'
-require_relative 'post_install'
-
 module CocoapodsUtilHook
     Pod::HooksManager.register('cocoapods-util', :pre_install) do |installer_context, _|
+        require_relative 'pre_install'
         BinaryPrebuild::PreInstall.new(installer_context).run
     end
 
@@ -11,6 +9,7 @@ module CocoapodsUtilHook
     end
 
     Pod::HooksManager.register('cocoapods-util', :post_install) do |context, _|
+        require_relative 'post_install'
         BinaryPrebuild::PostInstall.new(context).run
     end
 

data/lib/cocoapods-util/binary/hooks/pre_install.rb

@@ -1,5 +1,3 @@
-require_relative '../targets/pod_target'
-
 module BinaryPrebuild
     class PreInstall
         def initialize(installer_context)
@@ -8,13 +6,16 @@ module BinaryPrebuild
 
         def run
             # [Check Environment]
-            # podfile = @installer_context.podfile
-            # podfile.target_definition_list.each do |target_definition|
-            #     if not target_definition.uses_frameworks?
-            #         STDERR.puts "[!] Cocoapods-binary requires `use_frameworks!`".red
-            #         exit
-            #     end
-            # end
+            podfile = @installer_context.podfile
+            podfile.target_definition_list.each do |target_definition|
+                if not target_definition.uses_frameworks?
+                    STDERR.puts "[!] Cocoapods-binary requires `use_frameworks!`".red
+                    exit
+                end
+            end
+
+            require_relative '../targets/pod_target'
+            require_relative '../Intergation'
         end
     end
 end

data/lib/cocoapods-util/binary/podfile_dsl.rb

@@ -1,26 +1,11 @@
 module Pod    
     class Podfile
         module DSL
-            def self.enable_framework_header_keyword
-                :enable_framework_header
-            end
-
-            def enable_all_framework_header!(enable: true)
-                BinaryPrebuild.config.enable_all = enable
-            end
+            def config_cocoapods_util(options)
+                BinaryPrebuild.config.dsl_config = options
+                BinaryPrebuild.config.validate_dsl_config
 
-            # hook
-            old_method = instance_method(:pod)
-            define_method(:pod) do |name, *args|
-                enable = BinaryPrebuild.config.enable_all
-                options = args.last
-                keyword = DSL.enable_framework_header_keyword
-                if options.is_a?(Hash) && options[keyword] != nil
-                    enable = options.delete(keyword)
-                    args.pop if options.empty?
-                end
-                BinaryPrebuild.config.add_enable_target name.to_s.gsub(/\/.*$/, '') if enable
-                old_method.bind(self).(name, *args)
+                require_relative 'helper/podfile_options'
             end
         end
     end

data/lib/cocoapods-util/binary/prebuild.rb

@@ -1,3 +1,66 @@
 module BinaryPrebuild
+    class Sandbox
+        def initialize(path)
+            @sandbox_path = path
+        end
     
+        def self.from_sandbox(sandbox)
+            root = sandbox.root
+            search_path = BinaryPrebuild.config.binary_dir
+            if !search_path.nil? && !search_path.empty?
+                path = File.expand_path(root + search_path)
+                if File.exist? path
+                    return Sandbox.new(path)
+                end
+            end
+        end
+
+        def binary_dir
+            @binary_dir ||= Pathname.new(@sandbox_path)
+        end
+
+        def target_paths
+            return [] unless binary_dir.exist?
+            @targets ||= binary_dir.children().map do |target_path|
+                if target_path.directory? && (not target_path.children.empty?)
+                    target_path
+                end
+            end.reject(&:nil?).uniq
+            @targets
+        end
+
+        def existed_target_names(name)
+            target_paths.select { |pair| "#{pair.basename}" == "#{name}" }.map { |pair| pair.basename }
+        end
+
+        def framework_folder_path_for_target_name(name)
+            target_paths.select { |pair| pair.basename == name }.last
+        end
+
+        def prebuild_vendored_frameworks(name)
+            target_path = target_paths.select { |pair| "#{pair.basename}" == "#{name}" }.last
+            return [] if target_path.nil?
+
+            configuration_enable = target_path.children().select { |path| "#{path.basename}" == 'Debug' || "#{path.basename}" == 'Release' }.count == 2
+            if configuration_enable
+                xcconfig_replace_path = BinaryPrebuild.config.xcconfig_replace_path
+                ["#{xcconfig_replace_path}-Release/*.{framework,xcframework}"]
+            else
+                ["*.{framework,xcframework}"]
+            end
+        end
+
+        def prebuild_bundles(name)
+            target_path = target_paths.select { |pair| "#{pair.basename}" == "#{name}" }.last
+            return [] if target_path.nil?
+
+            configuration_enable = target_path.children().select { |path| "#{path.basename}" == 'Debug' || "#{path.basename}" == 'Release' }.count == 2
+            if configuration_enable
+                xcconfig_replace_path = BinaryPrebuild.config.xcconfig_replace_path
+                ["#{xcconfig_replace_path}-Release/*.bundle"]
+            else
+                ["*.bundle"]
+            end
+        end
+    end
 end

data/lib/cocoapods-util/binary/targets/pod_target.rb

@@ -4,7 +4,7 @@ module Pod
       class BuildSettings
         # missing framework header search paths
         def missing_framework_header_search_path(pt)
-            return [] unless BinaryPrebuild.config.enable_targets.include? pt.name
+            return [] unless pt.frame_header_search_paths_enable?
 
             paths = []
             pt.file_accessors.each do |file_accessor|
@@ -47,9 +47,27 @@ module Pod
                     paths.push "${PODS_ROOT}/#{header_path.relative_path_from(pt.sandbox.root)}"
                 }
             end
+            replace_xcconfig_configuration_paths(paths)
             paths.uniq
         end
 
+        # replace different configuration xcconfig
+        def replace_xcconfig_configuration_paths(paths)
+            xcconfig_replace_path = BinaryPrebuild.config.xcconfig_replace_path
+            paths.map! { |path|
+                if path =~ /#{xcconfig_replace_path}-(Debug|Release)/
+                    configuration = @configuration.to_s.downcase
+                    if configuration == 'debug'
+                        path.gsub!(/#{xcconfig_replace_path}-(Debug|Release)/, "#{xcconfig_replace_path}-Debug")
+                    elsif configuration == 'release'
+                        path.gsub!(/#{xcconfig_replace_path}-(Debug|Release)/, "#{xcconfig_replace_path}-Release")
+                    end
+                end
+                path
+            }
+            paths
+        end
+
          # A subclass that generates build settings for a `PodTarget`
          class AggregateTargetSettings
             # @return [Array<String>]
@@ -70,6 +88,16 @@ module Pod
                 header_search_paths.concat dependent_targets.flat_map { |pt| missing_framework_header_search_path(pt) } if target.should_build?
                 header_search_paths.uniq
             end
+
+            # 按照规则替换framework_search_paths，兼容不同的configuration
+            # 从编译上来说，仅仅替换了framework_search_paths的路径就够了
+            # @return [Array<String>]
+            alias_method :old_raw_framework_search_paths, :_raw_framework_search_paths
+            def _raw_framework_search_paths
+                framework_search_paths = old_raw_framework_search_paths
+                replace_xcconfig_configuration_paths(framework_search_paths)
+                framework_search_paths
+            end
          end
       end
     end

data/lib/cocoapods-util/command/xcframework/xcframework.rb

@@ -15,16 +15,13 @@ module Pod
       
               def self.options
                 [
-                  ['--force',   '覆盖已经存在的文件'],
-                  ['--create-swiftinterface', '有编译swift文件的framework，如果不包含swiftinterface则无法生成xcframework。
-                    设置该参数会生成一个swiftinterface文件解决create失败的问题。']
+                  ['--force',   '覆盖已经存在的文件']
                 ]
               end
       
               def initialize(argv)
                 @file_path = argv.shift_argument
                 @force = argv.flag?('force')
-                @create_swiftinterface = argv.flag?('create-swiftinterface')
                 super
               end
       
@@ -55,8 +52,7 @@ module Pod
                 
                 builder = XCFrameworkBuilder.new(
                   framework_name,
-                  source_dir,
-                  @create_swiftinterface
+                  source_dir
                 )
                 builder.build_static_xcframework
               end

data/lib/cocoapods-util/command/xcframework/xcframework_build.rb

@@ -1,9 +1,8 @@
 module Pod
     class XCFrameworkBuilder
-        def initialize(name, source_dir, create_swiftinterface)
+        def initialize(name, source_dir)
             @name = name
             @source_dir = source_dir
-            @create_swiftinterface = create_swiftinterface
         end
 
         def build_static_xcframework
@@ -57,7 +56,7 @@ module Pod
             # 2. copy os framework
             if os_archs.count > 0
                 path = Pathname.new("#{@source_dir}/#{os_target_path}")
-                path.mkdir unless path.exist?
+                FileUtils.mkdir_p(path) unless path.exist?
                 `cp -a #{framework_path} #{path}/`
         
                 fwk_path = "#{path}/#{@name}.framework"
@@ -67,7 +66,7 @@ module Pod
             # 3. copy simulation framework
             if sim_archs.count > 0
                 path = Pathname.new("#{@source_dir}/#{simulator_target_path}")
-                path.mkdir unless path.exist?
+                FileUtils.mkdir_p(path) unless path.exist?
                 `cp -a #{framework_path} #{path}/`
 
                 fwk_path = "#{path}/#{@name}.framework"
@@ -86,23 +85,8 @@ module Pod
         def generate_xcframework(framework_paths)
             UI.puts("Generate #{@name}.xcframework")
 
-            framework_paths.each { |framework_path|
-                # check_swiftmodule
-                swiftmodule_path = Dir.glob("#{framework_path}/Modules/*.swiftmodule").first
-                unless swiftmodule_path.nil?
-                    if Dir.glob("#{swiftmodule_path}/*.swiftinterface").empty?
-                        unless @create_swiftinterface
-                            UI.puts "Framework中包含swiftmodule文件，但是没有swiftinterface，无法创建xcframework，请检查Framework文件。或者使用`--create-swiftinterface`参数"
-                            return
-                        end
-                        arm_swiftinterface = Pathname.new("#{swiftmodule_path}/arm.swiftinterface")
-                        File.new(arm_swiftinterface, "w+").close
-                    end
-                end
-            }
-
-            # build xcframework
-            command = "xcodebuild -create-xcframework -framework #{framework_paths.join(' -framework ')} -output #{@source_dir}/#{@name}.xcframework 2>&1"
+            # create xcframework
+            command = "xcodebuild -create-xcframework -allow-internal-distribution -framework #{framework_paths.join(' -framework ')} -output #{@source_dir}/#{@name}.xcframework 2>&1"
             output = `#{command}`.lines.to_a
             result = $?
             # show error
@@ -115,19 +99,19 @@ module Pod
 
         private
         def clean_intermediate_path
-            [os_target_path, simulator_target_path].each do |path|
-                file_path = "#{@source_dir}/#{path}"
-                if File.exist? file_path
-                    FileUtils.rm_rf(file_path)
-                end
-            end
+            file_path = "#{@source_dir}/#{temp_intermediate_path}"
+            FileUtils.rm_rf(file_path) if File.exist? file_path
+        end
+
+        def temp_intermediate_path
+            "__temp_create_xcframework_dir"
         end
 
         def os_target_path
-            "#{@name}_temp_os"
+            "#{temp_intermediate_path}/#{@name}_os"
         end
         def simulator_target_path
-            "#{@name}_temp_simulator"
+            "#{temp_intermediate_path}/#{@name}_simulator"
         end
     end
 end

data/lib/cocoapods-util/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsUtil
-  VERSION = "0.0.16"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-util
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.2.1
 platform: ruby
 authors:
 - guojiashuang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-17 00:00:00.000000000 Z
+date: 2023-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -68,7 +68,11 @@ files:
 - LICENSE
 - README.md
 - lib/cocoapods-util.rb
+- lib/cocoapods-util/binary/Intergation.rb
 - lib/cocoapods-util/binary/config.rb
+- lib/cocoapods-util/binary/helper/names.rb
+- lib/cocoapods-util/binary/helper/podfile_options.rb
+- lib/cocoapods-util/binary/helper/target_checker.rb
 - lib/cocoapods-util/binary/hooks/CocoapodsUtilHook.rb
 - lib/cocoapods-util/binary/hooks/post_install.rb
 - lib/cocoapods-util/binary/hooks/pre_install.rb