cocoapods-xlbuild 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5748f33f7f849025871d30147a549cc44e663050f0db5f4d566e704a79b5a8af
-  data.tar.gz: 8fdda2558312a18ce1428d9012e8c137ed7740dd015108103369ab62ed3615b1
+  metadata.gz: cfe84969c5bf4aa57c96cca09cfcb42a628f69e836e5e10127378a5084a342c7
+  data.tar.gz: c13a23f3b99456911d876d8f6a4b7de58d9e9c704f32e2d26adf3b7b0442b21c
 SHA512:
-  metadata.gz: de501a7958a4dd3fd69c1d594a5635ab71b3a08e1827b308e33e290740c7860ec5efdf301c95a492e54be686e7bf4c8dc3f588c7088d1d6881bb49dc12b4b1bc
-  data.tar.gz: e649985d9a764cff3fcb0a3b305cffa4fba37b73e228d0c431ac48be3b761ff3661289d703a89460c9f2a8ee3b29aa1734a378cda68879d463d6c338a6ad7f62
+  metadata.gz: 633cc3ba7e6eccd7dcb343642d3ef9b07f100a592029befadf334a9f61a68af18399cca0961f281fe1a30d06933754ca0444759d6d26f69c210150eb0f7b310c
+  data.tar.gz: d196bff9a8e17fe7949648db27b6a5737a3c9fc1fd6323e3745151f818d7383b84cb64166d78222ebbf0bbc378a7d02f7e527ffe654a6bcfbee2e5260c718854

data/lib/cocoapods-xlbuild/Integration.rb

@@ -310,6 +310,7 @@ module Pod
 
 
         # Override the download step to skip download and prepare file in target folder
+        # linpeng edit: hook集成安装源码的方法（源码下载完之后会将源码关联引用到Pod工程）
         old_method = instance_method(:install_source_of_pod)
         define_method(:install_source_of_pod) do |pod_name|
             if Pod::is_prebuild_stage
@@ -320,6 +321,7 @@ module Pod
                 # \copy from original
 
                 if self.prebuild_pod_names.include? pod_name
+                    #linpeng edit: Pod::is_prebuild_stage 编译完成后 还会执行该步骤 该步骤会将_Prebuild/GenerateFramework/xxxx目录关联引用到Pod/xxxx目录里面 替换framework原本的源码
                     pod_installer.install_for_prebuild!(self.sandbox)
                 else
                     pod_installer.install!

data/lib/cocoapods-xlbuild/Main.rb

@@ -5,6 +5,9 @@ require_relative 'tool/tool'
 module Pod
     class Podfile
         module DSL
+            def set_local_frameworks_cache_path(path)
+                DSL.local_frameworks_cache_path = path
+            end
             # Enable prebuiding for all pods
             # it has a lower priority to other xlbuild settings
             def use_dynamic_binary!
@@ -83,10 +86,58 @@ module Pod
 
             class_attr_accessor :custom_build_options
             class_attr_accessor :custom_build_options_simulator
+
+            class_attr_accessor :local_frameworks_cache_path
+            local_frameworks_cache_path = nil
+
             self.custom_build_options = []
             self.custom_build_options_simulator = []
         end
     end
