cocoapods-binary-matchup 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ac1c4bb4db1b5e437ef1c6841de704d12e459b3f0e494af29d7f07421b6e33e
-  data.tar.gz: 6595cd815f89314d970ffdf1bfb8824b60b224c824b04d178643779984104ea3
+  metadata.gz: 07e6a14cf198cebbb76b6976937d49e9c898cc26587581455ead527556e3fa42
+  data.tar.gz: 52cde4cb69e7bf2ddccc15f96c16d79a702a9b5f294895161be96a562f255c07
 SHA512:
-  metadata.gz: 80703fab252ab28abffb9b0932537add7c95e34d41ec042cc691e13224e4271d181a19dce9d0f88b75ff98fa832fafc32ad466234f17574f6dbd2d2e66c8c183
-  data.tar.gz: e5af0a07901d1a067e1e977a03daea4aecea122e7555c0516c82d1b733e3e7cd690890e14dd6c4ccdcf7005a2e95b7e2a87eac9102f95fc72b617f39895f7cba
+  metadata.gz: b393ac322ea327f09e914533d846693cc133653e1f0c8267131af131dbeeb52e53c6b8f1ae3ae128eb43ca463d9cde767edf453ca26faea5b785e5cb5ef61d19
+  data.tar.gz: 107faf52b261ee0ba0e73d4db661ed4a3d8677f395724b7af37675cc176ade72ff5736492608a61ee79bbfa58b97034082de0425dcdf04dd550adb7b6ab54368

data/lib/cocoapods-binary-matchup/Main.rb

@@ -172,8 +172,7 @@ Pod::HooksManager.register('cocoapods-binary-matchup', :pre_install) do |install
     Pod::Podfile::DSL.enable_prebuild_patch false
     Pod::Config.force_disable_write_lockfile false
     Pod::Installer.disable_install_complete_message false
-    
-    
+        
     # -- step 2: pod install ---
     # install
     Pod::UI.puts "\n"
@@ -183,3 +182,211 @@ Pod::HooksManager.register('cocoapods-binary-matchup', :pre_install) do |install
     # go on the normal install step ...
 end
 
