cocoapods-bb-xcframework 0.2.6 → 0.2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22e95ef47a755371fe5138674d018ed4a05e4ec8d54806fe57e7cbdc95c3bca3
-  data.tar.gz: 91127f23608399c2031ef9245d4e194fca6f63f2a87763ac5cc6f5d8349a261d
+  metadata.gz: 86de5787fc0f9a46661f7ebfd6c0cc0ef65f22a879cd1dc7c2925d130a58e2a9
+  data.tar.gz: 2b0acbb4860569d5b3db5367ac3a4262a707d0197db2d395dc1b7e34beb89d5d
 SHA512:
-  metadata.gz: 5c673977a36ecff7e43e0817af91471f60aeb56b52074386aead8222b374d5d86358b1e392938d6e0704fe6b6f8237fd33c057ffd5cb380c414e326f0713b807
-  data.tar.gz: ba6d977bee0cfea4d35f55bba4bc184661168cb753d4729734bd6df6f5a98326ac97b9bde04edb819caefedacb9226ee7491a78ecf913325c0565a5ed80d1131
+  metadata.gz: 5317a8a583129ad146fffacd4b8b105a36967ade03d19a565b1029a17c1692b4964b7e09ec1830ef35424ee9f5e8691d7fc0eaba63372c6de6b0407df84ac915
+  data.tar.gz: 020f0ccc7d37338714eef9e7d09cdf33bfe0ac5997711b792cc6fe9ff4c9aa85ea1f09916d4721b99281074a810ec0e6a68daee0320cd70b579eb6c0ce12794c

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

@@ -64,6 +64,7 @@ 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
       end

data/lib/cocoapods-xcframework/frameworker.rb

@@ -19,6 +19,7 @@ module Pod
 
     def run
       spec = spec_with_path @name
+      UI.warn "正在生成XCFramework #{spec.name}(#{spec.version})"
       @is_spec_from_path = true if spec
       spec ||= spec_with_name @name
 
@@ -42,7 +43,8 @@ module Pod
         @spec_sources,
         true,
         @use_modular_headers,
-        @enable_bitcode
+        @enable_bitcode,
+        @support_dynamic
       )
 
       perform_build(
@@ -63,8 +65,7 @@ module Pod
         spec,
         @configuration,
         @symbols,
-        @support_maccatalyst,
-        @support_dynamic
+        @support_maccatalyst
       )
       builder.build
       builder.outputs target_dir

data/lib/cocoapods-xcframework/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsXCFramework
-  VERSION = "0.2.6"
+  VERSION = "0.2.6.2"
 end

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

@@ -63,7 +63,7 @@ module Pod
       Sandbox.new(config.sandbox_root)
     end
 
-    def installation_root sandbox, spec, subspecs, sources,use_frameworks = true,use_modular_headers = true, enable_bitcode = false
+    def installation_root sandbox, spec, subspecs, sources,use_frameworks = true,use_modular_headers = true, enable_bitcode = false, support_dynamic=false
         podfile = podfile_from_spec(
         @path,
         spec,
@@ -72,6 +72,31 @@ module Pod
         use_frameworks,
         use_modular_headers
       )
+      other_flags=""
+      if support_dynamic
+        # 解析podspec获取依赖关系
+        spec.dependencies.uniq.each do |dependency|
+          other_flags << "-framework #{dependency.name} "
+        end
+        # spec.frameworks系统库没有提供公共方法，故手动解析引用系统库
+        spec_hash = spec.to_hash
+        spec_hash.uniq.each do |configuration|
+          key = configuration[0]
+          if key == 'frameworks'
+            val = configuration[1]
+            if val.is_a? String
+              other_flags << "-framework #{val} "
+            elsif val.is_a? Array
+              val.uniq.each do |item|
+                other_flags << "-framework #{item} "
+              end
+            else
+              UI.puts "configuration:#{configuration} val:#{val}"
+            end
+          end
+        end
+      end
+      UI.puts "support_dynamic:#{support_dynamic} other_flags: #{other_flags}"
 
       installer = Installer.new(sandbox, podfile)
       installer.repo_update = true
@@ -91,6 +116,16 @@ module Pod
           if target.name == spec.name
             target.build_configurations.each do |configuration|
               configuration.build_settings['CLANG_MODULES_AUTOLINK'] = 'NO'
+              # 动态链接库需要配置project工程库依赖，否则导致无法编译通过 by hm 23/7/13
+              if !other_flags.empty?
+                UI.puts "configuration other_flags: #{other_flags}"
+                configuration.build_settings['OTHER_LDFLAGS'] = "#{other_flags}"
+              end
+              if support_dynamic
+                configuration.build_settings['MACH_O_TYPE'] = 'mh_dylib'
+              else
+                configuration.build_settings['MACH_O_TYPE'] = 'staticlib'
+              end
             end
           end
         end

data/lib/cocoapods-xcframework/xbuilder.rb

@@ -6,7 +6,7 @@ module Pod
     include XcodeProjHelper
     include PodUtil
     include Config::Mixin
-    def initialize(installer, source_dir, sandbox_root, spec, configuration, symbols=true, support_maccatalyst=true, support_dynamic=false)
+    def initialize(installer, source_dir, sandbox_root, spec, configuration, symbols=true, support_maccatalyst=true)
     # def initialize(platform, installer, source_dir, sandbox_root, spec, config)
         # @platform = platform
       @installer = installer
@@ -21,35 +21,20 @@ module Pod
       @outputs = Hash.new
       @symbols = symbols
       @support_maccatalyst = support_maccatalyst
-      @support_dynamic = support_dynamic
     end
 
     def build
       UI.puts("Building framework #{@spec} with configuration #{@configuration}")
-      UI.puts "Work dir is :#{@sandbox_root} isSymbols:#{@symbols} isDynamic:#{@support_dynamic}"
+      UI.puts "Work dir is :#{@sandbox_root} isSymbols:#{@symbols}"
       # defines = "GCC_PREPROCESSOR_DEFINITIONS='$(inherited) PodsDummy_Pods_#{@spec.name}=PodsDummy_PodPackage_#{@spec.name}'"
       defines = ""
       if @configuration == 'Debug'
-        if @support_dynamic
-          defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=YES ONLY_ACTIVE_ARCH=NO MACH_O_TYPE=mh_dylib OTHER_LDFLAGS="-ObjC -framework UIKit"' # OTHER_LDFLAGS 动态库工程不会自动导入系统库
-        else
-          defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=YES ONLY_ACTIVE_ARCH=NO MACH_O_TYPE=staticlib'
-        end
+        defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=YES ONLY_ACTIVE_ARCH=NO'
       else
         if @symbols
-          if @support_dynamic
-            defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=YES MACH_O_TYPE=mh_dylib OTHER_LDFLAGS="-ObjC -framework UIKit"' # OTHER_LDFLAGS 动态库工程不会自动导入系统库
-          else
-            defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=YES MACH_O_TYPE=staticlib'
-          end
-          # defines << "GCC_GENERATE_DEBUGGING_SYMBOLS=YES" # Release模式需要符号表应于问题排查(二进制切源码操作) by hm 21/10/13
+          defines << "GCC_GENERATE_DEBUGGING_SYMBOLS=YES" # Release模式需要符号表应于问题排查(二进制切源码操作) by hm 21/10/13
         else
-          if @support_dynamic
-            defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=NO MACH_O_TYPE=mh_dylib OTHER_LDFLAGS="-ObjC -framework UIKit"' # OTHER_LDFLAGS 动态库工程不会自动导入系统库
-          else
-            defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=NO MACH_O_TYPE=staticlib'
-          end
-          # defines << "GCC_GENERATE_DEBUGGING_SYMBOLS=NO" # 去除符号表
+          defines << "GCC_GENERATE_DEBUGGING_SYMBOLS=NO" # 去除符号表
         end
       end
       

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-xcframework
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.6.2
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-12 00:00:00.000000000 Z
+date: 2023-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.14
+rubygems_version: 3.4.16
 signing_key:
 specification_version: 4
 summary: 把podspec打包成xcframework的小工具。packager pod to a xcframework