pod-pipeline 0.5.9 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d25938cced26fc15ef81da41b55733b9c8043c1cf0ef21dbb7b220b63d93bbd5
-  data.tar.gz: 127e94bfdef35248fa9ce8f82e4699722c19d49d49a03e608031705f13fb296a
+  metadata.gz: dc0446d7e3aac978fc595fa2f19d87cc18a6f59b8431b4652e699c4fec61f466
+  data.tar.gz: 2041b518ff0a053ff2154d0f885d20c91765ab2aee9b3df470794c45591bc260
 SHA512:
-  metadata.gz: e4c077e56bc88e8bcb6802a2da7693250c7b12a310dc63aeadc4e0433d85c850148a7a8714b15e54cacd8d356f607d7d902d78d6b781304ae200cfc02a73bb89
-  data.tar.gz: 4fff1e1982fe98d629edf8cd62cf1058315b71ea062c05258ec08276980eeb1fc0fbf8546845a75f6cc43eec7980b47a8ebc9fdebc412150e63110f272305cb8
+  metadata.gz: f94c9e775747a23be586c69b243e5dda5256eb8daca923ef2613a8b8813bf5534a987247f3d75f9e5fd4f37d7b3a0d848c57d0be6fb5f24258f00719a6923643
+  data.tar.gz: 411ffb81d938082f3a6232f2e5c87328f36c0151d5931f95fb1bcc5d2de8c60bb795825d0389e9ce0ca174989e0694b53f9403102c534976afb2fc8cd5a78cd2

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

@@ -76,6 +76,9 @@ module PPL
                     combine_headers(@combines.include?('local'), @combines.include?('pod'))
                 end
 
+                #合并本地头文件
+                add_headers
+
                 #合并二进制文件
                 puts "\n[合并 #{@combines.join(", ")} 的二进制文件]"
                 combine_binarys(@combines.include?('local'), @combines.include?('pod'))
@@ -103,7 +106,9 @@ module PPL
             end
     
             def add_headers
+                puts "\n[合并 本地的头文件]"
                 header_stands = "#{@output}/Example/Pods/Headers/Public/#{@podspec.name}/*.h"
+                puts "\n合并路径：#{header_stands}"
                 Dir[header_stands].each do |header_stand|
                     if File.ftype(header_stand).eql? 'link'
                         header_file = "#{File.dirname(header_stand)}/#{File.readlink(header_stand)}"
@@ -116,7 +121,8 @@ module PPL
                         end
                     end
                 end
-                header_files = "#{@build_path}/**/#{@podspec.name}.framework/Headers/*.h"
+                header_files = "#{@build_path}/**/#{@podspec.name}/#{@podspec.name}.framework/Headers/*.h"
+                puts "\n合并路径：#{header_files}"
                 Dir[header_files].each do |header_file|
                     if File.ftype(header_file).eql? 'file'
                         header_file_basename = File.basename(header_file)
@@ -144,8 +150,6 @@ module PPL
                 end
     
                 Header.combine(headers, inputs, @combine_include, @combine_exclude)
-
-                add_headers
             end
 
             def combine_binarys(local_dependency, pod_dependency)

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

@@ -45,26 +45,42 @@ module PPL
       input_queue
     end
 
-    def self.combine_reset(header, include_list)
+    def self.combine_reset(header, inputs)
       content = File.read(header)
       replace = PPL::Scanner.name
-      include_list.each do |include_name|
-        content = content.gsub(include_name, replace)
+      inputs.each do |input|
+        Dir[input].each do |input_path|
+          content = content.gsub("#import <#{File.basename(input_path, '.framework')}", "#import <#{replace}")
+        end
       end
       File.write(header, content)
     end
 
+    def self.combine_base(output)
+      base_name = PPL::Scanner.name
+      base_header = "#{output}/#{base_name}.h"
+      base_macro = "#{base_name.upcase}_HEADER"
+      base_content = []
+      base_file = File.open(base_header, 'w')
+      base_content << "#ifndef #{base_macro}"
+      base_content << "#define #{base_macro}"
+      Dir["#{output}/*.h"].each { |header| base_content << "#import <#{base_name}/#{File.basename(header)}>" }
+      base_content << "#endif //#{base_macro}"
+      base_content.each { |base_line| base_file.puts(base_line) }
+    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|
+          next if header.include?('-umbrella.h')
+
           FileUtils.cp(header, output, 'preserve': true)
         end
       end
-      Dir["#{output}/*.h"].each do |header|
-        combine_reset(header, include_list)
-      end
+      Dir["#{output}/*.h"].each { |header| combine_reset(header, inputs) }
+      combine_base(output)
     end
   end
 end

metadata

@@ -1,36 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: pod-pipeline
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.5.11
 platform: ruby
 authors:
 - 郑贤达
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-11 00:00:00.000000000 Z
+date: 2024-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: cocoapods-trunk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'