pod-pipeline 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fbd23977836c8304f119e084ffd3cf0f87921d3334da995d64bebf4da292014
-  data.tar.gz: c16a55398d8dabcd46ea2c84c210d9d94c804f4c01ddc71169de1240932d5737
+  metadata.gz: 16980dad637c15796234c1cdb4e559152e1136397d6cf860d9cc9a3d1aaecca9
+  data.tar.gz: 1340eb923bc0856d793cecf302e64bc34e2e3fb59dd254b0e93130bc309fa96c
 SHA512:
-  metadata.gz: 0542201f03feb3de6cb8719db8c6bd47172343666a29f58c72425323566eb1a0367194c5a5a9f7c55e02edbd5e3b397c8c791a4efdbb7dbd95e09a62a2565e79
-  data.tar.gz: 5047175beed47d81de9f96f016e70b4acec1bbd60be78b3700c1a17b5cdcda8d122bcec903cd555944eefb2293cb3fbf3f8d42e754a8cafad94edd6daed23f77
+  metadata.gz: 1955fd51720cb745dbfcd234dbd983ce0df51a0ebcad4366f8fd61ab8a792f8cf4b51f2ddde773252820378df4347011510d9282bc5917583d94902370649aee
+  data.tar.gz: 16ac4680004b7ebab8e0067037d2c67df4d44fc6f0b5ba0c1d08d184a56cd781b2eac5c54d65a5f64c6bb1dcc5fae8ffacf7c720e6a0efc3bae887103dba6104

data/lib/pod-pipeline/command/build.rb

@@ -4,6 +4,7 @@ require 'pod-pipeline/util/scanner'
 require 'pod-pipeline/util/xcodebuild'
 require 'pod-pipeline/util/binary'
 require 'pod-pipeline/util/bundle'
+require 'pod-pipeline/util/header'
 
 require 'pod-pipeline/extension/dir-ppl'
 
@@ -23,7 +24,9 @@ module PPL
                     ['--configuration=Release', '项目构建的环境。(默认为Release)'],
                     ['--arch=arm64,armv7,x86_64', '项目构建的架构。(默认为 arm64,armv7,x86_64)'],
                     ['--combine=local,pod', '项目构建后合并依赖库的二进制文件，local为本地依赖库，pod为CocoaPods依赖库。(默认为 不合并)'],
-                    ['--combine-ignore=name1,name2', '项目构建后合并依赖库的二进制文件，标注不想合并的内容。'],
+                    ['--combine-headers=false', '项目构建后合并依赖库的头文件。(默认为 不合并)'],
+                    ['--combine-include=name1,name2', '项目构建后合并依赖库的二进制文件，标注想合并的内容，执行顺序在exclude前。'],
+                    ['--combine-exclude=name1,name2', '项目构建后合并依赖库的二进制文件，标注不想合并的内容，执行顺序在include后。'],
                     ['--bundle-merge=merge', '是否合并所有资源包，参数为合并后的资源包名。(默认为 不合并)'],
                 ].concat(super)
             end
@@ -34,7 +37,9 @@ module PPL
                 @configuration      = argv.option('configuration', '').split(',').first
                 @archs              = argv.option('arch', '').split(',')
                 @combines           = argv.option('combine', '').split(',')
-                @combine_ignore     = argv.option('combine-ignore', '').split(',')
+                @combine_headers    = argv.option('combine-headers', false)
+                @combine_include    = argv.option('combine-include', '').split(',')
+                @combine_exclude    = argv.option('combine-exclude', '').split(',')
                 @bundle_merge       = argv.option('bundle-merge', '').split(',').first
                 
                 @projectPath = @path.count.zero? ? Pathname.pwd.to_s : @path.first
@@ -65,9 +70,9 @@ module PPL
                     XCodebuild.build(@workspace.path, @podspec.name, arch, @configuration, @build_path)
                 end
 
