cocoapods-ppbuild 1.0.1 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4d8400efa95565f34739f086c1c7a65b260f5b34df388e03633d8f5a2216c63
-  data.tar.gz: 740423aaa87dee1df082830b910469fb77b2af8b8ff1f294a6c2ff52559b0375
+  metadata.gz: 53dd9ab48b9084264f5f7251529922c6f338d556634bd765e9e6bdb39ee79b34
+  data.tar.gz: 398d6bae393855400ba28dcae5a0db71cbd9b5676a1c43ef423a79934d3e772d
 SHA512:
-  metadata.gz: 6e16e6f0a08d29705ff44917b46d449199f7a8cb0dcbfe2fc660019828e9cad7bc3981a9dd6513e18f016b195f4c49f8a417d55ebac99c0ff6d369abef10cf7e
-  data.tar.gz: 4109f534f1848b4147e94aa03406f5e9a8e1ec2395c8210cbcd2f62a1b3c42c0da9d5dca047a7b097057f97451bd8a8424ec65204e6d54c64ed0bec5c0a43731
+  metadata.gz: d2358845e6481c333ee5e3270fd17160b51975569bfe55220fedc66f27f8d0f3bbfa470a346a708d5ad2c2602e91f69f54d65d8b973f261a80385331e2bc3eac
+  data.tar.gz: 1c09d293fc5a76e7116e52cd0acfe7698b364c2a0c234cf5c99365aad3a56ba8a8dd0504cc49bbf8e89d592cd3bad3b9e0b410d1ba6585d58006d1171451b97f

data/lib/cocoapods-ppbuild/Integration.rb

@@ -51,7 +51,10 @@ module Pod
                             FileUtils.cp_r source, target, :remove_destination => true
                         else
                             FileUtils.cp source, target
-                        end        
+                        end
+                        if not target.exist?
+                            raise "资源导入失败：#{target}"
+                        end
                     end
                 end
 
@@ -74,8 +77,7 @@ module Pod
                     end
                     target_folder.rmtree if target_folder.exist?
                     target_folder.mkpath
-
-
+                    
                     walk(real_file_folder) do |child|
                         source = child
 
@@ -232,13 +234,20 @@ module Pod
                 cache = []
 
                 def add_vendered_framework(spec, platform, added_framework_file_path)
-                    if spec.attributes_hash[platform] == nil
-                        spec.attributes_hash[platform] = {}
+                    platform_map = spec.attributes_hash[platform]
+                    if platform_map == nil
+                        platform_map = {}
                     end
-                    vendored_frameworks = spec.attributes_hash[platform]["vendored_frameworks"] || []
+                    vendored_frameworks = platform_map["vendored_frameworks"] || []
                     vendored_frameworks = [vendored_frameworks] if vendored_frameworks.kind_of?(String)
+                    vf = spec.attributes_hash["vendored_frameworks"] || []
+                    vf = [vf] if vf.kind_of?(String)
+                    vendored_frameworks += vf
                     vendored_frameworks += [added_framework_file_path]
-                    spec.attributes_hash[platform]["vendored_frameworks"] = vendored_frameworks
+                    spec.attributes_hash["vendored_frameworks"] = vendored_frameworks
+                    if spec.attributes_hash[platform] != nil
+                        spec.attributes_hash[platform].delete("vendored_frameworks")
+                    end
                 end
                 def empty_source_files(spec)
                     spec.attributes_hash["source_files"] = []
@@ -278,11 +287,17 @@ module Pod
                     # target after pod install. But the bundle have already built when the prebuit
                     # phase and saved in the framework folder. We will treat it as a normal resource
                     # file.
+
                     if spec.attributes_hash["resource_bundles"]
                         bundle_names = spec.attributes_hash["resource_bundles"].keys
                         spec.attributes_hash["resource_bundles"] = nil 
                         spec.attributes_hash["resources"] ||= []
                         spec.attributes_hash["resources"] += bundle_names.map{|n| n+".bundle"}
+                    elsif spec.attributes_hash['ios'] && spec.attributes_hash['ios']["resource_bundles"]
+                        bundle_names = spec.attributes_hash['ios']["resource_bundles"].keys
+                        spec.attributes_hash['ios']["resource_bundles"] = nil 
+                        spec.attributes_hash['ios']["resources"] ||= []
+                        spec.attributes_hash['ios']["resources"] += bundle_names.map{|n| n+".bundle"}
                     end
 
                     # to avoid the warning of missing license

data/lib/cocoapods-ppbuild/Main.rb

@@ -86,9 +86,6 @@ module Pod
             class_attr_accessor :custom_build_options_simulator
             self.custom_build_options = []
             self.custom_build_options_simulator = []
