pod-pipeline 0.5.8 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b21a6b46fe8b53d7f5a67e42925ce3cb650cb0add13f345370b3536d4d0bc57e
-  data.tar.gz: 47f60f1813e7a0f59e90165917489522e1ba4a69586721cb611f491fcc1d8392
+  metadata.gz: a26381059d1c86972baf78a914f53e2c728c227a568dc363796434a8de2e7f11
+  data.tar.gz: 3cbbe4c994b1e6d3851261584e61a8d9cbc6a099922838cebe5c6d13548ad277
 SHA512:
-  metadata.gz: 5be551fc3105d8309f3802fb33ef106e13557be4d11f8c621417e628771d8ea3ef9472ea13062587941cef03bff3eb07d6e100a49e7484b572845549d7a2a61a
-  data.tar.gz: 9d63c3428036d8f96b36f882ba6b5a27a08e58e8cdcab014530a197b97903357638c7a1affc05a2982045bdc8e96f1ae4167c233c2f2d52c1d7b96c9c8619fb4
+  metadata.gz: 27d74282403a2b60805d21cf5a2c6d09b2b851aa0b75036cb26c0e47ce13dca62737c977b353eecd8cdcaba60e7dffd3d176b4eb726339828a091342639842f3
+  data.tar.gz: fab327c5fffa0c86a82c92467f9daf3ffa4b5849ccf27777095f6e0e1db8a2e83d0d7d7c989abf8036fa17a52565f2f1460599de096ae3cf131800a2809464b7

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

@@ -70,9 +70,11 @@ module PPL
                     XCodebuild.build(@workspace.path, @podspec.name, arch, @configuration, @build_path)
                 end
 
-                #合并头文件
-                puts "\n[合并 #{@combines.join(", ")} 的头文件]"
-                combine_headers(@combines.include?('local'), @combines.include?('pod'))
+                if @combine_headers
+                    #合并头文件
+                    puts "\n[合并 #{@combines.join(", ")} 的头文件]"
+                    combine_headers(@combines.include?('local'), @combines.include?('pod'))
+                end
 
                 #合并二进制文件
                 puts "\n[合并 #{@combines.join(", ")} 的二进制文件]"

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

@@ -45,6 +45,28 @@ module PPL
       input_queue
     end
 
+    def self.combine_reset(header, include_list)
+      content = File.read(header)
+      replace = PPL::Scanner.name
+      include_list.each do |include_name|
+        content = content.gsub(include_name, replace)
+      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"
 
@@ -53,6 +75,10 @@ module PPL
           FileUtils.cp(header, output, 'preserve': true)
         end
       end
+      Dir["#{output}/*.h"].each do |header|
+        combine_reset(header, include_list)
+      end
+      combine_base(output)
     end
   end
 end

metadata

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