-                #添加头文件
-                puts "\n[添加Framework头文件]"
-                add_headers
+                #合并头文件
+                puts "\n[合并 #{@combines.join(", ")} 的头文件]"
+                combine_headers(@combines.include?('local'), @combines.include?('pod'))
 
                 #合并二进制文件
                 puts "\n[合并 #{@combines.join(", ")} 的二进制文件]"
@@ -96,31 +101,50 @@ module PPL
             end
     
             def add_headers
-                header_stands = "#{@output}/Example/Pods/Headers/Public/#{@podspec.name}/*.h"
-                Dir[header_stands].each do |header_stand|
-                    if File.ftype(header_stand).eql? 'link'
-                        header_file = "#{File.dirname(header_stand)}/#{File.readlink(header_stand)}"
-                        if File.ftype(header_file).eql? 'file'
-                            header_file_basename = File.basename(header_file)
-                            if !(File.exist? "#{@framework_headers_path}/#{header_file_basename}")
-                                puts header_file_basename
-                                FileUtils.cp(header_file, @framework_headers_path)
-                            end
-                        end
-                    end
+                # header_stands = "#{@output}/Example/Pods/Headers/Public/#{@podspec.name}/*.h"
+                # Dir[header_stands].each do |header_stand|
+                #     if File.ftype(header_stand).eql? 'link'
+                #         header_file = "#{File.dirname(header_stand)}/#{File.readlink(header_stand)}"
+                #         if File.ftype(header_file).eql? 'file'
+                #             header_file_basename = File.basename(header_file)
+                #             if !(File.exist? "#{@framework_headers_path}/#{header_file_basename}")
+                #                 puts header_file_basename
+                #                 FileUtils.cp(header_file, @framework_headers_path)
+                #             end
+                #         end
+                #     end
+                # end
+                # header_files = "#{@build_path}/**/#{@podspec.name}.framework/Headers/*.h"
+                # Dir[header_files].each do |header_file|
+                #     if File.ftype(header_file).eql? 'file'
+                #         header_file_basename = File.basename(header_file)
+                #         if !(File.exist? "#{@framework_headers_path}/#{header_file_basename}")
+                #             puts header_file_basename
+                #             FileUtils.cp(header_file, @framework_headers_path)
+                #         end
+                #     end
+                # end
+            end
+    
+            def combine_headers(local_dependency, pod_dependency)
+                headers = "#{@framework_path}/Headers"
+                #添加 构建生成的二进制文件
+                inputs = []
+                inputs << "#{@build_path}/*/**/#{@podspec.name}.framework"
+                if local_dependency
+                    #添加 本地依赖的二进制文件
+                    inputs << "#{@output}/#{@podspec.name}/Frameworks/**/*.framework"
                 end
-                header_files = "#{@build_path}/**/#{@podspec.name}.framework/Headers/*.h"
-                Dir[header_files].each do |header_file|
-                    if File.ftype(header_file).eql? 'file'
-                        header_file_basename = File.basename(header_file)
-                        if !(File.exist? "#{@framework_headers_path}/#{header_file_basename}")
-                            puts header_file_basename
-                            FileUtils.cp(header_file, @framework_headers_path)
-                        end
-                    end
+                if pod_dependency
+                    #添加 Pod依赖库构建生成的二进制文件
+                    inputs << "#{@build_path}/*/**/*.framework"
+                    #添加 Pod依赖库本地依赖的二进制文件
+                    inputs << "#{@output}/Example/Pods/**/Frameworks/**/*.framework"
                 end
-            end
     
+                Header.combine(headers, inputs, @combine_include, @combine_exclude)
+            end
+
             def combine_binarys(local_dependency, pod_dependency)
                 binary = "#{@framework_path}/#{@podspec.name}"
                 #添加 构建生成的二进制文件
@@ -134,8 +158,8 @@ module PPL
                 end
                 if pod_dependency
                     #添加 Pod依赖库构建生成的二进制文件
