cocoapods-ppbuild 1.0.0 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 231833d75f5a03801907494182800a0f3e3cbeba1706c4317b0c6574ded2245c
-  data.tar.gz: a0396c24d329fa72fb4ff504884ceb2d57db21780fc82e6c5bde9fb714842ecf
+  metadata.gz: 177f5365623719afc81ba079dcdfee6b910d37c2ef6bec3cb9e3ed7ca06f5efa
+  data.tar.gz: 51832c007c5bcdd40fcb1243aae611c5fc36067793f3956f961be62c5fab7c40
 SHA512:
-  metadata.gz: 7e47d544f99c690e320808859dbf9669dbd2346ff8592dced553e4d5bb3829f69986315da4c81bf383b34cda28c6de9f75a048b8170040f01906523d5e4e9761
-  data.tar.gz: f991800a994b002b43d6fb0e3e80fb34fc525303895ff61d3b95cab5f01f9a7e0568187f87bd909cd6827b0ed8f0069b2f03ff5a0a06e3bc2ef7f2f9b326d82e
+  metadata.gz: 746936e683627c9a4518cb63ee101c049aea83364054d1e8df39b155e754fd42f0aa1831a10724e6c4f6ecdb15b35406b7dab66aa71efec7c6b5f3ab60be81b1
+  data.tar.gz: d343d195804b2c435e6b409d4df14e69ec581e05cff39c5046f0202abb9dc5defc32741c17b4e91d0825d211a516ba34de5e87d49c01fbbc82537595e1c314c8

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
 
@@ -283,6 +285,11 @@ module Pod
                         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']["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

@@ -120,6 +120,7 @@ module Pod
                 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.0"
+  VERSION = "1.0.4"
 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.0
+  version: 1.0.4
 platform: ruby
 authors:
 - 彭懂
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2021-10-21 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