cocoapods-ppbuild 0.0.1 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 560423786a1c2f0fff91e7d25ee783420a6f18d4115c8c551427f9960a7fd4ae
-  data.tar.gz: 2b3c92a07bd963e42bcb5fd5b220c2d8f2fa26ed7152d813a7af0e110a81ac8e
+  metadata.gz: c5573fd6b439b3b7f14cd3af40775271c6adb2df5d2694ea06a052b765e7bca7
+  data.tar.gz: 34ff8d8e4212d82b442b950191569c232b4abbcc4e2767520d579c9be8ba940c
 SHA512:
-  metadata.gz: b8cec8ef3b7783945f203ad4ad499ac88b7321d41e8b04112fe2a8d2feda60e3e6a5ad579c49ac58a84ba946394ff6f5db4b33502638de3a69db0ebb57170639
-  data.tar.gz: e284d38c0a277e4d6002a6c513d7eba496aa086883624733766990dbc043dc162f8d104a5204e50aff788e907e1afdaf865c1e4a104447f14993aef00ed710cf
+  metadata.gz: 16dc03357ff651e30773a1b12a2c166e0c30316f85662265ed553eb483302a6fec5f48fc3a75eaf23958db718c1b6a1259cca9285f90bddbaf1ab197a69b699b
+  data.tar.gz: 3bd1ae9b7287f11c96eea8969c23e07125d8d820ad7cd147973920bf39c3a466b4a612c07fd67f2a08c4db88cf19ed84da36262ac70cf84a4548435000d8f546

data/lib/cocoapods-ppbuild/Integration.rb

@@ -62,6 +62,7 @@ module Pod
                 
                 target_names.each do |name|
 
+                    Pod::UI.puts "...........   oname: #{name}"
                     # symbol link copy all substructure
                     real_file_folder = prebuild_sandbox.framework_folder_path_for_target_name(name)
                     
@@ -79,6 +80,7 @@ module Pod
 
                     walk(real_file_folder) do |child|
                         source = child
+
                         # only make symlink to file and `.framework` folder
                         if child.directory?
                             if [".framework"].include? child.extname
@@ -87,6 +89,9 @@ module Pod
                             elsif [".dSYM"].include? child.extname
                                 mirror_with_symlink(source, real_file_folder, target_folder, false)
                                 next false  # return false means don't go deeper
+                            elsif [".bundle"].include? child.extname
+                                mirror_with_symlink(source, real_file_folder, target_folder, false)
+                                next false
                             else
                                 next true
                             end
@@ -105,6 +110,9 @@ module Pod
                     if path_objects != nil
                         path_objects.each do |object|
                             if object.real_file_path != nil
+                                real_path = Pathname.new(object.target_file_path)
+                                real_path.rmtree if real_path.exist?
+                                Pod::UI.puts "...........   object.target_file_path: #{object.target_file_path}"
                                 make_link(object.real_file_path, object.target_file_path, false)
                             end
                         end
@@ -129,15 +137,13 @@ module Pod
         # Remove the old target files if prebuild frameworks changed
         def remove_target_files_if_needed
 
-            changes = Pod::Prebuild::Passer.prebuild_pods_changes
+            changes = Pod::Prebuild::Passer.prebuild_pod_targets_changes
             updated_names = []
             if changes == nil
                 updated_names = PrebuildSandbox.from_standard_sandbox(self.sandbox).exsited_framework_pod_names
             else
-                added = changes.added
-                changed = changes.changed 
-                deleted = changes.deleted 
-                updated_names = added + changed + deleted
+                t_names = changes.map { |e| e.pod_name }
+                updated_names = (updated_names + t_names).uniq
             end
 
             updated_names.each do |name|
@@ -158,7 +164,6 @@ module Pod
         # Modify specification to use only the prebuild framework after analyzing
         old_method2 = instance_method(:resolve_dependencies)
         define_method(:resolve_dependencies) do
-
             # Remove the old target files, else it will not notice file changes
             self.remove_target_files_if_needed
 

data/lib/cocoapods-ppbuild/Main.rb

@@ -11,6 +11,7 @@ module Pod
             def use_dynamic_binary!
                 DSL.prebuild_all = true
                 DSL.static_binary = false
+                DSL.dont_remove_source_code = true
             end
             # 设置当前swift版本
             def use_swift_version(version)
@@ -21,6 +22,12 @@ module Pod
             def use_static_binary!
                 DSL.prebuild_all = true
                 DSL.static_binary = true
