cocoapods-bb-bin 0.2.11.3 → 0.2.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2557c0e6e4b07fa15768d1876528509d5bbb917503c7d63bb41118c78471bafb
-  data.tar.gz: cbb51d63b2e18c2725a3b1c807c5cb1c2417663c7e4e0e5780fcc15c4d78ff80
+  metadata.gz: 4d5c9dc9c33f4245e030d715d55e309678e375521e83a8259f45f036a3a3f088
+  data.tar.gz: e95605db07c04677b8fa12a7b8d370d6c43111de70a6756166b2a32f650e410e
 SHA512:
-  metadata.gz: c514d24c75bdc9f09c890bdd40f9bdb7ab04c99582bcdf820cde95dd6745e7c0003b4a1aa85ab3cbf95c0f891a647bec9be194139e9573ec5e81d0d0a7297645
-  data.tar.gz: 926e17d5de987e55b02b4a6ec7a1204af17a7ba302332c44481b1a1ae0b457ae47debfb421596f2f1711b56d522842e6e6c8c67d0471d284a61f7368ee9a5404
+  metadata.gz: '0389e757366131fd5f070d95f1e840e98aa15a9c024452837f094674e0d4b8c37198da28ed833be87f9bf41c9f96151c6f9ee65b44b46014ba12eb903c017d12'
+  data.tar.gz: 6e68f0bf5a61cc3527faf825be323c26c03f248a1afda1d84a06a43bd8331e5cfb3069a7edbe31d88819ab05c720b1d61125ebc7abaf76880f6b34f6a15b6cbb

data/lib/cocoapods-bb-bin/command/bin/archive.rb

@@ -90,6 +90,13 @@ module Pod
           return sources_sepc
         end
 
+        def build_workspace
+          worksppace_path = File.expand_path("#{CBin::Config::Builder.instance.gen_dir}/#{@spec.name}")
+          path = File.join(worksppace_path, "#{@spec.name}.xcworkspace")
+          raise Informative,  "#{path} File no exist, please check" unless File.exist?(path)
+          return path
+        end
+
         def build_root_spec
           builder = CBin::Build::Helper.new(@spec,
                                             @platform,
@@ -101,7 +108,8 @@ module Pod
                                             @zip,
                                             @spec,
                                             CBin::Config::Builder.instance.white_pod_list.include?(@spec.name),
-                                            @config)
+                                            @config,
+                                            build_workspace)
           builder.build
           builder.clean_workspace if @clean && !@all_make
         end
@@ -145,7 +153,8 @@ module Pod
                                                 @zip,
                                                 @spec,
                                                 false ,
-                                                @config)
+                                                @config,
+                                            build_workspace)
               builder.build
             rescue Object => exception
               UI.puts exception
@@ -188,7 +197,7 @@ module Pod
                 end
 
                 argvs << spec_file if spec_file
-                # UI.puts "argvs:#{argvs}"
+                UI.puts "generate_project argvs:#{argvs}"
                 gen = Pod::Command::Gen.new(CLAide::ARGV.new(argvs))
                 gen.validate!
                 gen.run
@@ -204,7 +213,7 @@ module Pod
           raise Informative,  "#{path} File no exist, please check" unless File.exist?(path)
           project = Xcodeproj::Project.open(path)
           project.build_configurations.each do |x|
-            x.build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = true #设置生成swift inter
+            x.build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = 'YES' #设置生成swift inter
           end
           project.save
         end

data/lib/cocoapods-bb-bin/command/bin/code.rb

@@ -33,7 +33,17 @@ module Pod
           @simulator = argv.flag?('simulator', false )
 
           @config = Pod::Config.instance
-
+          puts "=== pod bin code initialize begin ===".green
+          puts "argv.class: #{argv.class}"
+          puts "argv.to_s: #{argv}"
+          puts "argv.arguments: #{argv.arguments.inspect}"
+          puts "argv.options: #{argv.options.inspect if argv.respond_to?(:options)}"
+          puts "argv.flags: #{argv.flags.inspect if argv.respond_to?(:flags)}"
+          puts "argv.option('source'): #{argv.option('source').inspect}"
+          puts "@codeSource: #{@codeSource.inspect}"
+          puts "@names: #{@names.inspect}"
+          puts "@list: #{@list}, @clean: #{@clean}, @all_clean: #{@all_clean}, @simulator: #{@simulator}"
+          puts "=== pod bin code initialize end ===".green
           super
         end
 
@@ -72,8 +82,13 @@ module Pod
               raise "找不到 #{lib_file}"
             end
             UI.puts "#{lib_file}"
-
-            target_path =  @codeSource || download_source(name)
+            if @codeSource
+              puts "add name:#{name} local path:#{@codeSource}"
+              target_path = @codeSource
+            else
+              puts "add name:#{name} download_source"
+              target_path = download_source(name)
+            end
             puts "====add lib_file: #{lib_file} target_path: #{target_path} name: #{name}"
             link(lib_file,target_path,name)
           end
@@ -110,7 +125,16 @@ module Pod
         # 获取external_source 下的仓库
         # @return spec
         def fetch_external_source(dependency ,podfile , lockfile, sandbox,use_lockfile_options)