+Pod::HooksManager.register('cocoapods-binary-matchup', :post_install) do |installer_context|
+    require_relative 'Integration'
+    
+    # 检查是否是预构建阶段，如果是则跳过
+    require_relative 'helper/feature_switches'
+    if Pod.is_prebuild_stage
+        next
+    end
+    
+    Pod::UI.puts "📱 Post-install: Adding prebuilt framework resources to Pods-OMI-resources.sh"
+    
+    # 从ObjectSpace中获取installer实例（类似pre_install hook的做法）
+    installer = nil
+    include ObjectSpace
+    ObjectSpace.each_object(Pod::Installer) { |inst| installer = inst }
+    
+    if installer.nil?
+        Pod::UI.puts "⚠️  Could not find installer instance, skipping framework resources processing"
+        next
+    end
+    
+    # 处理每个aggregate target的资源脚本
+    installer.aggregate_targets.each do |aggregate_target|
+        if !aggregate_target.static_framework?
+            Pod::UI.puts "  ⚠️  Skipping static framework: #{aggregate_target.name}"
+            next
+        end
+
+        # 手动构建资源脚本路径（CocoaPods没有直接的script_path API）
+        target_support_dir = installer.sandbox.target_support_files_dir(aggregate_target.name)
+        script_path = target_support_dir + "#{aggregate_target.name}-resources.sh"
+        
+        Pod::UI.puts "  🔍 Checking script path: #{script_path}"
+        next unless script_path.exist?
+        
+        Pod::UI.puts "  🔧 Processing #{script_path.basename}"
+        
+        # 收集预编译framework的资源
+        framework_resources = collect_prebuilt_framework_resources(installer, aggregate_target)
+        
+        if framework_resources.any?
+            # 修改资源脚本
+            modify_resources_script(script_path, framework_resources)
+            Pod::UI.puts "  ✅ Added #{framework_resources.count} framework resources to #{script_path.basename}"
+        else
+            Pod::UI.puts "  ℹ️  No framework resources found for #{aggregate_target.name}"
+        end
+    end
+    
+    Pod::UI.puts "✅ Framework resources processing completed"
+end
+
+# 收集预编译framework中的资源
+def collect_prebuilt_framework_resources(installer, aggregate_target)
+    framework_resources = []
+    
+    # 获取预编译的pod列表 - 强制刷新以确保获取最新状态
+    prebuilt_pod_names = installer.refresh_prebuild_pod_names!
+    
+    aggregate_target.pod_targets.each do |pod_target|
+        next unless prebuilt_pod_names.include?(pod_target.pod_name)
+        
+        Pod::UI.puts "    📱 Scanning prebuilt pod: #{pod_target.pod_name}"
+        
+        # 获取pod目录
+        pod_dir = installer.sandbox.pod_dir(pod_target.pod_name)
+        next unless pod_dir.exist?
+        
+        # 查找framework目录
+        framework_dirs = pod_dir.children.select { |child| 
+            child.directory? && child.extname == '.framework' 
+        }
+        
+        framework_dirs.each do |framework_dir|
+            framework_name = framework_dir.basename.to_s
+            Pod::UI.puts "      🔍 Scanning framework: #{framework_name}"
+            
+            # 扫描framework中的资源
+            resources = scan_framework_resources(framework_dir, pod_target.pod_name)
+            framework_resources.concat(resources)
+        end
+    end
+    
+    framework_resources.uniq
+end
+
+# 扫描framework中的资源文件
+def scan_framework_resources(framework_dir, pod_name)
+    resources = []
+    framework_name = framework_dir.basename.to_s
+    
+    Pod::UI.puts "      🎯 Framework path: #{framework_dir}"
+    Pod::UI.puts "      🎯 Pod name: #{pod_name}, Framework name: #{framework_name}"
+    
+    # 资源文件类型
+    resource_patterns = [
+        '*.png', '*.jpg', '*.jpeg', '*.gif', '*.webp',     # 图片
+        '*.storyboard', '*.xib',                           # 界面文件
+        '*.storyboardc',                                   # 编译后的storyboard
+        '*.nib',                                           # 编译后的xib
+        '*.bundle',                                        # 资源包
+        '*.ttf', '*.otf',                                  # 字体
+        '*.mp3', '*.wav', '*.m4a', '*.mp4', '*.mov'        # 媒体
+    ]
+    
+    # 扫描framework根目录
+    resource_patterns.each do |pattern|
+        Dir.glob(framework_dir + pattern).each do |resource_path|
+            resource_file = Pathname(resource_path)
+                # 其他资源使用BUILT_PRODUCTS_DIR/framework路径
+                # 例如：${PODS_ROOT}/CocoaDebug/CocoaDebug.framework/App.storyboardc
+            resource_entry = "${PODS_ROOT}/#{pod_name}/#{framework_name}/#{resource_file.basename}"            
+            resources << resource_entry
+            Pod::UI.puts "        📄 Found: #{resource_file.basename} -> #{resource_entry}"
+        end
+    end
+    
+    # 扫描framework/Resources目录
+    resources_dir = framework_dir + 'Resources'
+    if resources_dir.exist?
+        Pod::UI.puts "        📁 Scanning Resources subdirectory"
+        resource_patterns.each do |pattern|
+            Dir.glob(resources_dir + pattern).each do |resource_path|
+                resource_file = Pathname(resource_path)
+                
+                # Resources目录中的资源也使用BUILT_PRODUCTS_DIR路径
+                resource_entry = "${PODS_ROOT}/#{pod_name}/#{framework_name}/#{resource_file.basename}"
+                resources << resource_entry
+                
+                Pod::UI.puts "        📄 Found in Resources/: #{resource_file.basename} -> #{resource_entry}"
+            end
+        end
+    end
+    
+    Pod::UI.puts "      📊 Total resources found: #{resources.count}"
+    resources
+end
+
+# 修改resources脚本，添加framework资源
+def modify_resources_script(script_path, framework_resources)
+    return if framework_resources.empty?
+    
+    original_content = script_path.read
+    
+    # 检查是否已经添加过framework资源（避免重复）
+    if original_content.include?('# Prebuilt Framework Resources')
+        Pod::UI.puts "    ℹ️  Framework resources already added, skipping"
+        return
+    end
+    
+    Pod::UI.puts "    📝 Adding #{framework_resources.count} framework resources to script"
+    framework_resources.each_with_index do |resource, index|
+        Pod::UI.puts "      #{index + 1}. #{resource}"
+    end
+    
+    # 构建要添加的资源安装代码
+    framework_resources_block = build_framework_resources_block(framework_resources)
+    
+    # 在Debug配置块中插入framework资源（而不是脚本末尾）
+    debug_pattern = /if \[\[ "\$CONFIGURATION" == "Debug" \]\]; then/
+    if original_content.match(debug_pattern)
+        # 找到Debug配置块，在其中插入framework资源
+        modified_content = original_content.sub(debug_pattern) do |match|
+            "#{match}\n#{framework_resources_block}"
+        end
+    else
+        # 如果没有找到Debug配置块，创建一个新的
+        framework_resources_with_condition = <<~SCRIPT
+        if [[ "$CONFIGURATION" == "Debug" ]]; then
+        #{framework_resources_block}
+        fi
+        SCRIPT
+        
+        # 在脚本末尾（exit 0之前）插入
+        if original_content.include?('exit 0')
+            modified_content = original_content.sub(/exit 0/, "#{framework_resources_with_condition}\nexit 0")
+        else
+            modified_content = original_content + "\n#{framework_resources_with_condition}"
+        end
+    end
+    
+    # 写回修改后的内容
+    script_path.write(modified_content)
+    
+    Pod::UI.puts "    ✅ Script modified successfully"
+    
+    # 显示修改后脚本的相关部分以便验证
+    debug_lines = modified_content.lines.select.with_index do |line, index|
+        line.include?('CONFIGURATION') || line.include?('Prebuilt Framework') || 
+        (index > 0 && modified_content.lines[index-1].include?('CONFIGURATION'))
+    end
+    Pod::UI.puts "    📄 Debug configuration block preview:"
+    debug_lines.first(5).each { |line| Pod::UI.puts "      #{line.chomp}" }
+end
+
+# 构建framework资源安装代码块
+def build_framework_resources_block(framework_resources)
+    block = "  # Prebuilt Framework Resources\n"
+    block += "  echo \"Installing prebuilt framework resources...\"\n"
+    
+    framework_resources.each do |resource|
+        block += "  install_resource \"#{resource}\"\n"
+    end
+    
+    block += "  echo \"Prebuilt framework resources installation completed\"\n"
+    
+    return block
+end