+
+    class Type
+        class_attr_accessor :pod_flag_file
+        @pod_flag_file = "build.xl"
+
+        def self.frameworks_type
+            is_static_binary = Pod::Podfile::DSL.static_binary
+            frameworks_type = is_static_binary ? "static" : "dynamic"
+            return frameworks_type
+        end
+
+        # 动静态库切换时候需要重新build（删除Pod目录重新构建）
+        def self.adjust_dynamic_static_change_pod(pod_root_path)
+            pod_type_path = pod_root_path+Pod::Type.pod_flag_file
+            if not File.exist?(pod_type_path)
+                FileUtils.remove_dir(pod_root_path)
+            else
+                frameworks_type = Pod::Type.frameworks_type
+                aFile = File.new(pod_type_path, "r")
+                if aFile
+                    content = aFile.readlines[0]
+                    if not frameworks_type.equal?(content)
+                        FileUtils.remove_dir(pod_root_path)
+                    end
+                end
+
+            end
+
+        end
+
+        #构建结束 标记当前打包的是动|静态库
+        def self.adjust_dynamic_static_change_pod_finish(pod_root_path)
+            # 标记状态
+            pod_type_path = pod_root_path+Pod::Type.pod_flag_file
+            if File.exist?(pod_type_path)
+                File.delete(pod_type_path)
+            end
+
+            frameworks_type = Pod::Type.frameworks_type
+            File.open(pod_type_path, "w+") { |f|
+                f.write(frameworks_type)
+            }
+        end
+    end
 end
 
 Pod::HooksManager.register('cocoapods-xlbuild', :pre_install) do |installer_context|
@@ -138,8 +189,13 @@ Pod::HooksManager.register('cocoapods-xlbuild', :pre_install) do |installer_cont
 
     # make another custom sandbox
     standard_sandbox = installer_context.sandbox
+    #linpeng edit： 修改Pod目录为 Pod/_Prebuild
     prebuild_sandbox = Pod::PrebuildSandbox.from_standard_sandbox(standard_sandbox)
 
+    # 动|静态库(mach-o type)切换需要重新build（删除Pod目录）
+    pod_root_path = standard_sandbox.root
+    Pod::Type.adjust_dynamic_static_change_pod pod_root_path
+
     # get the podfile for prebuild
     prebuild_podfile = Pod::Podfile.from_ruby(podfile.defined_in_file)
 
@@ -168,26 +224,28 @@ Pod::HooksManager.register('cocoapods-xlbuild', :pre_install) do |installer_cont
     Pod::Installer.disable_install_complete_message false
     Pod::UserInterface.warnings = [] # clean the warning in the prebuild step, it's duplicated.
 
+
+    # install完成标记mach-o type
+    Pod::Type.adjust_dynamic_static_change_pod_finish pod_root_path
+
     # -- step 2: pod install ---
     # install
-    Pod::UI.puts "🤖  Pod Install " + Time.new.inspect
+    Pod::UI.puts "🤖  Pod Install "
     # go on the normal install step ...
 
 end
 
 ## pod 安装依赖的时候会执行install，install的时候会执行run_plugins_post_install_hooks（Prebuildhook了该方法）
-# 只要有触发install方法就会触发如下的
+# 只要有触发install方法就会触发如下的 ，pre hook的时候有重新创建一个Install( binary_installer.install!)因此会触发两次的post_install的hook
 Pod::HooksManager.register('cocoapods-xlbuild', :post_install) do |installer_context|
-    Pod::UI.puts "🤖  Pod Install hook " + Time.new.inspect
     if Pod::Podfile::DSL.static_binary
-        Pod::UI.puts "🤖  replace_tagert_copy_source_sh " + Time.new.inspect
         Pod::PrebuildSandbox.replace_tagert_copy_source_sh(installer_context)
     end
 
     if !Pod.is_prebuild_stage && Pod::Podfile::DSL.dont_remove_source_code
-        Pod::UI.puts "🤖  pod工程关联引用源码 " + Time.new.inspect
         require_relative 'reference/reference_source_code'
         installer_context.refrence_source_code
+        installer_context.adjust_dynamic_framework_dsym
     end
 end
 

data/lib/cocoapods-xlbuild/Prebuild.rb

@@ -115,14 +115,52 @@ module Pod
             Pod::Prebuild.remove_build_dir(sandbox_path)
             targets.each do |target|
                 #linpeng edit  + target.version