-          source = ExternalSources.from_dependency(dependency, podfile.defined_in_file, true)
+          # CocoaPods 内部会假定 external_source 是 Hash，这里兜底处理 nil 场景
+          if dependency.external_source.nil?
+            dependency.instance_variable_set(:@external_source, {})
+          end
+          installation_options = podfile.installation_options
+          source = if use_lockfile_options && lockfile && checkout_options = lockfile.checkout_options_for_pod_named(dependency.root_name)
+                   ExternalSources.from_params(checkout_options, dependency, podfile.defined_in_file, installation_options.clean?)
+                 else
+                   ExternalSources.from_dependency(dependency, podfile.defined_in_file, installation_options.clean?)
+                 end
           source.fetch(sandbox)
         end
 
@@ -124,13 +148,19 @@ module Pod
           `dwarfdump "#{lib_file}" | grep "AT_comp_dir" | head -1 | cut -d \\" -f2 `
 EOF
           dir = (`dwarfdump "#{lib_file}" | grep "AT_comp_dir" | head -1 | cut -d \\" -f2 `)
-          UI.puts "dwarfdump dir = #{dir}"
+          UI.puts "lib_file = #{lib_file}"
+          UI.puts "dwarfdump dir = #{dir} type:#{dir.class}"
+          if dir.empty?
+            msg = "Unknown dwarfdump data for `#{basename}` 请找hm确认，当前组件是否二进制静态库？动态库不支持"
+            raise Informative, msg
+          end
           # if Pathname.new(lib_file).extname == ".a"
           #   sub_path = "#{basename}/bin-archive/#{basename}"
           # else
           #   sub_path = "#{basename}"
           # end
           sub_path = "#{basename}/bin-archive/#{basename}"
+          UI.puts "sub_path = #{sub_path}"
           dir = dir.gsub(sub_path, "").chomp
           UI.puts "Binary dir = #{dir}"
 
@@ -215,9 +245,9 @@ EOF
                   # 构建xcframework架构需要根据实际二进制文件进行条件判断
                   arm_name = ""
                   if @simulator
-                    arm_name = "ios-arm64_i386_x86_64-simulator"
+                    arm_name = "ios-arm64_x86_64-simulator" #"ios-arm64_i386_x86_64-simulator"
                   else
-                    arm_name = "ios-arm64_armv7"
+                    arm_name = "ios-arm64" #"ios-arm64_armv7"
                   end
                   temp_name = "#{arm_name}/#{name}.framework/#{name}"
                   return File.join(filepath,temp_name) # TYSecKit.xcframework/ios-arm64_armv7/TYSecKit.framework/TYSecKit

data/lib/cocoapods-bb-bin/command/bin/tag.rb

@@ -116,7 +116,7 @@ module Pod
           raise Informative,  "#{path} File no exist, please check" unless File.exist?(path)
           project = Xcodeproj::Project.open(path)
           project.build_configurations.each do |x|
-            x.build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = true #设置生成swift inter
+            x.build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = 'YES' #设置生成swift inter
           end
           project.save
         end

data/lib/cocoapods-bb-bin/gem_version.rb

@@ -1,7 +1,7 @@
 require 'cocoapods'
 
 module CBin
-  VERSION = '0.2.11.3'
+  VERSION = '0.2.12.1'
 end
 
 module Pod

data/lib/cocoapods-bb-bin/helpers/build_helper.rb

@@ -25,7 +25,8 @@ module CBin
                      zip,
                      rootSpec,
                      skip_archive = false,
-                     build_model="Release")
+                     build_model="Release",
+                     workspace=nil)
         @spec = spec
         @platform = platform
         @build_model = build_model
@@ -38,10 +39,11 @@ module CBin
         @support_maccatalyst = support_maccatalyst
         @spec_sources = spec_sources
         @zip = zip
+        @workspace = workspace
 
         @framework_path
 
-        UI.puts "build initialize...#{spec}"
+        UI.puts "build initialize...#{spec} rootSpec:#{rootSpec} build_model:#{build_model} workspace:#{workspace}"
       end
 
       # build framework
@@ -97,9 +99,9 @@ module CBin
       # build xcframework
       def build_static_xcframework
         source_dir = Dir.pwd
-        UI.puts "xcframework source_dir=#{source_dir}"
+        UI.puts "xcframework source_dir=#{source_dir} workspace:#{@workspace}"
         isGenDylib = @xcframework_dylib_output
-        builder = CBin::XCFramework::XCBuilder.new(@spec, @spec_sources, @support_maccatalyst, isGenDylib)
+        builder = CBin::XCFramework::XCBuilder.new(@spec, @spec_sources, @support_maccatalyst, isGenDylib, @workspace)
         builder.build
       end
 

data/lib/cocoapods-bb-bin/helpers/spec_source_creator.rb

@@ -9,9 +9,21 @@ module CBin
       attr_reader :code_spec
       attr_reader :spec
 
-      def initialize(code_spec, platforms = 'ios')
+      def initialize(code_spec, platforms = nil) #'ios')
         @code_spec = code_spec
