cocoapods-bb-xcframework 0.2.6.6 → 0.2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0b8247f09ae9e9a153bdbf204ea123bec0ad7ac63d40673f51fe6c282d02c23
-  data.tar.gz: 6473f2b2995b8474794979db49c6497bf21f3ec31af77cbd47619f294aca8d38
+  metadata.gz: d978114db2ee372ac4e3d21ff2aa2e0142703f8f2b7513a7cb7f66446e7a38f3
+  data.tar.gz: 5ce56a269c08760bd8d2e4c7a1103da23518ef46e311cb6894d3b8c2c4c040a4
 SHA512:
-  metadata.gz: b6ca50c209203d62016f6672f348e7d4937b9620fde16a1f1ae7cf3415a2adc161e8c18931ec4a29bed22d6460e2c79097225b690c259ae352f966b30c3a7067
-  data.tar.gz: 3e711237af20aea6305694e093664fff7cd66e2cb719326c507d3469008ea4bdd92624f47c5e6dbed2ba3255587be05f53cb292f74f99db622b47bf18a4ed1d2
+  metadata.gz: c6395271306ac0f9019d4649d87606e49336c67e5b082f2c0ad212b523ce2eed44c5f719b8d825aff4ae2fe210195cdc70747ff733f697ec69159007ec9b38fb
+  data.tar.gz: 296d7bd8e51898bcff76e6b11abaf92f6597db1f0f12ed1af9b19ae20f879de23c594d486407cebdd7c806ad830d9f237b964f7a5607cd73170f8851040d0190

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

@@ -36,7 +36,8 @@ module Pod
           ['--enable-bitcode', 'package enable bitcode'],
           ['--no-symbols', 'package not use symbols'], # 符号表
           ['--no-support-maccatalyst', 'package support generate MacCatalyst'], # 是否支持MacCatalyst方式支持iOS应用在mac平台运行库生成
-          ['--no-support-dynamic', 'package support Mach-O dynamically linked shared library'] # 是否支持动态库生成
+          ['--no-support-dynamic', 'package support Mach-O dynamically linked shared library'], # 是否支持动态库生成
+          ['--no-archive-export', 'xcodebuild archive export'] # 是否支持本地导出,导出dylib动态库
         ].concat super
       end
 
@@ -54,6 +55,7 @@ module Pod
         @symbols = argv.flag?('symbols',true)
         @support_maccatalyst = argv.flag?('support-maccatalyst',true)
         @support_dynamic = argv.flag?('support-dynamic',false)
+        @archive_export = argv.flag?('archive-export',true)
         config.static_library_enable = @use_static_library
         super
       end
@@ -64,9 +66,16 @@ module Pod
       end
 
       def run
-        UI.puts "argvs @name:#{@name} @source:#{@source} @spec_sources:#{@spec_sources}"
-        frameworker = Frameworker.new(@name, @source, @spec_sources, @subspecs, @configuration, @force, @use_modular_headers, @enable_bitcode, @symbols, @support_maccatalyst, @support_dynamic)
-        frameworker.run
+        UI.puts "argvs @name:#{@name} @source:#{@source} @spec_sources:#{@spec_sources} @subspecs:#{@subspecs} @archive_export:#{@archive_export}"
+        if @archive_export
+          puts "local builder xcframework"
+          frameworker = LocalBuilder.new(@name, @source, @spec_sources, @subspecs, @configuration, @force, @use_modular_headers, @enable_bitcode, @symbols, @support_maccatalyst, @support_dynamic, Dir.pwd)
+          frameworker.build
+        else
+          puts "remote builder xcframework"
+          frameworker = Frameworker.new(@name, @source, @spec_sources, @subspecs, @configuration, @force, @use_modular_headers, @enable_bitcode, @symbols, @support_maccatalyst, @support_dynamic)
+          frameworker.run
+        end
       end
     end
   end

data/lib/cocoapods-xcframework/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsXCFramework
-  VERSION = "0.2.6.6"
+  VERSION = "0.2.7.0"
 end

data/lib/cocoapods-xcframework/local_build.rb

@@ -0,0 +1,323 @@
+module Pod
+  class LocalBuilder
+    include PodUtil
+    include DirUtil
+    include Config::Mixin
+    def initialize(name, source, spec_sources, subspecs, configuration, force, use_modular_headers=true, enable_bitcode=false, symbols=true, support_maccatalyst=true, support_dynamic=false, source_dir=Dir.pwd)
+      @name = name
+      @source = source
+      @spec_sources = spec_sources
+      @subspecs = subspecs
+      @configuration = configuration
+      @force = force
+      @use_modular_headers = use_modular_headers
+      @enable_bitcode = enable_bitcode
+      @symbols = symbols
+      @support_maccatalyst = support_maccatalyst
+      @support_dynamic = support_dynamic
+      @spec = spec_with_path @name
+      @source_dir = source_dir
+      @outputs = Hash.new
+    end
+
+    def run
+    end
+
+    def build
+      spec = spec_with_path @name
+      UI.puts "正在生成Local XCFramework #{spec.name}(#{spec.version}) with configuration #{@configuration} isSymbols:#{@symbols}".yellow
+      @is_spec_from_path = true if spec
+      spec ||= spec_with_name @name
+      target_dir, work_dir = create_working_directory_by_spec spec, @force
+      build_dir = "#{work_dir}/build"
+      archive_path = "#{build_dir}/archives"
+      defines = ""
+      if @configuration == 'Debug'
+        defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=YES ONLY_ACTIVE_ARCH=NO'
+      else
+        if @symbols
+          defines << "GCC_GENERATE_DEBUGGING_SYMBOLS=YES" # Release模式需要符号表应于问题排查(二进制切源码操作) by hm 21/10/13
+        else
+          defines << "GCC_GENERATE_DEBUGGING_SYMBOLS=NO" # 去除符号表
+        end
+      end
+      FileUtils.rm_rf(build_dir)
+
+      build_all_device(defines, build_dir, archive_path)
+      makeXCFramework(archive_path, build_dir)
+      exportdSYMs(archive_path, build_dir)
+      outputs(target_dir)
+    end
+
+    def xcode_xbuild(destination, archs, platform, defines, build_dir, archive_path)
+        # xcodebuild archive requires -scheme when -archivePath is specified
+        spec = spec_with_path @name
+        spec ||= spec_with_name @name
+        
+        scheme_name = @spec&.name
+        configuration = @configuration
+        skip_install = 'NO'
+        plat_name   = platform.to_s.gsub(/\s+/, '_')
+        archivePath = "#{archive_path}/#{scheme_name}-#{plat_name}.xcarchive"
+        UI.puts "archivePath:#{archivePath}"
+        if scheme_name.nil?
+          UI.puts("❌ archive 构建缺少 scheme，请在调用 xcode_xbuild 时显式传入 scheme").red
+          Process.exit 1
+        end
+        command = "xcodebuild archive " \
+                  "-scheme '#{scheme_name}' " \
+                  "-archivePath '#{archivePath}' " \
+                  "-destination '#{destination}' " \
+                  "-configuration #{configuration} " \
+                  "ARCHS='#{archs}' " \
+                  "SKIP_INSTALL=#{skip_install}" \
+                  "#{defines} " \
+                  "SWIFT_OPTIMIZATION_LEVEL=-Onone DEBUG_INFORMATION_FORMAT=dwarf-with-dsym " \
+                  "BUILD_LIBRARY_FOR_DISTRIBUTION=YES  clean build" \
+
+        # --- enhanced logging & reliable failure surfacing ---
+        log_dir  = File.join(archivePath, 'logs')
+        FileUtils.mkdir_p(log_dir)
+        log_raw = File.join(log_dir, "xcodebuild-#{scheme_name}-#{plat_name}-#{configuration}.raw.log")
+
+        # Allow disabling xcpretty via env
+        use_pretty = ENV['XBUILDER_NOPRETTY'] != '1'
+        wrapped = if use_pretty
+          "set -o pipefail; #{command} | tee '#{log_raw}' | xcpretty"
+        else
+          # no pretty: just tee to log and console
+          "set -o pipefail; #{command} | tee '#{log_raw}'"
+        end
+        UI.puts "XBuilder command: #{command}"
+        success = system('bash', '-lc', wrapped)
+        unless success
+          UI.puts "\n** xcodebuild failed — showing last 200 lines of raw log: #{log_raw}".red
+          if File.exist?(log_raw)
+            tail = `tail -n 200 '#{log_raw}'`
+            UI.puts tail
+          end
+          Pod::ErrorUtil.error_report(command, []) if defined?(Pod::ErrorUtil)
+          Process.exit $?.exitstatus.nonzero? || 1
+        end
+    end
+
+    def build_all_device(defines, build_dir, archive_path)
+      # build general first because simulator will exchange SDKROOT to simulat sdk
+      build_general_device defines, build_dir, archive_path
+      build_simulator_device defines, build_dir, archive_path
+      build_MacCatalyst_device defines, build_dir, archive_path if @support_maccatalyst
+    end
+
+    def build_general_device defines, build_dir, archive_path
+        UI.puts("--- Building framework #{@spec} with general device")
+        destination = 'generic/platform=iOS'
+        archs = 'arm64'
+        xcode_xbuild(destination, archs, "iOS", defines, build_dir, archive_path)
+    end
+
+    def build_simulator_device defines, build_dir, archive_path
+        UI.puts("--- Building framework #{@spec} with simulator device")
+        destination = 'generic/platform=iOS Simulator'
+        archs = 'x86_64 arm64'
+        xcode_xbuild(destination, archs, "Simulator", defines, build_dir, archive_path)
+    end
+
+    def build_MacCatalyst_device defines, build_dir, archive_path
+        UI.puts("--- Building framework #{@spec} with MacCatalyst device")
+        destination = 'generic/platform=macOS,variant=Mac Catalyst,name=Any Mac'
+        archs = 'x86_64 arm64'
+        xcode_xbuild(destination, archs, "MacCatalyst", defines, build_dir, archive_path)
+    end
+
+    def makeXCFramework(archive_path, output_dir)
+      spec = spec_with_path @name
+      spec ||= spec_with_name @name
+      framework_name = spec.name
+
+      # scan xcarchive directories
+      archives = Dir.glob(File.join(archive_path, '*.xcarchive'))
+      if archives.empty?
+        UI.puts("❌ 未在 #{archive_path} 下找到 xcarchive 产物，无法生成 xcframework").red
+        Process.exit 1
+      end
+
+      framework_args = []
+
+      archives.each do |archive|
+        framework_path = File.join(
+          archive,
+          'Products',
+          'Library',
+          'Frameworks',
+          "#{framework_name}.framework"
+        )
+        if File.exist?(framework_path)
+          framework_args << "-framework '#{framework_path}'"
+          UI.puts "� Found framework: #{framework_path}".green
+        else
+          UI.puts "⚠️ 未在 #{archive} 中找到 #{framework_name}.framework，已跳过".yellow
+        end
+      end
+
+      if framework_args.empty?
+        UI.puts("❌ 未找到任何可用 Framework，xcframework 生成失败").red
+        Process.exit 1
+      end
+
+      xcframework_path = File.join(output_dir, "#{framework_name}.xcframework")
+      FileUtils.rm_rf(xcframework_path)
+      @outputs[:xcframework] = xcframework_path
+
+      command = [
+        'xcodebuild -create-xcframework',
+        framework_args.join(' '),
+        "-output '#{xcframework_path}'"
+      ].join(' ')
+
+      UI.puts "� Creating XCFramework:"
+      UI.puts command.cyan
+
+      success = system(command)
+      unless success
+        UI.puts("❌ xcodebuild -create-xcframework 执行失败").red
+        Process.exit $?.exitstatus.nonzero? || 1
+      end
+
+      UI.puts "✅ XCFramework 生成成功:"
+      UI.puts xcframework_path.green
+    end
+
+    # 导出符号表
+    def exportdSYMs(archive_path, build_dir)
+      spec = spec_with_path @name
+      spec ||= spec_with_name @name
+      framework_name = spec.name
+
+      dsym_output_dir = File.join(build_dir, 'dSYMs')
+      FileUtils.mkdir_p(dsym_output_dir)
+
+      archives = Dir.glob(File.join(archive_path, '*.xcarchive'))
+      if archives.empty?
+        UI.puts("⚠️ 未在 #{archive_path} 下找到 xcarchive，跳过 dSYM 导出").yellow
+        return
+      end
+
+      exported = false
+
+      archives.each do |archive|
+        dsym_path = File.join(
+          archive,
+          'dSYMs',
+          "#{framework_name}.framework.dSYM"
+        )
+
+        if File.exist?(dsym_path)
+          archive_name = File.basename(archive, '.xcarchive')
+          target_path = File.join(dsym_output_dir, "#{archive_name}.framework.dSYM")
+          FileUtils.rm_rf(target_path)
+          FileUtils.cp_r(dsym_path, target_path)
+          UI.puts "� Exported dSYM: #{target_path}".green
+          exported = true
+        else
+          UI.puts "⚠️ 未在 #{archive} 中找到 dSYM，已跳过".yellow
+        end
+      end
+
+      unless exported
+        UI.puts("⚠️ 未导出任何 dSYM，请确认 DEBUG_INFORMATION_FORMAT=dwarf-with-dsym").yellow
+      else
+        UI.puts "✅ dSYM 导出完成，目录：#{dsym_output_dir}".green
+      end
+    end
+
+    def outputs target_dir
+      puts "outputs:#{target_dir}"
+      if not File.exist? target_dir
+        Pathname.new(target_dir).mkdir
+      end
+      outputs_xcframework target_dir
+      outputs_bundle target_dir
+      new_spec_hash = generic_new_podspec_hash @spec
+      new_spec_hash[:vendored_frameworks] = "#{@spec.name}.xcframework"
+      xcframework_path = "#{target_dir}/#{@spec.name}.xcframework"
+      # new_spec_hash = fix_header_file new_spec_hash, xcframework_path
+      # new_spec_hash = fix_bundle_file(@spec, new_spec_hash, @source_dir, xcframework_path)
+      # find_bundles(target_dir).each do |plat, value| 
+      #   if new_spec_hash[plat]
+      #     new_spec_hash[plat]["resource_bundles"] = value
+      #   else
+      #     new_spec_hash[plat] = {
+      #       "resource_bundles" => value
+      #     }
+      #   end
+      # end
+      require 'json'
+      spec_json = JSON.pretty_generate(new_spec_hash) << "\n"
+      File.open("#{target_dir}/#{@spec.name}.podspec.json",'wb+') do |f|
+        f.write(spec_json)
+      end
+      # fix xcframework-is-not-a-member-type-of-error https://v3.bbcloud.babybus.com/team/184/wiki/13820
+      # UI.puts "fix xcframework-is-not-a-member-type-of-error:#{target_dir}"
+      # fix_xcframework_error(target_dir, @spec.name)
+
+      UI.puts "result export at :#{target_dir} 生成成功".green
+      target_dir
+    end
+
+    # 解决项目是Swift和Objc混合开发，有一个Swift类名和ModuleName相同，当打包成xcframework引入到项目时， 会报错… is not a member type of …
+    def fix_xcframework_error target_dir, name
+      # 全量替换代价：Swift module identity 被抹掉，--- 调试时能看不清来自哪个组件
+      # command = "find #{target_dir} -name '*.swiftinterface' -exec sed -i -e 's/#{name}\\.//g' {} \\; && find #{target_dir} -name '*.swiftinterface-e' | xargs rm -rf" 
+      # UI.puts "fix swift error command :#{command}"
+      
+      # 安全版修复： by hm 26/1/30
+      # 仅修复 Swift 类名 == ModuleName 时产生的 `ModuleName.ModuleName` 冲突，
+      # 避免全量移除 ModuleName. 造成 Swift module identity 丢失。
+      UI.puts "fix xcframework-is-not-a-member-type-of-error (safe mode): #{target_dir}"
+      # 只替换 `ModuleName.ModuleName` -> `ModuleName`
+      pattern = "s/#{name}\\.#{name}/#{name}/g"
+      # command = <<~CMD
+      #   find #{target_dir} -name '*.swiftinterface' \
+      #   -exec sed -i -e '#{pattern}' {} \; \
+      #   && find #{target_dir} -name '*.swiftinterface-e' | xargs rm -rf
+      # CMD
+      command = "find #{target_dir} -name '*.swiftinterface' -exec sed -i -e 's/#{name}\\.#{name}/#{name}//g' {} \\; && find #{target_dir} -name '*.swiftinterface-e' | xargs rm -rf" 
+      UI.puts "fix swift error command (safe): #{command}"
+      output = `#{command}`.lines.to_a
+      if $?.exitstatus != 0
+        Pod::ErrorUtil.error_report command, output
+        Process.exit -1
+      end
+    end
+    
+    def find_bundles target_dir
+      bundle_root = "#{target_dir}/bundle/"
+      pattern = "#{bundle_root}*"
+      result = {}
+      Pathname.glob(pattern).each do |bundle|
+        bundle_relative_path = bundle.to_s.gsub(bundle_root, "")
+        plat = bundle_relative_path
+        result[plat] = {
+          "#{@spec.name}" => "bundle/" + bundle_relative_path + "/*"
+        }
+      end
+      result
+    end
+
+    def outputs_xcframework target_dir
+      command = "cp -rp #{@outputs[:xcframework]} #{target_dir} 2>&1"
+      output = `#{command}`.lines.to_a
+      if $?.exitstatus != 0
+        Pod::ErrorUtil.error_report command,output
+        Process.exit -1
+      end
+    end
+
+    def outputs_bundle target_dir
+      if @outputs[:bundle]
+        FileUtils.cp_r(Dir[@outputs[:bundle]],target_dir)
+      end
+    end
+
+  end
+end

data/lib/cocoapods-xcframework/xbuilder.rb

@@ -201,20 +201,35 @@ module Pod
         f.write(spec_json)
       end
       # fix xcframework-is-not-a-member-type-of-error https://v3.bbcloud.babybus.com/team/184/wiki/13820
-      UI.puts "fix xcframework-is-not-a-member-type-of-error:#{target_dir}"
-      fix_xcframework_error(target_dir, @spec.name)
+      # UI.puts "fix xcframework-is-not-a-member-type-of-error:#{target_dir}"
+      # fix_xcframework_error(target_dir, @spec.name)
 
       UI.puts "result export at :#{target_dir} 生成成功".green
       target_dir
     end
 
+    # 解决项目是Swift和Objc混合开发，有一个Swift类名和ModuleName相同，当打包成xcframework引入到项目时， 会报错… is not a member type of …
     def fix_xcframework_error target_dir, name
-      command = "find #{target_dir} -name '*.swiftinterface' -exec sed -i -e 's/#{name}\\.//g' {} \\; && find #{target_dir} -name '*.swiftinterface-e' | xargs rm -rf"
-      UI.puts "fix swift error command :#{command}"
-
+      # 全量替换代价：Swift module identity 被抹掉，--- 调试时能看不清来自哪个组件
+      # command = "find #{target_dir} -name '*.swiftinterface' -exec sed -i -e 's/#{name}\\.//g' {} \\; && find #{target_dir} -name '*.swiftinterface-e' | xargs rm -rf" 
+      # UI.puts "fix swift error command :#{command}"
+      
+      # 安全版修复： by hm 26/1/30
+      # 仅修复 Swift 类名 == ModuleName 时产生的 `ModuleName.ModuleName` 冲突，
+      # 避免全量移除 ModuleName. 造成 Swift module identity 丢失。
+      UI.puts "fix xcframework-is-not-a-member-type-of-error (safe mode): #{target_dir}"
+      # 只替换 `ModuleName.ModuleName` -> `ModuleName`
+      pattern = "s/#{name}\\.#{name}/#{name}/g"
+      # command = <<~CMD
+      #   find #{target_dir} -name '*.swiftinterface' \
+      #   -exec sed -i -e '#{pattern}' {} \; \
+      #   && find #{target_dir} -name '*.swiftinterface-e' | xargs rm -rf
+      # CMD
+      command = "find #{target_dir} -name '*.swiftinterface' -exec sed -i -e 's/#{name}\\.#{name}/#{name}//g' {} \\; && find #{target_dir} -name '*.swiftinterface-e' | xargs rm -rf" 
+      UI.puts "fix swift error command (safe): #{command}"
       output = `#{command}`.lines.to_a
       if $?.exitstatus != 0
-        Pod::ErrorUtil.error_report command,output
+        Pod::ErrorUtil.error_report command, output
         Process.exit -1
       end
     end

data/lib/cocoapods_plugin.rb

@@ -3,6 +3,7 @@ require 'cocoapods-xcframework/gem_version.rb'
 require 'cocoapods-xcframework/config'
 require 'cocoapods-xcframework/util'
 require 'cocoapods-xcframework/xbuilder'
+require 'cocoapods-xcframework/local_build'
 require 'cocoapods-xcframework/frameworker'
 require 'cocoapods-xcframework/muti_frameworker'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-xcframework
 version: !ruby/object:Gem::Version
-  version: 0.2.6.6
+  version: 0.2.7.0
 platform: ruby
 authors:
 - humin
@@ -73,6 +73,7 @@ files:
 - lib/cocoapods-xcframework/config.rb
 - lib/cocoapods-xcframework/frameworker.rb
 - lib/cocoapods-xcframework/gem_version.rb
+- lib/cocoapods-xcframework/local_build.rb
 - lib/cocoapods-xcframework/muti_frameworker.rb
 - lib/cocoapods-xcframework/util.rb
 - lib/cocoapods-xcframework/util/cmd.rb