+                DSL.dont_remove_source_code = true
+            end
+
+            # 设置是否保存源码，默认 true
+            def remove_source_code_for_prebuilt_frameworks!
+                DSL.dont_remove_source_code = false
             end
 
             # Enable bitcode for prebuilt frameworks

data/lib/cocoapods-ppbuild/Prebuild.rb

@@ -62,7 +62,43 @@ module Pod
                 UI.puts "Using #{name}"
             end
         end
+        
+        def save_change_targets!
+            sandbox_path = sandbox.root
+            existed_framework_folder = sandbox.generate_framework_path
+            
+            if local_manifest != nil
+                changes = prebuild_pods_changes
+                added = changes.added
+                changed = changes.changed 
+                unchanged = changes.unchanged
+                deleted = changes.deleted.to_a
     
+                existed_framework_folder.mkdir unless existed_framework_folder.exist?
+                exsited_framework_pod_names = sandbox.exsited_framework_pod_names
+    
+                # additions
+                missing = unchanged.select do |pod_name|
+                    not exsited_framework_pod_names.include?(pod_name)
+                end
+
+                # 保存有改变的target列表
+                root_names_to_update = (added + changed + missing).uniq
+                updates_target_names = (root_names_to_update + deleted).uniq
+                cache = []
+                updates_targets = []
+                updates_target_names.each do |pod_name|
+                    tars = Pod.fast_get_targets_for_pod_name(pod_name, self.pod_targets, cache)
+                    if tars.nil? || tars.empty?
+                        Pod::UI.puts "There's no target named (#{pod_name}) in Pod.xcodeproj." if t.nil?
+                    else
+                        updates_targets = (updates_targets + tars).uniq
+                    end 
+                end
+                updates_dependency_targets = updates_targets.map {|t| t.recursive_dependent_targets }.flatten.uniq || []
+                Pod::Prebuild::Passer.prebuild_pod_targets_changes = (updates_targets + updates_dependency_targets).uniq
+            end
+        end
 
         # Build the needed framework files
         def prebuild_frameworks! 
@@ -87,11 +123,8 @@ module Pod
                 missing = unchanged.select do |pod_name|
                     not exsited_framework_pod_names.include?(pod_name)
                 end
-
-
-                root_names_to_update = (added + changed + missing)
-
-                # transform names to targets
+                root_names_to_update = (added + changed + missing).uniq
+                # 生成预编译target
                 cache = []
                 targets = root_names_to_update.map do |pod_name|
                     tars = Pod.fast_get_targets_for_pod_name(pod_name, self.pod_targets, cache)
@@ -101,8 +134,11 @@ module Pod
                     tars
                 end.flatten
 
-                # add the dendencies
+                # 添加依赖
                 dependency_targets = targets.map {|t| t.recursive_dependent_targets }.flatten.uniq || []
+                dependency_targets = dependency_targets.select do |tar|
+                    sandbox.existed_target_version_for_pod_name(tar.pod_name) != tar.version
+                end
                 targets = (targets + dependency_targets).uniq
             else
                 targets = self.pod_targets
@@ -135,24 +171,27 @@ module Pod
                         else
                             # resource_paths is Hash{String=>Array<String>} on 1.6 and above
                             # (use AFNetworking to generate a demo data)
+                            # https://github.com/leavez/cocoapods-binary/issues/50
                             target.resource_paths.values.flatten
                         end
                     end
                     raise "Wrong type: #{resources}" unless resources.kind_of? Array
-
-                    path_objects = resources.flat_map do |path|
-                        real_path = framework_path + File.basename(path)
+                    path_objects = resources.map do |path|
+                        object = Prebuild::Passer::ResourcePath.new
+                        object.real_file_path = framework_path + File.basename(path)
                         # 静态库资源目录处理
                         if use_static_framework
