cocoapods-bb-xcframework 0.2.5 → 0.2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f98fbc6d1facd7259f106f15bc4baae1d7d42e4fbdde07f87e2418ad5d631631
-  data.tar.gz: ac5b4b39621ccb83012f6dbb22e136495e00bf0b75177a8f49eabb16d631019f
+  metadata.gz: '08c6a4feaf42fcaf08cf0850541fd0d64f28e2f35fce462bee195625b3aa02b1'
+  data.tar.gz: 2d10b0fdf6c83246d5858f21edade1cfa6c731099c3eae9931303144eecafd5b
 SHA512:
-  metadata.gz: f949933c7e4c8d292583e1d6b228bb1ee312dc05d34c2d7dc7fce4d25dab8af19b1ad855f1388ca482e9d0c7fef53f3206f231127437131f381e1e6a0952dc15
-  data.tar.gz: 3ca5be14ad4b76e620849d0bc85be6e9a4c8cef510942be395ce9e8b4151e834f44f38892f3492c9e5755444bc6380ba9f88d71e2ef021b2d02371ae0dcf827d
+  metadata.gz: 21f47c1d01df0b98de368bb131f6f2f384f180c429f10bb20d7ff96d18cc19ed74d41747c517f0c1b94e743d6a6d75762e0656aeb9d82a220eecc69af61a8401
+  data.tar.gz: 19ab879bc014ef08bd422ba70fdd9e6caed3e8f5b0b8b802b7af8f4f5b493fea78fbe3674ca6fd028de95b0de03bdefebfe5e8b1fef0997090b60b32ae7405c3

data/README.md

@@ -14,6 +14,7 @@
 - 支持 `subspec` 打包
 - 支持二进制库是否`生成符号表`、`生成Mac Catalyst`（默认生成）详见`pod xcframework --help`
 - 支持Xcode14打包，去除armv7/i386架构
+- 支持生成静态链接库/动态共享库
 
 ## Installation
 
@@ -61,6 +62,10 @@ Options:
     --no-support-maccatalyst                                        package support
                                                                     generate
                                                                     MacCatalyst
+    --no-support-dynamic                                            package support
+                                                                    Mach-O dynamically
+                                                                    linked shared
+                                                                    library
     --allow-root                                                    Allows CocoaPods
                                                                     to run as root
     --silent                                                        Show nothing

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

@@ -35,7 +35,8 @@ module Pod
           ['--no-static-library', 'package not use static library'],
           ['--enable-bitcode', 'package enable bitcode'],
           ['--no-symbols', 'package not use symbols'], # 符号表
-          ['--no-support-maccatalyst', 'package support generate MacCatalyst'] # 是否支持MacCatalyst方式支持iOS应用在mac平台运行库生成
+          ['--no-support-maccatalyst', 'package support generate MacCatalyst'], # 是否支持MacCatalyst方式支持iOS应用在mac平台运行库生成
+          ['--no-support-dynamic', 'package support Mach-O dynamically linked shared library'] # 是否支持动态库生成
         ].concat super
       end
 
@@ -52,6 +53,7 @@ module Pod
         @enable_bitcode = argv.flag?('enable-bitcode',false)
         @symbols = argv.flag?('symbols',true)
         @support_maccatalyst = argv.flag?('support-maccatalyst',true)
+        @support_dynamic = argv.flag?('support-dynamic',false)
         config.static_library_enable = @use_static_library
         super
       end
@@ -62,7 +64,8 @@ module Pod
       end
 
       def run
-        frameworker = Frameworker.new(@name, @source, @spec_sources, @subspecs, @configuration, @force, @use_modular_headers, @enable_bitcode, @symbols, @support_maccatalyst)
+        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
     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)
+    def initialize(name, source, spec_sources, subspecs, configuration, force, use_modular_headers=true, enable_bitcode=false, symbols=true, support_maccatalyst=true, support_dynamic=false)
       @name = name
       @source = source
       @spec_sources = spec_sources
@@ -14,10 +14,12 @@ module Pod
       @enable_bitcode = enable_bitcode
       @symbols = symbols
       @support_maccatalyst = support_maccatalyst
+      @support_dynamic = support_dynamic
     end
 
     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
 
@@ -41,7 +43,8 @@ module Pod
         @spec_sources,
         true,
         @use_modular_headers,
-        @enable_bitcode
+        @enable_bitcode,
+        @support_dynamic
       )
 
       perform_build(
@@ -62,7 +65,8 @@ module Pod
         spec,
         @configuration,
         @symbols,
-        @support_maccatalyst
+        @support_maccatalyst,
+        @support_dynamic
       )
       builder.build
       builder.outputs target_dir

data/lib/cocoapods-xcframework/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsXCFramework
-  VERSION = "0.2.5"
+  VERSION = "0.2.6.1"
 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,23 @@ 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]
+            other_flags << "-framework #{val} "
+          end
+        end
+      end
+      UI.puts "support_dynamic:#{support_dynamic} other_flags: #{other_flags}"
 
       installer = Installer.new(sandbox, podfile)
       installer.repo_update = true
@@ -91,6 +108,11 @@ 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
             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)
+    def initialize(installer, source_dir, sandbox_root, spec, configuration, symbols=true, support_maccatalyst=true, support_dynamic=false)
     # def initialize(platform, installer, source_dir, sandbox_root, spec, config)
         # @platform = platform
       @installer = installer
@@ -21,23 +21,38 @@ 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}"
+      UI.puts "Work dir is :#{@sandbox_root} isSymbols:#{@symbols} isDynamic:#{@support_dynamic}"
       # defines = "GCC_PREPROCESSOR_DEFINITIONS='$(inherited) PodsDummy_Pods_#{@spec.name}=PodsDummy_PodPackage_#{@spec.name}'"
       defines = ""
       if @configuration == 'Debug'
-        defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=YES ONLY_ACTIVE_ARCH=NO'
+        if @support_dynamic
+          defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=YES ONLY_ACTIVE_ARCH=NO MACH_O_TYPE=mh_dylib'
+        else
+          defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=YES ONLY_ACTIVE_ARCH=NO MACH_O_TYPE=staticlib'
+        end
       else
         if @symbols
-          defines << "GCC_GENERATE_DEBUGGING_SYMBOLS=YES" # Release模式需要符号表应于问题排查(二进制切源码操作) by hm 21/10/13
+          if @support_dynamic
+            defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=YES MACH_O_TYPE=mh_dylib'
+          else
+            defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=YES MACH_O_TYPE=staticlib'
+          end
+          # defines << "GCC_GENERATE_DEBUGGING_SYMBOLS=YES" # Release模式需要符号表应于问题排查(二进制切源码操作) by hm 21/10/13
         else
-          defines << "GCC_GENERATE_DEBUGGING_SYMBOLS=NO" # 去除符号表
+          if @support_dynamic
+            defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=NO MACH_O_TYPE=mh_dylib'
+          else
+            defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=NO MACH_O_TYPE=staticlib'
+          end
+          # defines << "GCC_GENERATE_DEBUGGING_SYMBOLS=NO" # 去除符号表
         end
       end
-
+      
       build_all_device defines
 
       collect_xc_frameworks

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-xcframework
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6.1
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-31 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.12
+rubygems_version: 3.4.16
 signing_key:
 specification_version: 4
 summary: 把podspec打包成xcframework的小工具。packager pod to a xcframework