-        @platforms = Array(platforms)
+        if platforms.nil? || Array(platforms).empty?
+          spec_hash = code_spec.to_hash
+          if spec_hash['platforms']
+            @platforms = spec_hash['platforms'].keys
+          elsif spec_hash['platform']
+            @platforms = [spec_hash['platform']]
+          else
+            @platforms = ['ios']
+          end
+        else
+          @platforms = Array(platforms).map(&:to_s)
+        end
+        puts "@platforms:#{@platforms}"
         validate!
       end
 
@@ -209,6 +221,8 @@ module CBin
         selected_platforms = platforms.select { |k, _v| @platforms.include?(k) }
         spec_hash['platforms'] = selected_platforms.empty? ? platforms : selected_platforms
 
+        puts "spec_hash:#{spec_hash}".yellow
+
         @spec = Pod::Specification.from_hash(spec_hash)
         @spec.description = <<-EOF
          converted automatically by plugin optimization

data/lib/cocoapods-bb-bin/helpers/xcframework_builder.rb

@@ -14,7 +14,7 @@ module CBin
         class XCBuilder
             include Pod
             include Pod::Config::Mixin
-            def initialize(spec,spec_sources, support_maccatalyst=false,isGenDylib=false)
+            def initialize(spec, spec_sources, support_maccatalyst=false, isGenDylib=false, workspace=nil)
                 @spec = spec
                 @spec_sources = spec_sources.split(',') unless spec_sources.nil?
                 @name = "#{@spec.name}.podspec"
@@ -28,23 +28,64 @@ module CBin
                 @symbols = true
                 @support_maccatalyst = support_maccatalyst # 默认不再支持MacCatalyst方式支持iOS应用在mac平台运行库生成
                 @support_dynamic = isGenDylib
+                @workspace = workspace
                 
                 target_dir = "#{Dir.pwd}/#{@spec.name}-#{@spec.version}"
-                UI.puts "build initialize...#{spec} target_dir:#{target_dir} 是否支持Mac Catalyst:#{support_maccatalyst} 是否生成动态库:#{isGenDylib}"
-                UI.puts "spec_sources:#{spec_sources}"
-                UI.puts "spec_sources:#{@spec_sources}"
+                UI.puts "build initialize...#{spec} spec_sources:#{spec_sources} target_dir:#{target_dir} 是否支持Mac Catalyst:#{support_maccatalyst} 是否生成动态库:#{isGenDylib} workspace:#{workspace}"
             end
 
             def build
                 UI.section("Building xcframework #{@spec} 是否生成动态库:#{@support_dynamic}") do
                     config.static_library_enable = @use_static_library # 一定要配置 true，否则调用xcframework生成命令无效
-                    frameworker = Frameworker.new(@name, @source, @spec_sources, @subspecs, @configuration, @force, @use_modular_headers, @enable_bitcode, @symbols, @support_maccatalyst, @support_dynamic)
-                    frameworker.run
+                    # 废弃，run_xcframework替代实现
+                    # frameworker = Frameworker.new(@name, @source, @spec_sources, @subspecs, @configuration, @force, @use_modular_headers, @enable_bitcode, @symbols, @support_maccatalyst, @support_dynamic)
+                    # frameworker.run
+                    # 生成二进制产物 by hm 26/2/4
+                    run_xcframework
                     # 拷贝
                     cp_to_source_dir
                 end
             end
 
+            def run_xcframework
+                spec_sources_str = if @spec_sources.is_a?(Array)
+                                     @spec_sources.join(',')
+                                   else
+                                     @spec_sources.to_s
+                                   end
+                argvs = [
+                    "#{@name}",  # name
+                    "#{@source}", # spec
+                    "--spec-sources=#{spec_sources_str}",
+                    "--subspecs=#{@subspecs}",
+                    "--configuration=#{@configuration}",
+                    "--use-modular-headers=#{@use_modular_headers}",
+                    "--archive-export", # 默认archive导出dylib
+                    # "--no-archive-export",
+                    "--workspace=#{@workspace}",
+                ]
+                if @force
+                    argvs += ['--force']
+                end
+                if @enable_bitcode
+                    argvs += ['--enable-bitcode']
+                end
+                if @symbols
+                    argvs += ['--symbols']
+                end
+                if @support_maccatalyst
+                    argvs += ['--support-maccatalyst']
+                end
+                if @support_dynamic
+                    argvs += ['--support-dynamic']
+                end
+                puts "make xcframework argvs: #{argvs}".yellow
+                archive = Pod::Command::Bin::XCFramework.new(CLAide::ARGV.new(argvs))
+                archive.validate!
+                sources_sepc = archive.run
+                return sources_sepc
+            end
+
             private
 
             def framework_folder_path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-bin
 version: !ruby/object:Gem::Version
-  version: 0.2.11.3
+  version: 0.2.12.1
 platform: ruby
 authors:
 - humin
@@ -83,7 +83,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6.4
+        version: 0.2.7.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -93,7 +93,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6.4
+        version: 0.2.7.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.13
 specification_version: 4
 summary: cocoapods-bb-bin is a plugin which helps develpers switching pods between
   source code and binary.