-                            real_bundle_path = sandbox.real_bundle_path_for_pod(path)
-                            if File.exists?(real_bundle_path)
-                                FileUtils.cp_r(real_bundle_path, framework_path, :remove_destination => true)
+                            object.real_file_path = path.gsub('${PODS_ROOT}', existed_framework_folder.to_s) if path.start_with? '${PODS_ROOT}'
+                            object.real_file_path = path.gsub("${PODS_CONFIGURATION_BUILD_DIR}", existed_framework_folder.to_s) if path.start_with? "${PODS_CONFIGURATION_BUILD_DIR}"
+                            real_bundle_path = path.gsub('${PODS_ROOT}', sandbox_path.to_s) if path.start_with? '${PODS_ROOT}'
+                            real_bundle_path = path.gsub('${PODS_CONFIGURATION_BUILD_DIR}', sandbox_path.to_s) if path.start_with? '${PODS_CONFIGURATION_BUILD_DIR}'
+                            real_origin_path = Pathname.new(real_bundle_path)
+                            real_file_path_obj = Pathname.new(object.real_file_path)
+                            if real_origin_path.exist?
+                                real_file_path_obj.parent.mkpath unless real_file_path_obj.parent.exist?
+                                FileUtils.cp_r(real_origin_path, real_file_path_obj, :remove_destination => true)
                             end
                         end
-                        object = Prebuild::Passer::ResourcePath.new
-                        if File.exists?(real_path)
-                            object.real_file_path = real_path
-                        end
                         object.target_file_path = path.gsub('${PODS_ROOT}', standard_sandbox_path.to_s) if path.start_with? '${PODS_ROOT}'
                         object.target_file_path = path.gsub("${PODS_CONFIGURATION_BUILD_DIR}", standard_sandbox_path.to_s) if path.start_with? "${PODS_CONFIGURATION_BUILD_DIR}"
                         object
@@ -225,12 +264,13 @@ module Pod
         # patch the post install hook
         old_method2 = instance_method(:run_plugins_post_install_hooks)
         define_method(:run_plugins_post_install_hooks) do 
+            if Pod::is_prebuild_stage
+                self.save_change_targets!
+            end
             old_method2.bind(self).()
             if Pod::is_prebuild_stage
                 self.prebuild_frameworks!
             end
         end
-
-
     end
 end

data/lib/cocoapods-ppbuild/command/ppbuild.rb

@@ -1,215 +1,43 @@
 module Pod
   class Command
+    # This is an example of a cocoapods plugin adding a top-level subcommand
+    # to the 'pod' command.
+    #
+    # You can also create subcommands of existing or new commands. Say you
+    # wanted to add a subcommand to `list` to show newly deprecated pods,
+    # (e.g. `pod list deprecated`), there are a few things that would need
+    # to change.
+    #
+    # - move this file to `lib/pod/command/list/deprecated.rb` and update
+    #   the class to exist in the the Pod::Command::List namespace
+    # - change this class to extend from `List` instead of `Command`. This
+    #   tells the plugin system that it is a subcommand of `list`.
+    # - edit `lib/cocoapods_plugins.rb` to require this file
+    #
+    # @todo Create a PR to add your plugin to CocoaPods/cocoapods.org
+    #       in the `plugins.json` file, once your plugin is released.
     #
     class Ppbuild < Command
-      self.summary = '通过将二进制对应源码放置在临时目录中，让二进制出现断点时可以跳到对应的源码，方便调试。'
+      self.summary = 'Short description of cocoapods-Ppbuild.'
 
       self.description = <<-DESC
-          通过将二进制对应源码放置在临时目录中，让二进制出现断点时可以跳到对应的源码，方便调试。
-          在不删除二进制的情况下为某个组件添加源码调试能力，多个组件名称用空格分隔
+        Longer description of cocoapods-Ppbuild.
       DESC
 
-      self.arguments = [
-          CLAide::Argument.new('NAME', false)
-      ]
-      def self.options
-        [
-            ['--all-clean', '删除所有已经下载的源码'],
-            ['--clean', '删除所有指定下载的源码'],
-            ['--list', '展示所有一级下载的源码以及其大小'],
-            ['--source', '源码路径，本地路径,会去自动链接本地源码']
-        ]
-      end
+      # self.arguments = 'NAME'
 
       def initialize(argv)
-        @codeSource =  argv.option('source') || nil
-        @names = argv.arguments! unless argv.arguments.empty?
-        @list = argv.flag?('list', false )
-        @all_clean = argv.flag?('all-clean', false )
-        @clean = argv.flag?('clean', false )
-        @config = Pod::Config.instance
-        @analyzer = nil
-        @podfile_dependency_cache = Pod::Installer::Analyzer::PodfileDependencyCache.from_podfile(@config.podfile)
+        @name = argv.shift_argument
         super
       end
 