-                output_path = sandbox.framework_folder_path_for_target_name(target.name)
+                @sandbox_framework_folder_path_for_target_name = sandbox.framework_folder_path_for_target_name(target.name)
+                output_path = @sandbox_framework_folder_path_for_target_name
                 output_path.rmtree if output_path.exist?
                 if !target.should_build?
                     UI.puts "Prebuilding #{target.label}"
                     next
                 end
                 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)
+
+                #local cache
+                localCachePathRoot = Pod::Podfile::DSL.local_frameworks_cache_path
+                is_static_binary = Pod::Podfile::DSL.static_binary
+                type_frameworks_dir = is_static_binary ? "static" : "dynamic"
+                is_has_local_cache = localCachePathRoot != nil
+                if not is_has_local_cache
+                    #开始使用XcodeBuild进行编译静态库
+                    Pod::Prebuild.build(sandbox_path, target, output_path, bitcode_enabled,  Podfile::DSL.custom_build_options,  Podfile::DSL.custom_build_options_simulator)
+                else
+                    targetFrameworkPath = localCachePathRoot + "/#{type_frameworks_dir}/#{target.name}/#{target.version}"
+                    if Dir.exist?(targetFrameworkPath)
+                        puts "[XL].本地缓存仓库获取:#{target.name}（#{target.version}） #{type_frameworks_dir}"
+                        Dir.foreach(targetFrameworkPath) do |file|
+                            if file !="." and file !=".."
+                                f = targetFrameworkPath+"/"+file
+                                FileUtils.cp_r(f, output_path, :remove_destination => false )
+                            end
+                        end
+                    else
+                        #开始使用XcodeBuild进行编译静态库
+                        Pod::Prebuild.build(sandbox_path, target, output_path, bitcode_enabled,  Podfile::DSL.custom_build_options,  Podfile::DSL.custom_build_options_simulator)
+
+                        #save for cache
+                        puts "[XL].本地缓存仓库新增:#{target.name}（#{target.version} #{type_frameworks_dir}"
+                        local_cache_path = targetFrameworkPath
+                        FileUtils.makedirs(local_cache_path) unless File.exists?local_cache_path
+                        c_output_path = output_path.to_s
+                        if Dir.exist?(output_path)
+                            Dir.foreach(output_path) do |file|
+                                if file !="." and file !=".."
+                                    f = c_output_path+"/"+file
+                                    FileUtils.cp_r(f, local_cache_path, :remove_destination => false )
+                                end
+                            end
+                        end
+                    end
+                end
 
                 # save the resource paths for later installing，动态库需要将frameworkwork中资源链接到pod上
                 if target.static_framework? and !target.resource_paths.empty?
@@ -228,7 +266,6 @@ module Pod
         # hook run_plugins_post_install_hooks 方法
         install_hooks_method = instance_method(:run_plugins_post_install_hooks)
         define_method(:run_plugins_post_install_hooks) do
-            puts "[HY].run_plugins_post_install_hooks 触发 state:#{Pod::is_prebuild_stage}"
             install_hooks_method.bind(self).()
             if Pod::is_prebuild_stage
                 #开始编译

data/lib/cocoapods-xlbuild/Reference/reference_source_code.rb

@@ -13,10 +13,6 @@ module Pod
 
 	    		exsited_framework_pod_names = pre_sandbox.exsited_framework_pod_names || []
 	    		proj_path = sandbox_path + get_project_name("Pods")
-
-					proj_path_new = Pathname.new(sandbox.project_path)
-
-					puts "[HY].沙盒路径：#{sandbox_path}"
 	    		project = Xcodeproj::Project.open(proj_path)
     			exsited_framework_pod_names.each do |target_name|
 	    			real_reference("_Prebuild/#{target_name}", project, target_name)
@@ -24,7 +20,46 @@ module Pod
 	    		project.save;
 	    	end
 