-
-            class_attr_accessor :static_build_pod_names
-            self.static_build_pod_names = []
         end
     end
 end
@@ -179,6 +176,10 @@ Pod::HooksManager.register('cocoapods-ppbuild', :post_install) do |installer_con
     if Pod::Podfile::DSL.static_binary
         Pod::PrebuildSandbox.replace_tagert_copy_source_sh(installer_context)
     end
-    
+
+    if !Pod.is_prebuild_stage && Pod::Podfile::DSL.dont_remove_source_code 
+        require_relative 'reference/reference_source_code'
+        installer_context.refrence_source_code
+    end
 end
 

data/lib/cocoapods-ppbuild/Prebuild.rb

@@ -114,13 +114,12 @@ module Pod
             Pod::UI.puts "Prebuild frameworks (total #{targets.count})"
             Pod::Prebuild.remove_build_dir(sandbox_path)
             targets.each do |target|
+                output_path = sandbox.framework_folder_path_for_target_name(target.name)
+                output_path.rmtree if output_path.exist?
                 if !target.should_build?
                     UI.puts "Prebuilding #{target.label}"
                     next
                 end
-
-                output_path = sandbox.framework_folder_path_for_target_name(target.name)
-                output_path.rmtree if output_path.exist?
                 output_path.mkpath unless output_path.exist?
                 Pod::Prebuild.build(sandbox_path, target, output_path, bitcode_enabled,  Podfile::DSL.custom_build_options,  Podfile::DSL.custom_build_options_simulator)
 

data/lib/cocoapods-ppbuild/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsPpbuild
-  VERSION = "1.0.1"
+  VERSION = "1.0.5"
 end

data/lib/cocoapods-ppbuild/helper/passer.rb

@@ -36,6 +36,10 @@ module Pod
             class_attr_accessor :target_names_to_skip_integration_framework
             self.target_names_to_skip_integration_framework = []
 
+            # 编译过的framework pod 名称
+            class_attr_accessor :static_build_pod_names
+            self.static_build_pod_names = []
+
         end
     end
 end

data/lib/cocoapods-ppbuild/reference/reference_source_code.rb

@@ -0,0 +1,51 @@
+
+require 'xcodeproj'
+require_relative '../helper/passer'
+require_relative '../helper/prebuild_sandbox'
+
+module Pod
+    class Installer
+    	class PostInstallHooksContext
+	    	# 将源码引入主工程，方便源码调试
+	    	def refrence_source_code
+	    		sandbox_path = Pathname.new(sandbox.root) 
+	    		pre_sandbox = Pod::PrebuildSandbox.from_standard_sandbox(sandbox)
+
+	    		exsited_framework_pod_names = pre_sandbox.exsited_framework_pod_names || []
+	    		proj_path = sandbox_path + get_project_name("Pods")
+	    		project = Xcodeproj::Project.open(proj_path)
+    			exsited_framework_pod_names.each do |target_name|
+	    			real_reference("_Prebuild/#{target_name}", project, target_name)
+	    		end
+	    		project.save;
+	    	end
+
+	    	private
+	    	def get_project_name(tageter_name)
+	    		return "#{tageter_name}.xcodeproj"
+	    	end
+
+	    	def real_reference(file_path, project, target_name)
+				group = project.main_group.find_subpath(File.join("SourceCode", target_name), true)
+				group.set_source_tree('SOURCE_ROOT')
+				group.set_path(file_path)
+			    add_files_to_group(group)
+	    	end
+
+	    	#添加文件链接
+			def add_files_to_group(group)
+			  Dir.foreach(group.real_path) do |entry|
+			    filePath = File.join(group.real_path, entry)
+			    # 过滤目录和.DS_Store文件
+			    if entry != ".DS_Store" && !filePath.to_s.end_with?(".meta") &&entry != "." &&entry != ".." then
+			    	# 向group中增加文件引用
+					group.new_reference(filePath)
+				end
+			  end
+			end
+	    end
+	end
+end
+
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-ppbuild
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.5
 platform: ruby
 authors:
 - 彭懂
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-11 00:00:00.000000000 Z
+date: 2021-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,6 +58,7 @@ files:
 - lib/cocoapods-ppbuild/helper/podfile_options.rb
 - lib/cocoapods-ppbuild/helper/prebuild_sandbox.rb
 - lib/cocoapods-ppbuild/helper/target_checker.rb
+- lib/cocoapods-ppbuild/reference/reference_source_code.rb
 - lib/cocoapods-ppbuild/rome/build_framework.rb
 - lib/cocoapods-ppbuild/tool/tool.rb
 - lib/cocoapods_plugin.rb