-
-      def run
-        podfile_lock = File.join(Pathname.pwd,"Podfile.lock")
-        raise "podfile.lock,不存在，请先pod install/update" unless File.exist?(podfile_lock)
-        @lockfile ||= Lockfile.from_file(Pathname.new(podfile_lock) )
-
-        if @list
-          list
-        elsif @clean
-          clean
-        elsif @all_clean
-          all_clean
-        elsif @names
-          add
-        end
-
-        if @list && @clean && @names
-          raise "请选择您要执行的命令。"
-        end
-      end
-
-      #==========================begin add ==============
-
-      def add
-        if @names == nil
-          raise "请输入要调试组件名，多个组件名称用空格分隔"
-        end
-        @names.each do  |name|
-          lib_file = get_lib_path(name)
-          unless File.exist?(lib_file)
-            raise "找不到 #{lib_file}"
-          end
-          UI.puts "#{lib_file}"
-
-          target_path =  @codeSource || download_source(name)
-
-          link(lib_file,target_path,name)
-        end
-      end
-
-      #下载源码到本地
-      def download_source(name)
-        target_path =  File.join(source_root, name)
-        UI.puts target_path
-        FileUtils.rm_rf(target_path)
-        find_dependency = find_dependency(name)
-        spec = fetch_external_source(find_dependency, @config.podfile,@config.lockfile, @config.sandbox,true )
-
-        download_request = Pod::Downloader::Request.new(:name => name, :spec => spec)
-        Downloader.download(download_request, Pathname.new(target_path), :can_cache => true)
-
-        target_path
-      end
-
-      #找出依赖
-      def find_dependency (name)
-        find_dependency = nil
-
-          @config.podfile.dependencies.each do |dependency|
-            if dependency.root_name.downcase == name.downcase
-              find_dependency = dependency
-              break
-            end
-          end
-          if find_dependency.external_source.nil?
-            
-          end
-          find_dependency
-      end
-
-      # 获取external_source 下的仓库
-      # @return spec
-      def fetch_external_source(dependency ,podfile , lockfile, sandbox,use_lockfile_options)
-        checkout_options = lockfile.checkout_options_for_pod_named(dependency.root_name)
-        source = if use_lockfile_options && lockfile && checkout_options
-                   ExternalSources.from_params(checkout_options, dependency, podfile.defined_in_file, podfile.installation_options.clean?)
-                 else
-                   ExternalSources.from_dependency(dependency, podfile.defined_in_file, podfile.installation_options.clean?)
-                 end
-        source.fetch(sandbox)
-      end
-
-
-      #==========================link begin ==============
-
-      #链接，.a文件位置， 源码目录
-      def link(lib_file,target_path,basename)
-        check(lib_file,dir,basename)
-      end
-
-      def check(lib_file,dir,basename)
-        file = `dwarfdump "#{lib_file}" | grep -E "DW_AT_decl_file.*#{basename}.*\\.m|\\.c" | head -1 | cut -d \\" -f2`
-        if File.exist?(file)
-          raise "#{file} 不存在 请检测代码源是否正确~"
-        end
-        UI.puts "link successfully!"
-        UI.puts "view linked source at path: #{dir}"
-      end
-
-      def get_lib_path(name)
-        dir = Pathname.new(File.join(Pathname.pwd,"Pods",name))
-        dir = get_framework_path(dir, name)
-        if !Dir.exist?(dir)
-          raise "找不到组件：#{name}, 请输入正确名称！！ 者将组件名在git上提issues"
-        end
-        lib_path = File.join(dir, name)
-        lib_path
-      end
-
-      def get_framework_path(basepath, name)
-        dir = Pathname.new(File.join(basepath, "#{name}.framework"))
-        if !Dir.exist?(dir)
-          dir = dir.children.first
-          if Dir.exist?(dir)
-            return get_framework_path(dir, name)
-          end
-        end
-        return dir
-      end
-
-
-      #源码地址
-      # def get_gitlib_iOS_path(name)
-      #   "git@gitlab.xxx.com:iOS/#{name}.git"
-      # end
-      #要转换的地址，Github-iOS默认都是静态库
-      # def git_gitlib_iOS_path
-      #   'git@gitlab.xxx.com:Github-iOS/'
-      # end
-
-
-      #要转换的地址，Github-iOS默认都是静态库
-      # def http_gitlib_GitHub_iOS_path
-      #   'https://gitlab.xxx.com/Github-iOS/'
-      # end
-
-      #要转换的地址，iOS默认都是静态库
-      # def http_gitlib_iOS_path
-      #   'https://gitlab.xxx.com/iOS/'
-      # end
-
-      #==========================list begin ==============
-
-      def list
-        Dir.entries(source_root).each do |sub|
-          UI.puts "- #{sub}" unless sub.include?('.')
-        end
-        UI.puts "加载完成"
-      end
-
-
-      #==========================clean begin ==============
-      def all_clean
-        FileUtils.rm_rf(source_root) if File.directory?(source_root)
-        UI.puts "清理完成 #{source_root}"
-      end
-
-      def clean
-        raise "请输入要删除的组件库" if @names.nil?
-        @names.each do  |name|
-          full_path = File.join(source_root,name)
-          if File.directory?(full_path)
-            FileUtils.rm_rf(full_path)
-          else
-            UI.puts "找不到 #{full_path}".yellow
-          end
-        end
-        UI.puts "清理完成 #{@names.to_s}"
+      def validate!
+        super
+        help! 'A Pod name is required.' unless @name
       end
 