-	    	private
+
+				# 动态库dsym问题[CP] Copy dSYM
+				def adjust_dynamic_framework_dsym
+					sandbox_path = Pathname.new(sandbox.root).to_s
+					pre_sandbox = Pod::PrebuildSandbox.from_standard_sandbox(sandbox)
+					exsited_framework_pod_names = pre_sandbox.exsited_framework_pod_names || []
+
+					exsited_framework_pod_names.each do |target_name|
+						input_xcfilelist = sandbox_path + "/Target Support Files/" + target_name + "/#{target_name}-copy-dsyms-input-files.xcfilelist"
+						output_xcfilelist = sandbox_path + "/Target Support Files/" + target_name + "/#{target_name}-copy-dsyms-output-files.xcfilelist"
+						remove_duplicated_bcsymbolmap_lines(input_xcfilelist)
+						remove_duplicated_bcsymbolmap_lines(output_xcfilelist)
+					end
+				end
+
+				#https://github.com/CocoaPods/CocoaPods/issues/10373
+				def remove_duplicated_bcsymbolmap_lines(path)
+					if File.exist?path
+						top_lines = []
+						bcsymbolmap_lines = []
+						for line in File.readlines(path).map { |line| line.strip }
+							if line.include? ".bcsymbolmap"
+								bcsymbolmap_lines.append(line)
+							else
+								#去重
+								if not top_lines.include?line
+									top_lines.append(line)
+								end
+							end
+						end
+
+						final_lines = top_lines + bcsymbolmap_lines.uniq
+						File.open(path, "w+") do |f|
+							f.puts(final_lines)
+						end
+					end
+				end
+
+
+				private
 	    	def get_project_name(tageter_name)
 	    		return "#{tageter_name}.xcodeproj"
 	    	end

data/lib/cocoapods-xlbuild/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsXLbuild
-  VERSION = "1.0.0"
+  VERSION = "1.1.1"
 end

data/lib/cocoapods-xlbuild/helper/prebuild_sandbox.rb

@@ -12,9 +12,7 @@ module Pod
                     tn = "Pods-#{target.name}"
                     dir = Pathname.new(File.join(installer_context.sandbox.root,"Target Support Files", tn))
                     sh_path = File.join(dir, "#{tn}-resources.sh")
-                    puts "[HY].sh_path #{sh_path}"
                     if File.exists?(sh_path)
-                        puts "[HY].resource.sh存在"
                         list.each do |tarname|
                             replace_content_file sh_path, tarname
                         end

data/lib/cocoapods-xlbuild/rome/build_framework.rb

@@ -23,8 +23,7 @@ def build_for_iosish_platform(sandbox,
   deployment_target = target.platform.deployment_target.to_s
   
   target_label = target.label # name with platform if it's used in multiple platforms
-  #linpeng edit
-  Pod::UI.puts "[HY].Prebuilding #{target_label} -> #{target.version}"
+  Pod::UI.puts "[XL].Prebuilding #{target_label} -> #{target.version}"
   
   other_options = []
   # bitcode enabled
@@ -95,11 +94,13 @@ def build_for_iosish_platform(sandbox,
       FileUtils.mv tmp_lipoed_binary_path, "#{device_framework_path}.dSYM/Contents/Resources/DWARF/#{module_name}", :force => true
     end
     # move
+    # linpeng edit:xxxx.framework.DSYM文件挪到GenerateFramework的xxx目录下
     FileUtils.mv device_dsym, output_path, :force => true
   end
 
   # output
   output_path.mkpath unless output_path.exist?
+  #linpeng edit: 将build文件夹的xxxx.framework移动到GenerateFramework的xxxx目录下
   FileUtils.mv device_framework_path, output_path, :force => true
   # 如果是静态库则需要手动处理资源文件
   if Pod::Podfile::DSL.static_binary

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-xlbuild
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - 林鹏
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-05 00:00:00.000000000 Z
+date: 2022-05-28 00:00:00.000000000 Z
 dependencies: []
 description: 工程静态库编译，提高编译速度.
 email: