cocoapods-bb-xcframework 0.2.7.3 → 0.2.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 597321612f6169b2c9f34b33ebbf775b50c23174c2059465953b94db815e7bc2
-  data.tar.gz: 9bda96e9b80a82a706c83b64b0d4b35d94cc27ab88742b63835b2dce0bb3a869
+  metadata.gz: 38ad04aeb3bf21be774455008ca4b7b8deee2dfe72bf100dc2e8515524230e27
+  data.tar.gz: 0d81a1c7cd3e9d517d95e5503c0247faa1776ee7cb2ade624371061df02b6cbb
 SHA512:
-  metadata.gz: 641d7d1659254d9c84e47df9e2edec74dd75a4592dab26aefd40d104fad2db87fcee9ee563c613c10f60385a84ba339c3ddb635e0bf014d0b35fc18645516209
-  data.tar.gz: 0b85260117e10d861e9e95d39e972a78820c6097cb509f8e5726d4298fd80837094a53c4fe6c02e31f9c6610150fd0d8faba063f541e76b1296a47aaaeb3c359
+  metadata.gz: 9b0c9c5b7c125458c4a8288e4c57d031b701dc634b0276d07d0b65cc3f97d2a2064849a95313a353834157c4010e94c31e26f63523df0eacb16e08ea745505f7
+  data.tar.gz: cf3f3c94e37e0e56ae413652edc59aa2380b56f695309b1ee4b9194f023e8e756db112832c893e92b6a5b5c7c6aeaba98f381ec1e0281e87b739dce05b82cdd1

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

@@ -23,6 +23,7 @@ module Pod
         CLAide::Argument.new('NAME', true),
         CLAide::Argument.new('SOURCE', false)
       ]
+      include PodUtil
       include Config::Mixin
 
       def self.options 
@@ -69,16 +70,58 @@ module Pod
 
       def run
         UI.puts "argvs @name:#{@name} @source:#{@source} @spec_sources:#{@spec_sources} @subspecs:#{@subspecs} @archive_export:#{@archive_export} @workspace:#{@workspace}"
+        # @archive_export = false # 测试入口
         if @archive_export
+          # 生成二进制资源xcodebuild archive，验证过使用xcodebuild archive无法导出macos架构
           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, @workspace)
+          frameworker = LocalBuilder.new(@name, @source, @spec_sources, @subspecs, @configuration, @force, @use_modular_headers, @enable_bitcode, @symbols, @support_maccatalyst, support_macos, @support_dynamic, Dir.pwd, @workspace)
           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, @workspace)
+          frameworker = Frameworker.new(@name, @source, @spec_sources, @subspecs, @configuration, @force, @use_modular_headers, @enable_bitcode, @symbols, @support_maccatalyst, support_macos, @support_dynamic, @workspace)
           frameworker.run
         end
       end
+
+      # 是否包含资源文件(bundle/resources/resource_bundles)
+      def support_bundle_res
+        spec = spec_with_path(@name)
+        begin
+          spec_hash = spec.to_hash
+          has_resources = false
+          resources = spec_hash['resources']
+          resource_bundles = spec_hash['resource_bundles']
+          vendored_resources = spec_hash['vendored_resources']
+          has_resources ||= resources && !resources.empty?
+          has_resources ||= resource_bundles && !resource_bundles.empty?
+          has_resources ||= vendored_resources && !vendored_resources.empty?
+          UI.puts "#{spec.name}(#{spec.version}) resources=#{!resources.nil?} resource_bundles=#{!resource_bundles.nil?} vendored_resources=#{!vendored_resources.nil?} support_bundle_res=#{has_resources}".yellow
+          return has_resources
+        rescue => e
+          UI.puts "check bundle resource failed: #{e}".red
+          return false
+        end
+      end
+
+      # 是否支持macos架构
+      def support_macos
+        spec = spec_with_path @name
+        platforms = []
+        begin
+          spec_hash = spec.to_hash
+          if spec_hash['platforms']
+            platforms = spec_hash['platforms'].keys.map(&:to_s)
+          elsif spec.platform
+            platforms = [spec.platform.name.to_s]
+          end
+        rescue => e
+          UI.puts "read platforms failed: #{e}".red
+        end
+        support_macos = platforms.include?('osx') || platforms.include?('macos')
+        UI.puts "#{spec.name}(#{spec.version}) platforms=#{platforms} support_macos=#{support_macos}".yellow
+        return support_macos
+      end
+
     end
   end
 end

data/lib/cocoapods-xcframework/frameworker.rb

@@ -3,7 +3,7 @@ module Pod
     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, workspace=nil)
+    def initialize(name, source, spec_sources, subspecs, configuration, force, use_modular_headers=true, enable_bitcode=false, symbols=true, support_maccatalyst=true, support_macos=false, support_dynamic=false, workspace=nil)
       @name = name
       @source = source
       @spec_sources = spec_sources
@@ -14,29 +14,11 @@ module Pod
       @enable_bitcode = enable_bitcode
       @symbols = symbols
       @support_maccatalyst = support_maccatalyst
+      @support_macos = support_macos
       @support_dynamic = support_dynamic
       @workspace = workspace
     end
 
-    # 是否支持macos架构
-    def support_macos
-      spec = spec_with_path @name
-      platforms = []
-      begin
-        spec_hash = spec.to_hash
-        if spec_hash['platforms']
-          platforms = spec_hash['platforms'].keys.map(&:to_s)
-        elsif spec.platform
-          platforms = [spec.platform.name.to_s]
-        end
-      rescue => e
-        UI.puts "read platforms failed: #{e}".red
-      end
-      support_macos = platforms.include?('osx') || platforms.include?('macos')
-      UI.puts "#{spec.name}(#{spec.version}) platforms=#{platforms} support_macos=#{support_macos}".yellow
-      return support_macos
-    end
-
     def run
       spec = spec_with_path @name
       UI.puts "正在生成XCFramework #{spec.name}(#{spec.version})".yellow
@@ -86,7 +68,7 @@ module Pod
         @configuration,
         @symbols,
         @support_maccatalyst,
-        support_macos
+        @support_macos
       )
       builder.build
       builder.outputs target_dir

data/lib/cocoapods-xcframework/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsXCFramework
-  VERSION = "0.2.7.3"
+  VERSION = "0.2.7.4"
 end

data/lib/cocoapods-xcframework/local_build.rb

@@ -3,7 +3,7 @@ module Pod
     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, workspace=nil)
+    def initialize(name, source, spec_sources, subspecs, configuration, force, use_modular_headers=true, enable_bitcode=false, symbols=true, support_maccatalyst=true, support_macos=false, support_dynamic=false, source_dir=Dir.pwd, workspace=nil)
       @name = name
       @source = source
       @spec_sources = spec_sources
@@ -15,6 +15,7 @@ module Pod
       @symbols = symbols
       @support_maccatalyst = support_maccatalyst
       @support_dynamic = support_dynamic
+      @support_macos = support_macos
       @spec = spec_with_path @name
       @source_dir = source_dir
       @outputs = Hash.new
@@ -50,25 +51,6 @@ module Pod
       outputs(target_dir)
     end
 
-    # 是否支持macos架构
-    def support_macos
-      spec = spec_with_path @name
-      platforms = []
-      begin
-        spec_hash = spec.to_hash
-        if spec_hash['platforms']
-          platforms = spec_hash['platforms'].keys.map(&:to_s)
-        elsif spec.platform
-          platforms = [spec.platform.name.to_s]
-        end
-      rescue => e
-        UI.puts "read platforms failed: #{e}".red
-      end
-      support_macos = platforms.include?('osx') || platforms.include?('macos')
-      UI.puts "#{spec.name}(#{spec.version}) platforms=#{platforms} support_macos=#{support_macos}".yellow
-      return support_macos
-    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
@@ -81,7 +63,7 @@ module Pod
         plat_name   = platform.to_s.gsub(/\s+/, '_')
         target_name = "#{scheme_name}-#{plat_name}"
         archivePath = "#{archive_path}/#{target_name}.xcarchive"
-        UI.puts "plat_name=#{plat_name} destination=#{destination} archs=#{archs} workspace_path=#{workspace_path}"
+        UI.puts "scheme_name=#{scheme_name} plat_name=#{plat_name} destination=#{destination} archs=#{archs} workspace_path=#{workspace_path}"
         if scheme_name.nil?
           UI.puts("❌ archive 构建缺少 scheme，请在调用 xcode_xbuild 时显式传入 scheme").red
           Process.exit 1