-      private
-
-      def source_root
-        dir = File.join(@config.cache_root,"Source")
-        FileUtils.mkdir_p(dir) unless File.exist? dir
-        UI.puts "缓存目录 #{dir}"
-        dir
+      def run
+        UI.puts "Add your implementation for the cocoapods-Ppbuild plugin in #{__FILE__}"
       end
     end
   end

data/lib/cocoapods-ppbuild/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsPpbuild
-  VERSION = "0.0.1"
+  VERSION = "0.0.5"
 end

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

@@ -14,7 +14,7 @@ module Pod
             # @return [Analyzer::SpecsState] 
             #
             class_attr_accessor :prebuild_pods_changes
-
+            class_attr_accessor :prebuild_pod_targets_changes
 
             # represent the path of resurces to copy
             class ResourcePath

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

@@ -77,9 +77,10 @@ module Pod
 
                 # filter prebuild
                 prebuild_names = target_definition.prebuild_framework_pod_names
-                if not Podfile::DSL.prebuild_all
-                    targets = targets.select { |pod_target| prebuild_names.include?(pod_target.pod_name) } 
-                end
+                # if not Podfile::DSL.prebuild_all
+                #     targets = targets.select { |pod_target| prebuild_names.include?(pod_target.pod_name) } 
+                # end
+                targets = targets.select { |pod_target| prebuild_names.include?(pod_target.pod_name) } 
                 dependency_targets = targets.map {|t| t.recursive_dependent_targets }.flatten.uniq || []
                 targets = (targets + dependency_targets).uniq
 

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

@@ -67,13 +67,21 @@ module Pod
             exsited_framework_name_pairs.select {|pair| pair[1] == pod_name }.map { |pair| pair[0]}
         end
 
-
+        def existed_target_version_for_pod_name(pod_name)
+            folder = framework_folder_path_for_target_name(pod_name)
+            return "" unless folder.exist?
+            flag_file_path = folder + "#{pod_name}.pod_name"
+            return "" unless flag_file_path.exist?
+            version = File.read(flag_file_path)
+            Pod::UI.puts "............  version: #{version}"
+            version
+        end
 
         def save_pod_name_for_target(target)
             folder = framework_folder_path_for_target_name(target.name)
             return unless folder.exist?
             flag_file_path = folder + "#{target.pod_name}.pod_name"
-            File.write(flag_file_path.to_s, "")
+            File.write(flag_file_path.to_s, "#{target.version}")
         end
 
         def real_bundle_path_for_pod(path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-ppbuild
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.5
 platform: ruby
 authors:
 - 彭懂
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-18 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,7 +38,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A short description of cocoapods-ppbuild.
+description: 工程静态库编译，提高编译速度.
 email:
 - pengdong2014@xiaochuankeji.cn
 executables: []
@@ -61,7 +61,7 @@ files:
 - lib/cocoapods-ppbuild/rome/build_framework.rb
 - lib/cocoapods-ppbuild/tool/tool.rb
 - lib/cocoapods_plugin.rb
-homepage: https://github.com/EXAMPLE/cocoapods-ppbuild
+homepage: https://github.com/pdcodeunder/cocoapods-ppbuild.git
 licenses:
 - MIT
 metadata: {}
@@ -83,5 +83,5 @@ requirements: []
 rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
-summary: A longer description of cocoapods-ppbuild.
+summary: 工程静态库编译，提高编译速度.
 test_files: []