data/lib/cocoapods-binary-matchup/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsBinary
-    VERSION = "0.0.18"
+    VERSION = "0.0.19"
 end

data/lib/cocoapods-binary-matchup/rome/build_framework.rb

@@ -124,8 +124,10 @@ def build_for_iosish_platform(sandbox,
   # output
   output_path.mkpath unless output_path.exist?
 
-  # 🔑 添加资源处理 - 修复 iOS 14 资源丢失问题
-  copy_resources_to_framework(sandbox, target, device_framework_path)
+  if target.static_framework?
+    # 🔑 添加资源处理 - 修复静态库资源丢失问题
+    copy_resources_to_framework(sandbox, target, device_framework_path)
+  end
 
   FileUtils.mv device_framework_path, output_path, :force => true
 
@@ -135,93 +137,83 @@ end
 def copy_resources_to_framework(sandbox, target, framework_path)
   Pod::UI.puts "📋 Processing resources for #{target.name}..."
   
-  # 获取 target 的资源文件
-  pod_target = target
-  consumer = pod_target.root_spec.consumer(pod_target.platform.name)
-  file_accessor = Pod::Sandbox::FileAccessor.new(sandbox.pod_dir(pod_target.pod_name), consumer)
+  pod_dir = Pathname.new(sandbox.pod_dir(target.pod_name))
+  framework_dir = Pathname.new(framework_path)
   
-  # 1. 处理 resource_bundles（使用正确的 API）
-  resource_bundles = consumer.resource_bundles
-  unless resource_bundles.empty?
-    Pod::UI.puts "  📦 Processing #{resource_bundles.count} resource bundles"
-    resource_bundles.each do |bundle_name, bundle_files|
-      bundle_path = Pathname(framework_path).dirname + "#{bundle_name}.bundle"
-      if bundle_path.exist?
-        Pod::UI.puts "  📦 Found resource bundle: #{bundle_name}.bundle"
-      end
-    end
-  end
+  # 直接递归扫描 pod 目录下的所有资源文件，拷贝到 framework 根目录
+  scan_and_copy_resources_flat(pod_dir, framework_dir)
   
-  # 2. 处理普通资源文件
-  unless file_accessor.resources.empty?
-    Pod::UI.puts "  📄 Processing #{file_accessor.resources.count} resource files"
-    file_accessor.resources.each do |resource_file|
-      if File.exist?(resource_file)
-        # 确定目标路径
-        relative_path = resource_file.relative_path_from(sandbox.pod_dir(pod_target.pod_name))
-        target_path = Pathname(framework_path) + relative_path.basename
-        
-        # 拷贝资源文件
-        FileUtils.cp_r(resource_file, target_path, :remove_destination => true)
-        Pod::UI.puts "    📄 Copied resource: #{relative_path.basename}"
-      end
-    end
-  end
+  Pod::UI.puts "✅ Resource processing completed for #{target.name}"
+end
+
+# 递归扫描资源文件并平铺拷贝到目标目录
+def scan_and_copy_resources_flat(source_dir, target_dir)
+  # 确保参数是Pathname类型
+  source_dir = Pathname.new(source_dir) unless source_dir.is_a?(Pathname)
+  target_dir = Pathname.new(target_dir) unless target_dir.is_a?(Pathname)
   
-  # 3. 特别处理 Assets.xcassets (iOS 14 兼容性)
-  assets_paths = file_accessor.resources.select { |path| path.extname == '.xcassets' }
-  unless assets_paths.empty?
-    Pod::UI.puts "  🎨 Processing #{assets_paths.count} Assets.xcassets for iOS 14 compatibility"
-    assets_paths.each do |assets_path|
-      relative_path = assets_path.relative_path_from(sandbox.pod_dir(pod_target.pod_name))
-      target_path = Pathname(framework_path) + relative_path.basename
-      
-      FileUtils.cp_r(assets_path, target_path, :remove_destination => true)
-      Pod::UI.puts "    📱 Copied Assets.xcassets: #{relative_path.basename}"
-    end
-  end
+  Pod::UI.puts "📁 Recursively scanning directory: #{source_dir}"
   
-  # 4. 处理 vendored_frameworks
-  unless file_accessor.vendored_frameworks.empty?
-    Pod::UI.puts "  🔗 Processing #{file_accessor.vendored_frameworks.count} vendored frameworks"
-    file_accessor.vendored_frameworks.each do |vendored_framework|
-      if File.exist?(vendored_framework)
-        framework_name = vendored_framework.basename
-        target_path = Pathname(framework_path).dirname + framework_name
-        
-        FileUtils.cp_r(vendored_framework, target_path, :remove_destination => true)
-        Pod::UI.puts "    🔗 Copied vendored framework: #{framework_name}"
-      end
-    end
-  end
+  # 资源文件扩展名
+  resource_extensions = [
+    '.png', '.jpg', '.jpeg', '.gif', '.webp', '.svg',     # 图片
+    '.storyboard', '.xib', '.storyboardc', '.nib',        # 界面文件
+    '.ttf', '.otf', '.woff', '.woff2',                    # 字体
+    '.mp3', '.wav', '.m4a', '.mp4', '.mov', '.avi',       # 媒体
+    '.json', '.plist', '.strings', '.xcassets',           # 配置文件
+    'metallib'                                            # metal or opengl文件
+  ]
   
-  # 5. 处理 vendored_libraries
-  unless file_accessor.vendored_libraries.empty?
-    Pod::UI.puts "  📚 Processing #{file_accessor.vendored_libraries.count} vendored libraries"
-    file_accessor.vendored_libraries.each do |vendored_library|
-      if File.exist?(vendored_library)
-        library_name = vendored_library.basename
-        target_path = Pathname(framework_path) + library_name
+  # 特殊处理的目录类型（这些需要完整保留）
+  special_directory_extensions = ['.bundle', '.xcassets', '.lproj']
+  
+  # 递归查找并拷贝资源文件，传递原始根目录用于路径计算
+  find_and_copy_resources_recursively(source_dir, target_dir, source_dir, resource_extensions, special_directory_extensions)
+end
+
+# 递归查找资源文件并拷贝
+def find_and_copy_resources_recursively(current_dir, target_dir, source_root_dir, resource_extensions, special_extensions)
+  # 确保所有参数都是Pathname类型
+  current_dir = Pathname.new(current_dir) unless current_dir.is_a?(Pathname)
+  target_dir = Pathname.new(target_dir) unless target_dir.is_a?(Pathname) 
+  source_root_dir = Pathname.new(source_root_dir) unless source_root_dir.is_a?(Pathname)
+  
+  return unless current_dir.exist? && current_dir.directory?
+  
+  current_dir.children.each do |child|
+    # 跳过隐藏文件和系统目录
+    next if child.basename.to_s.start_with?('.')
+    next if ['.git', '.svn', 'node_modules', '.DS_Store'].include?(child.basename.to_s)
+    
+    if child.directory?
+      # 检查是否是特殊资源目录（需要完整保留的）
+      if special_extensions.include?(child.extname)
+        Pod::UI.puts "  📦 Copying special directory: #{child.basename}"
+        target_path = target_dir + child.basename
+        FileUtils.cp_r(child.to_s, target_path.to_s, :remove_destination => true)
+      else
+        # 递归处理普通目录
+        find_and_copy_resources_recursively(child, target_dir, source_root_dir, resource_extensions, special_extensions)
+      end
+    else
+      # 检查是否是资源文件
+      if resource_extensions.include?(child.extname.downcase)
+        Pod::UI.puts "  📄 Copying resource file: #{child.basename}"
+        target_path = target_dir + child.basename
+        
+        # 处理文件名冲突（如果有重名文件，添加路径前缀）
+        if target_path.exist?
+          # 计算相对于根目录的路径作为前缀
+          relative_dir = child.dirname.relative_path_from(source_root_dir)
+          safe_name = "#{relative_dir.to_s.gsub('/', '_')}_#{child.basename}"
+          target_path = target_dir + safe_name
+          Pod::UI.puts "    ⚠️  File name conflict, renamed to: #{safe_name}"
+        end
         
-        FileUtils.cp_r(vendored_library, target_path, :remove_destination => true)
-        Pod::UI.puts "    📚 Copied vendored library: #{library_name}"
+        FileUtils.cp(child.to_s, target_path.to_s)
       end
     end
   end
-  
-  # 6. iOS 14 特别处理：确保资源目录结构正确
-  deployment_target = Pod.min_deployment_target
-  if deployment_target && Gem::Version.new(deployment_target) < Gem::Version.new("15.0")
-    Pod::UI.puts "  🔧 Applying iOS 14 compatibility fixes..."
-    
-    # 确保 framework 内部有正确的目录结构
-    framework_resources_path = Pathname(framework_path) + "Resources"
-    framework_resources_path.mkpath unless framework_resources_path.exist?
-    
-    Pod::UI.puts "    ✅ iOS 14 compatibility applied"
-  end
-  
-  Pod::UI.puts "✅ Resource processing completed for #{target.name}"
 end
 
 def xcodebuild(sandbox, target, sdk='macosx', deployment_target=nil, other_options=[])
@@ -253,8 +245,6 @@ def xcodebuild(sandbox, target, sdk='macosx', deployment_target=nil, other_optio
   [is_succeed, log]
 end
 
-
-
 module Pod
   class Prebuild
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binary-matchup
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - leavez