@@ -108,13 +90,14 @@ module Pod
                   "-scheme '#{scheme_arg}' " \
                   "-archivePath '#{archivePath}' " \
                   "-destination '#{destination}' " \
-                  "-alltargets " \
                   "-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"
+                  "BUILD_LIBRARY_FOR_DISTRIBUTION=YES clean build "
+            
+        # command = "xcodebuild archive #{workspace_arg} -scheme '#{scheme_arg}' -archivePath '#{archivePath}' #{defines} BUILD_LIBRARY_FOR_DISTRIBUTION=YES clean build -configuration #{configuration} -destination '#{destination}' ARCHS='#{archs}' SKIP_INSTALL=#{skip_install}"
 
         # --- enhanced logging & reliable failure surfacing ---
         log_dir  = File.join(archivePath, 'logs')
@@ -124,21 +107,45 @@ module Pod
         # Allow disabling xcpretty via env
         use_pretty = ENV['XBUILDER_NOPRETTY'] != '1'
         wrapped = if use_pretty
-          "set -o pipefail; #{command} | tee '#{log_raw}' | xcpretty"
+          "set -o pipefail; #{command} 2>&1 | tee '#{log_raw}' | xcpretty"
+          # "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 wrapped: #{wrapped}"
         UI.puts "XBuilder command: #{command}"
+        UI.puts "Available schemes:"
+        schemes = `xcodebuild -list 2>/dev/null`
+        UI.puts schemes
+
         success = system('bash', '-lc', wrapped)
         unless success
-          UI.puts "\n** xcodebuild failed — showing last 200 lines of raw log: #{log_raw}".red
+          UI.puts ""
+          UI.puts "========== XCODEBUILD FAILED =========="
+          UI.puts "platform=#{platform}"
+          UI.puts "scheme=#{scheme_name}"
+          UI.puts "destination=#{destination}"
+          UI.puts "log=#{log_raw}"
+          if platform == 'macOS'
+            UI.puts "Available schemes:"
+            schemes = `xcodebuild -list 2>/dev/null`
+            UI.puts schemes
+          end
           if File.exist?(log_raw)
-            tail = `tail -n 200 '#{log_raw}'`
+            UI.puts ""
+            UI.puts "===== LAST 300 LINES ====="
+            tail = `tail -n 300 "#{log_raw}"`
             UI.puts tail
+            UI.puts ""
+            UI.puts "===== ERROR LINES ====="
+            errors = `grep -nE "error:|fatal error:|Undefined symbols|Command Compile|Command SwiftCompile|Command Ld" "#{log_raw}"`
+            UI.puts(errors.empty? ? "No error lines found." : errors)
+          else
+            UI.puts "raw log not found"
           end
-          Pod::ErrorUtil.error_report(command, []) if defined?(Pod::ErrorUtil)
-          Process.exit $?.exitstatus.nonzero? || 1
+          raise Informative,
+                "xcodebuild failed. see log: #{log_raw}"
         end
     end
 
@@ -146,8 +153,12 @@ module Pod
       # 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
-      build_mac_device defines, build_dir, archive_path if support_macos
+      # macos\MacCatalyst互斥
+      if @support_macos
+        build_mac_device defines, build_dir, archive_path 
+      else
+        build_MacCatalyst_device defines, build_dir, archive_path if @support_maccatalyst
+      end
     end
 
     def build_mac_device defines, build_dir, archive_path
@@ -209,7 +220,7 @@ module Pod
       end
 
       if framework_args.empty?
-        UI.puts("❌ 未找到任何可用 Framework，xcframework 生成失败").red
+        UI.puts "❌ 未找到任何可用 Framework，xcframework 生成失败".red
         Process.exit 1
       end
 

data/lib/cocoapods-xcframework/xbuilder.rb

@@ -139,8 +139,12 @@ module Pod
       # build general first because simulator will exchange SDKROOT to simulat sdk
       build_general_device defines
       build_simulator_device defines
-      build_MacCatalyst_device defines if @support_maccatalyst
-      build_MacOS_device defines if @support_macos
+      # macos\MacCatalyst互斥
+      if @support_macos
+        build_MacOS_device defines
+      else
+        build_MacCatalyst_device defines if @support_maccatalyst
+      end
     end
 
     def build_general_device defines

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-xcframework
 version: !ruby/object:Gem::Version
-  version: 0.2.7.3
+  version: 0.2.7.4
 platform: ruby
 authors:
 - humin