-                    inputs << "#{@build_path}/*/**/lib*.a";
-                    inputs << "#{@build_path}/*/**/*.framework/*";
+                    inputs << "#{@build_path}/*/**/lib*.a"
+                    inputs << "#{@build_path}/*/**/*.framework/*"
                     #添加 Pod依赖库预先构建的二进制文件
                     inputs << "#{@output}/Example/Pods/**/*SDK/*.framework/*"
                     #添加 Pod依赖库本地依赖的二进制文件
@@ -143,7 +167,7 @@ module PPL
                     inputs << "#{@output}/Example/Pods/**/Frameworks/**/*.framework/*"
                 end
     
-                Binary.combine(binary, inputs, @combine_ignore)
+                Binary.combine(binary, inputs, @combine_include, @combine_exclude)
                 Binary.thin(binary, @archs)
             end
             
@@ -165,7 +189,7 @@ module PPL
                     inputs << "#{@output}/Example/Pods/**/Frameworks/**/*.bundle"
                 end
     
-                Bundle.cp(inputs, @build_path, @combine_ignore)
+                Bundle.combine(inputs, @build_path, @combine_include, @combine_exclude)
             end
 
             def merge_bundles

data/lib/pod-pipeline/util/binary.rb

@@ -1,6 +1,6 @@
 module PPL
     class Binary
-        def self.combine(output, inputs, ignore_list=[])
+        def self.combine(output, inputs, include_list=[], exclude_list=[])
             puts "\n目标文件：#{output}\n"
 
             #获取合并文件的路径序列
@@ -15,17 +15,32 @@ module PPL
                     info_log = `lipo -info "#{input_file}" > /dev/null 2>&1
                     echo result:$?`
                     next unless info_log.include? 'result:0'
-                    #若 input_file 为被忽略标记的文件 则跳过
-                    is_ignore = false
-                    ignore_list.each { |ignore|
-                        input_file_basename = File.basename(input_file)
-                        ignore_basename = File.basename(ignore)
-                        if input_file_basename == ignore_basename || input_file_basename == "lib#{ignore_basename}.a"
-                            is_ignore = true
-                            break
-                        end
-                    }
-                    next if is_ignore
+                    #若 input_file 非被include标记的文件 则跳过
+                    unless include_list.empty?
+                        is_include = false
+                        include_list.each { |include|
+                            input_file_basename = File.basename(input_file)
+                            include_basename = File.basename(include)
+                            if input_file_basename == include_basename || input_file_basename == "lib#{include_basename}.a"
+                                is_include = true
+                                break
+                            end
+                        }
+                        next unless is_include
+                    end
+                    #若 input_file 为被exclude标记的文件 则跳过
+                    unless exclude_list.empty?
+                        is_exclude = false
+                        exclude_list.each { |exclude|
+                            input_file_basename = File.basename(input_file)
+                            exclude_basename = File.basename(exclude)
+                            if input_file_basename == exclude_basename || input_file_basename == "lib#{exclude_basename}.a"
+                                is_exclude = true
+                                break
+                            end
+                        }
+                        next if is_exclude
+                    end
                     #若 input_file 为序列中已存在的文件 则跳过
                     next if input_file_queue.include? input_file
 
@@ -66,7 +81,7 @@ module PPL
                     return 
                 end
             end
-            File.delete(binary)
+            File.delete(binary) if File.exist? binary
 
             binary_pieces = "#{binary}-*"
             combine(binary, [binary_pieces])

data/lib/pod-pipeline/util/bundle.rb

@@ -1,6 +1,6 @@
 module PPL
     class Bundle
-        def self.cp(inputs, output, ignore_list=[])
+        def self.combine(inputs, output, include_list=[], exclude_list=[])
             puts "\n目标文件：#{output}\n"
 
             #获取合并文件的路径序列
