pod-pipeline 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afc51e61275a6b58b4f0d10d67434a9ee455491487f5d6f48e12f35ec9b06781
-  data.tar.gz: e68a6fea1c85b64f39f47ed83ab736623b4848f4a82ea02d059f94aeb52077e9
+  metadata.gz: fd5fd584f64a59dee8b4cd3689531c99fdf216de5303b00df371ea5a2199d81f
+  data.tar.gz: 90b7e415404252fc567d931b4e922109e5dbfe3c6882374a67ef89cd0f14246c
 SHA512:
-  metadata.gz: 50249a61a5551cf610bbe1dedbea87b889b5731cdf2d1b080a2f3ef563436d27dcd17017829c217e291a3b24728e2a58f8a85e083b4f3dc313be33ef369d9620
-  data.tar.gz: b043a21d4f502890c6a19e141b97945f423806cfd294949d5c3c41b4375c6e82b43b4de4a65c154d3bd9e09ab29a91a83d8a750b6356c145407f3dc64f4d85d2
+  metadata.gz: 25d687633b6682b57b6fa3873405f551fe628fddea3f802e5f52c898d9f854907a189c10cec9cbce03a5e1f222ac9a51ba40ac5816c9d5d6871e9ce8d1681b99
+  data.tar.gz: 6b7c5325085f307cdbd6692186a7a083eef5bab5890d81fd2780816fb999a83c37702aecda49e53a5ff21866e9c2a85684bc990ef3b620d7c067c0776876c10d

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
@@ -123,8 +125,8 @@ module PPL
                 binary = "#{@framework_path}/#{@podspec.name}"
                 #添加 构建生成的二进制文件
                 inputs = []
-                inputs << "#{@build_path}/**/lib#{@podspec.name}.a"
-                inputs << "#{@build_path}/**/*.framework/#{@podspec.name}"
+                inputs << "#{@build_path}/*/**/lib#{@podspec.name}.a"
+                inputs << "#{@build_path}/*/**/*.framework/#{@podspec.name}"
                 if local_dependency
                     #添加 本地依赖的二进制文件
                     inputs << "#{@output}/#{@podspec.name}/Libraries/**/*.a" 
@@ -132,8 +134,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依赖库本地依赖的二进制文件
@@ -141,7 +143,7 @@ module PPL
                     inputs << "#{@output}/Example/Pods/**/Frameworks/**/*.framework/*"
                 end
     
-                Binary.combine(binary, inputs)
+                Binary.combine(binary, inputs, @combine_ignore)
                 Binary.thin(binary, @archs)
             end
             
@@ -155,7 +157,7 @@ module PPL
                 end
                 if pod_dependency
                     #添加 Pod依赖库构建生成的资源包
-                    inputs << "#{@build_path}/**/*.bundle"
+                    inputs << "#{@build_path}/*/**/*.bundle"
                     #添加 Pod依赖库预先构建的资源包
                     inputs << "#{@output}/Example/Pods/**/*SDK/*.bundle"
                     #添加 Pod依赖库本地依赖的资源包
@@ -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.1
+  version: 0.5.3
 platform: ruby
 authors:
 - 郑贤达
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-27 00:00:00.000000000 Z
+date: 2022-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core