pod-pipeline 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db51e93a3eb0a400e90b2beb2153de9519b2b548ad7ddccde9af2486bba61742
-  data.tar.gz: 5bf678bfd5829e5022b0e693f69443faa9bcab9b0a53b43a7b10e1579c05e0a2
+  metadata.gz: 5b8f7c79b8a9d1755b69b4ed1b77c8bb04fb8b5ed5d226bf78c233bcadc2fef6
+  data.tar.gz: 57a4838377e62a944aba6db97f3e374cc4b2f114cf50e7597ec66a1f659cd19d
 SHA512:
-  metadata.gz: 0d36354903bf2238d446620712e97087cda0e13b4e7303c24e5abce46c3c67b381c530ae379633bd429abb531a44c23d58fd4e67074cbdbc8902d5d25a03f106
-  data.tar.gz: edd7a6d04f81316e3bfddc8b9fcc91e32e5579def299609240300ce0ecb31cc6f790d21c602bf4de998e81a32137e3baf62683953007a16ec9bd3de9cfab8be2
+  metadata.gz: dd3d06a31f00c1ac04a45491ccafe307a44a6573ff027d528cdfdb8321e9e526ce1ff8de7a41dc5d7f500fb36894d83a9c3bd170d841c7fbfd4f1a2a44e5e6c0
+  data.tar.gz: a69e4f6fb4d232f96e437f22fb9fb40af5aba1eee113a1c1da60030f55dca2c8fa6f7d4ba925f8ae3a5b3b8a4be95505e6feb6f6d918c20b249fa20d546185b3

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

@@ -22,7 +22,8 @@ module PPL
                     ['--output=./', '项目构建的输出目录。(默认使用项目根目录)'],
                     ['--configuration=Release', '项目构建的环境。(默认为Release)'],
                     ['--arch=arm64,armv7,x86_64', '项目构建的架构。(默认为 arm64,armv7,x86_64)'],
-                    ['--combine=local,pod', '项目构建后合并依赖库的二进制文件，local为本地依赖库，pod为CocoaPods依赖库。(默认为 local)'],
+                    ['--combine=local,pod', '项目构建后合并依赖库的二进制文件，local为本地依赖库，pod为CocoaPods依赖库。(默认为 不合并)'],
+                    ['--combine-ignore=name1,name2', '项目构建后合并依赖库的二进制文件，标注不想合并的内容。'],
                     ['--bundle-merge=merge', '是否合并所有资源包，参数为合并后的资源包名。(默认为 不合并)'],
                 ].concat(super)
             end
@@ -33,6 +34,7 @@ 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(',')
                 @bundle_merge       = argv.option('bundle-merge', '').split(',').first
                 
                 @projectPath = @path.count.zero? ? Pathname.pwd.to_s : @path.first
@@ -141,13 +143,13 @@ module PPL
                     inputs << "#{@output}/Example/Pods/**/Frameworks/**/*.framework/*"
                 end
     
-                Binary.combine(binary, inputs)
+                Binary.combine(binary, inputs, @combine_ignore)
                 Binary.thin(binary, @archs)
             end
             
             def copy_bundles(local_dependency, pod_dependency)
                 #添加 构建生成的资源包
-                inputs = ["#{@output}/**/#{@podspec.name}/*.bundle"]
+                inputs = ["#{@build_path}/**/#{@podspec.name}/*.bundle"]
                 if local_dependency
                     #添加 本地依赖的资源包
                     inputs << "#{@output}/#{@podspec.name}/Libraries/**/*.bundle" 
@@ -163,7 +165,7 @@ module PPL
                     inputs << "#{@output}/Example/Pods/**/Frameworks/**/*.bundle"
                 end
     
-                Bundle.cp(inputs, @build_path)
+                Bundle.cp(inputs, @build_path, @combine_ignore)
             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="")
+        def self.combine(output, inputs, ignore_list=[])
             puts "\n目标文件：#{output}\n"
 
             #获取合并文件的路径序列
@@ -8,17 +8,24 @@ module PPL
             inputs.each do |input|
                 puts "\n合并路径：#{input}"
 
-                Dir[input].each do |input_file|;
+                Dir[input].each do |input_file|
                     #若 input_file 为目录 则跳过
                     next if Dir.exists? input_file
-                    #若 input_file 为被忽略标记的文件 则跳过
-                    unless ignore.empty?
-                        next if File.basename(input_file).include? File.basename(ignore) 
-                    end
                     #若 input_file 为非二进制文件 则跳过
                     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 为序列中已存在的文件 则跳过
                     next if input_file_queue.include? input_file
 

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

@@ -1,6 +1,6 @@
 module PPL
     class Bundle
-        def self.cp(inputs, output)
+        def self.cp(inputs, output, ignore_list=[])
             puts "\n目标文件：#{output}\n"
 
             #获取合并文件的路径序列
@@ -10,7 +10,17 @@ 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
                     #合并
                     puts "合并资源包：" + input_bundle
                     FileUtils.cp_r(input_bundle, output, :preserve => true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-pipeline
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.4
 platform: ruby
 authors:
 - 郑贤达
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-27 00:00:00.000000000 Z
+date: 2022-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core