lib/cocoapods-mtxx-bin/native/resolver.rb in cocoapods-mtxx-bin-0.0.13 vs lib/cocoapods-mtxx-bin/native/resolver.rb in cocoapods-mtxx-bin-1.0.0

@@ -4,11 +4,11 @@
 require 'cocoapods'
 require 'cocoapods-mtxx-bin/native/podfile'
 require 'cocoapods-mtxx-bin/native/sources_manager'
 require 'cocoapods-mtxx-bin/native/installation_options'
 require 'cocoapods-mtxx-bin/gem_version'
-require 'cocoapods-mtxx-bin/command/bin/archive'
+# require 'cocoapods-mtxx-bin/command/bin/archive'
 require 'cocoapods-mtxx-bin/helpers/buildAll/bin_helper'
 require 'cocoapods-mtxx-bin/config/config'
 
 module Pod
   class Resolver
@@ -89,12 +89,11 @@
       end
     end
 
     # 读取黑名单
     def read_black_list
-      binary_dir = CBin.config.binary_dir
-      config_file = File.join(binary_dir, 'BinConfig.yaml')
+      config_file = File.join(Pod::Config.instance.project_root, 'BinConfig.yaml')
       return nil unless File.exist?(config_file)
       config = YAML.load(File.open(config_file))
       return nil if config.nil?
       install_config = config['install_config']
       return nil if install_config.nil?
@@ -230,38 +229,38 @@
             end
             rspec
           end.compact
         end
 
-        if missing_binary_specs.any?
-          missing_binary_specs.uniq.each do |spec|
-            # UI.message "【#{spec.name} | #{spec.version}】组件无对应二进制版本 , 将采用源码依赖." unless spec.root.source[:type] == 'zip'
-          end
-          # 下面的代码为了实现 auto 命令的 --all-make
-          Pod::Command::Bin::Archive.missing_binary_specs(missing_binary_specs)
-          #缓存没有二进制组件到spec文件，local_psec_dir 目录
-          sources_sepc = []
-          des_dir = CBin::Config::Builder.instance.local_psec_dir
-          FileUtils.rm_f(des_dir) if File.exist?des_dir
-          Dir.mkdir des_dir unless File.exist?des_dir
-          missing_binary_specs.uniq.each do |spec|
-            # 排除subspec
-            next if spec.name.include?('/')
-
-            spec_git_res = false
-            CBin::Config::Builder.instance.ignore_git_list.each do |ignore_git|
-              spec_git_res = spec.source[:git] && spec.source[:git].include?(ignore_git)
-              break if spec_git_res
-            end
-            next if spec_git_res
-
-            #获取没有制作二进制版本的spec集合
-            sources_sepc << spec
-            unless spec.defined_in_file.nil?
-              FileUtils.cp("#{spec.defined_in_file}", "#{des_dir}")
-            end
-          end
-        end
+        # if missing_binary_specs.any?
+        #   missing_binary_specs.uniq.each do |spec|
+        #     # UI.message "【#{spec.name} | #{spec.version}】组件无对应二进制版本 , 将采用源码依赖." unless spec.root.source[:type] == 'zip'
+        #   end
+        #   # 下面的代码为了实现 auto 命令的 --all-make
+        #   Pod::Command::Bin::Archive.missing_binary_specs(missing_binary_specs)
+        #   #缓存没有二进制组件到spec文件，local_psec_dir 目录
+        #   sources_sepc = []
+        #   des_dir = CBin::Config::Builder.instance.local_psec_dir
+        #   FileUtils.rm_f(des_dir) if File.exist?des_dir
+        #   Dir.mkdir des_dir unless File.exist?des_dir
+        #   missing_binary_specs.uniq.each do |spec|
+        #     # 排除subspec
+        #     next if spec.name.include?('/')
+        #
+        #     spec_git_res = false
+        #     CBin::Config::Builder.instance.ignore_git_list.each do |ignore_git|
+        #       spec_git_res = spec.source[:git] && spec.source[:git].include?(ignore_git)
+        #       break if spec_git_res
+        #     end
+        #     next if spec_git_res
+        #
+        #     #获取没有制作二进制版本的spec集合
+        #     sources_sepc << spec
+        #     unless spec.defined_in_file.nil?
+        #       FileUtils.cp("#{spec.defined_in_file}", "#{des_dir}")
+        #     end
+        #   end
+        # end
 
         specs_by_target
       end
     end