@@ -10,17 +10,32 @@ module PPL
                 Dir[input].each do |input_bundle|;
                     #若 input_bundle 为输出目录 则跳过
                     next if input_bundle.eql? output
-                    #若 input_bundle 为被忽略标记的文件 则跳过
-                    is_ignore = false
-                    ignore_list.each { |ignore|
-                        input_file_basename = File.basename(input_bundle)
-                        ignore_basename = File.basename(ignore)
-                        if input_file_basename == "#{ignore_basename}.bundle"    
-                            is_ignore = true
-                            break
-                        end
-                    }
-                    next if is_ignore
+                    #若 input_file 非被include标记的文件 则跳过
+                    unless include_list.empty?
+                        is_include = false
+                        include_list.each { |include|
+                            input_file_basename = File.basename(input_bundle)
+                            include_basename = File.basename(include)
+                            if input_file_basename == "#{include_basename}.bundle"    
+                                is_include = true
+                                break
+                            end
+                        }
+                        next unless is_include
+                    end
+                    #若 input_file 为被exclude标记的文件 则跳过
+                    unless exclude_list.empty?
+                        is_exclude = false
+                        exclude_list.each { |exclude|
+                            input_file_basename = File.basename(input_bundle)
+                            exclude_basename = File.basename(exclude)
+                            if input_file_basename == "#{exclude_basename}.bundle"    
+                                is_exclude = true
+                                break
+                            end
+                        }
+                        next if is_exclude
+                    end
                     #合并
                     puts "合并资源包：" + input_bundle
                     FileUtils.cp_r(input_bundle, output, :preserve => true)

data/lib/pod-pipeline/util/header.rb

@@ -0,0 +1,58 @@
+module PPL
+  # PPL::Header
+  class Header
+    def self.combine_check(path, pattern_list = [])
+      return false if pattern_list.empty?
+
+      path_basename = File.basename(path)
+      pattern_list.each do |pattern|
+        pattern_basename = File.basename(pattern)
+
+        return true if path_basename == "#{pattern_basename}.framework"
+      end
+
+      false
+    end
+
+    def self.combine_check_skip(path, queue, include_list = [], exclude_list = [])
+      # 若 path 非目录 则跳过
+      return true unless File.directory?(path)
+      # 若 path 非被include标记的文件 则跳过
+      return true unless combine_check(path, include_list)
+      # 若 path 为被exclude标记的文件 则跳过
+      return true if combine_check(path, exclude_list)
+      # 若 path 为序列中已存在的文件 则跳过
+      return true if queue.include? path
+
+      false
+    end
+
+    def self.combine_collect(inputs, include_list = [], exclude_list = [])
+      # 获取合并文件的路径序列
+      input_queue = []
+      inputs.each do |input|
+        puts "\n合并路径：#{input}"
+
+        Dir[input].each do |input_path|
+          next if combine_check_skip(input_path, input_queue, include_list, exclude_list)
+
+          # 合并
+          puts "=> #{input_path}"
+          input_queue << input_path
+        end
+      end
+
+      input_queue
+    end
+
+    def self.combine(output, inputs, include_list = [], exclude_list = [])
+      puts "\n目标文件：#{output}\n"
+
+      combine_collect(inputs, include_list, exclude_list).each do |input|
+        Dir["#{input}/Headers/*.h"].each do |header|
+          FileUtils.cp(header, output, 'preserve': true)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-pipeline
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - 郑贤达
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-04 00:00:00.000000000 Z
+date: 2023-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -133,6 +133,7 @@ files:
 - lib/pod-pipeline/extension/workspace-ppl.rb
 - lib/pod-pipeline/util/binary.rb
 - lib/pod-pipeline/util/bundle.rb
+- lib/pod-pipeline/util/header.rb
 - lib/pod-pipeline/util/scanner.rb
 - lib/pod-pipeline/util/xcodebuild.rb
 homepage: https://github.com/TokiGems/pod-pipeline