cocoapods-ppbuild 0.0.4 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a60801b88a3a65f9772965dbb9f3902abb9359af6d13f22417f14b7e8473843
-  data.tar.gz: cccc9a3f322b92e85832435a7b3deae1a79afc36d5651c9bdc48e174bd3453fc
+  metadata.gz: 5814aba56288624bef19f4bf6bbeb81ce9b588f649602c530d8de4f88ff4bdfa
+  data.tar.gz: 56020bd0dde6cade57650ec2c892ea2221408ed5b6c7a49e2a71e81cd94addba
 SHA512:
-  metadata.gz: ed89338e7ec4b7a6695b2679c6ebe092550c51ad89b9c56b8b99bdfe6638f510ae58feb3528f8ff14c0ea5c02c3a3a559d746e9108f0b0eab1020f96a91c7e57
-  data.tar.gz: 3722e1443ad0cdf5e0aebf029c3fd1cdd4cac946e5d8f17dc81fdbac16af96deef2f02ff9f067a1f5cd87e4140e76e8a7b0dedc5ed24ccded17b191b0481343c
+  metadata.gz: 860d510a8fb04429890d099d88fd953ff5d2c0b7b3c2991245bbe211da8efb4601a302c6174178d491d7fc60dc595139b6d5a198b1aab35e566e9aa4dad66294
+  data.tar.gz: ae896e12c09e34ec9cded032c303c14c9b383b9401e0c293cae9f082fbbe3f04f5720b71f267b1d46950496d30922afe320a5e9af808f22ea8a010cdd0ef3df0

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
 
@@ -61,7 +64,6 @@ module Pod
                 end
                 
                 target_names.each do |name|
-
                     # symbol link copy all substructure
                     real_file_folder = prebuild_sandbox.framework_folder_path_for_target_name(name)
                     
@@ -75,8 +77,7 @@ module Pod
                     end
                     target_folder.rmtree if target_folder.exist?
                     target_folder.mkpath
-
-
+                    
                     walk(real_file_folder) do |child|
                         source = child
 
@@ -135,15 +136,18 @@ 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_changes = Pod::Prebuild::Passer.prebuild_pods_changes
+                added = t_changes.added
+                changed = t_changes.changed 
+                deleted = t_changes.deleted 
+                updated_names = (added + changed + deleted).to_a
+
+                updated_names = (changes + updated_names).uniq
             end
 
             updated_names.each do |name|
@@ -160,88 +164,138 @@ module Pod
 
         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 = []
+                    end
+                    updates_targets = (updates_targets + tars).uniq 
+                end
+                updates_dependency_targets = updates_targets.map {|t| 
+                    t.recursive_dependent_targets 
+                }.flatten.uniq || []
+                dependency_names = updates_dependency_targets.map { |e| e.pod_name }
+                if Pod::Prebuild::Passer.prebuild_pod_targets_changes.nil?
+                    Pod::Prebuild::Passer.prebuild_pod_targets_changes = (updates_target_names + dependency_names).uniq
+                else
+                    Pod::Prebuild::Passer.prebuild_pod_targets_changes = (Pod::Prebuild::Passer.prebuild_pod_targets_changes + updates_target_names + dependency_names).uniq
+                end
+            end
+        end
 
         # Modify specification to use only the prebuild framework after analyzing
         old_method2 = instance_method(:resolve_dependencies)
         define_method(:resolve_dependencies) do
+            if Pod::is_prebuild_stage
+                # call original
+                old_method2.bind(self).()
+                self.save_change_targets!
+            else
+                # Remove the old target files, else it will not notice file changes
+                self.remove_target_files_if_needed
+                # call original
+                old_method2.bind(self).()
+                 # ...
+                # ...
+                # ...
+                # after finishing the very complex orginal function
+
+                # check the pods
+                # Although we have did it in prebuild stage, it's not sufficient.
+                # Same pod may appear in another target in form of source code.
+                # Prebuild.check_one_pod_should_have_only_one_target(self.prebuild_pod_targets)
+                self.validate_every_pod_only_have_one_form
+
+                
+                # prepare
+                cache = []
 
-            # Remove the old target files, else it will not notice file changes
-            self.remove_target_files_if_needed
-
-            # call original
-            old_method2.bind(self).()
-            # ...
-            # ...
-            # ...
-            # after finishing the very complex orginal function
-
-            # check the pods
-            # Although we have did it in prebuild stage, it's not sufficient.
-            # Same pod may appear in another target in form of source code.
-            # Prebuild.check_one_pod_should_have_only_one_target(self.prebuild_pod_targets)
-            self.validate_every_pod_only_have_one_form
-
-            
-            # prepare
-            cache = []
-
-            def add_vendered_framework(spec, platform, added_framework_file_path)
-                if spec.attributes_hash[platform] == nil
-                    spec.attributes_hash[platform] = {}
+                def add_vendered_framework(spec, platform, added_framework_file_path)
+                    if spec.attributes_hash[platform] == nil
+                        spec.attributes_hash[platform] = {}
+                    end
+                    vendored_frameworks = spec.attributes_hash[platform]["vendored_frameworks"] || []
+                    vendored_frameworks = [vendored_frameworks] if vendored_frameworks.kind_of?(String)
+                    vendored_frameworks += [added_framework_file_path]
+                    spec.attributes_hash[platform]["vendored_frameworks"] = vendored_frameworks
                 end
-                vendored_frameworks = spec.attributes_hash[platform]["vendored_frameworks"] || []
-                vendored_frameworks = [vendored_frameworks] if vendored_frameworks.kind_of?(String)
-                vendored_frameworks += [added_framework_file_path]
-                spec.attributes_hash[platform]["vendored_frameworks"] = vendored_frameworks
-            end
-            def empty_source_files(spec)
-                spec.attributes_hash["source_files"] = []
-                ["ios", "watchos", "tvos", "osx"].each do |plat|
-                    if spec.attributes_hash[plat] != nil
-                        spec.attributes_hash[plat]["source_files"] = []
+                def empty_source_files(spec)
+                    spec.attributes_hash["source_files"] = []
+                    ["ios", "watchos", "tvos", "osx"].each do |plat|
+                        if spec.attributes_hash[plat] != nil
+                            spec.attributes_hash[plat]["source_files"] = []
+                        end
                     end
                 end
-            end
 
 
-            specs = self.analysis_result.specifications
-            prebuilt_specs = (specs.select do |spec|
-                self.prebuild_pod_names.include? spec.root.name
-            end)
+                specs = self.analysis_result.specifications
+                prebuilt_specs = (specs.select do |spec|
+                    self.prebuild_pod_names.include? spec.root.name
+                end)
 
-            prebuilt_specs.each do |spec|
+                prebuilt_specs.each do |spec|
 
-                # Use the prebuild framworks as vendered frameworks
-                # get_corresponding_targets
-                targets = Pod.fast_get_targets_for_pod_name(spec.root.name, self.pod_targets, cache)
-                targets.each do |target|
-                    # the framework_file_path rule is decided when `install_for_prebuild`,
-                    # as to compitable with older version and be less wordy.
-                    framework_file_path = target.framework_name
-                    framework_file_path = target.name + "/" + framework_file_path if targets.count > 1
-                    add_vendered_framework(spec, target.platform.name.to_s, framework_file_path)
-                end
-                # Clean the source files
-                # we just add the prebuilt framework to specific platform and set no source files 
-                # for all platform, so it doesn't support the sence that 'a pod perbuild for one
-                # platform and not for another platform.'
-                empty_source_files(spec)
-
-                # to remove the resurce bundle target. 
-                # When specify the "resource_bundles" in podspec, xcode will generate a bundle 
-                # 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"}
-                end
+                    # Use the prebuild framworks as vendered frameworks
+                    # get_corresponding_targets
+                    targets = Pod.fast_get_targets_for_pod_name(spec.root.name, self.pod_targets, cache)
+                    targets.each do |target|
+                        # the framework_file_path rule is decided when `install_for_prebuild`,
+                        # as to compitable with older version and be less wordy.
+                        framework_file_path = target.framework_name
+                        framework_file_path = target.name + "/" + framework_file_path if targets.count > 1
+                        add_vendered_framework(spec, target.platform.name.to_s, framework_file_path)
+                    end
+                    # Clean the source files
+                    # we just add the prebuilt framework to specific platform and set no source files 
+                    # for all platform, so it doesn't support the sence that 'a pod perbuild for one
+                    # platform and not for another platform.'
+                    empty_source_files(spec)
+
+                    # to remove the resurce bundle target. 
+                    # When specify the "resource_bundles" in podspec, xcode will generate a bundle 
+                    # 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']["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
-                spec.attributes_hash["license"] = {}
+                    # to avoid the warning of missing license
+                    spec.attributes_hash["license"] = {}
 
+                end
             end
 
         end
@@ -250,23 +304,25 @@ module Pod
         # Override the download step to skip download and prepare file in target folder
         old_method = instance_method(:install_source_of_pod)
         define_method(:install_source_of_pod) do |pod_name|
-
-            # copy from original
-            pod_installer = create_pod_installer(pod_name)
-            # \copy from original
-
-            if self.prebuild_pod_names.include? pod_name
-                pod_installer.install_for_prebuild!(self.sandbox)
+            if Pod::is_prebuild_stage
+                tmp = old_method.bind(self).(pod_name)
             else
-                pod_installer.install!
-            end
+                # copy from original
+                pod_installer = create_pod_installer(pod_name)
+                # \copy from original
+
+                if self.prebuild_pod_names.include? pod_name
+                    pod_installer.install_for_prebuild!(self.sandbox)
+                else
+                    pod_installer.install!
+                end
 
-            # copy from original
-            @installed_specs.concat(pod_installer.specs_by_platform.values.flatten.uniq)
-            # \copy from original
+                # copy from original
+                return @installed_specs.concat(pod_installer.specs_by_platform.values.flatten.uniq)
+                # \copy from original
+            end
         end
 
-
     end
 end
 
@@ -279,33 +335,34 @@ end
 module Pod
     module Generator
         class EmbedFrameworksScript
-
             old_method = instance_method(:script)
             define_method(:script) do
-
                 script = old_method.bind(self).()
-                patch = <<-SH.strip_heredoc
-                    #!/bin/sh
-                
-                    # ---- this is added by cocoapods-ppbuild ---
-                    # Readlink cannot handle relative symlink well, so we override it to a new one
-                    # If the path isn't an absolute path, we add a realtive prefix.
-                    old_read_link=`which readlink`
-                    readlink () {
-                        path=`$old_read_link "$1"`;
-                        if [ $(echo "$path" | cut -c 1-1) = '/' ]; then
-                            echo $path;
-                        else
-                            echo "`dirname $1`/$path";
-                        fi
-                    }
-                    # --- 
-                SH
-
-                # patch the rsync for copy dSYM symlink
-                script = script.gsub "rsync --delete", "rsync --copy-links --delete"
-                
-                patch + script
+                if not Pod::is_prebuild_stage
+                    patch = <<-SH.strip_heredoc
+                        #!/bin/sh
+                    
+                        # ---- this is added by cocoapods-ppbuild ---
+                        # Readlink cannot handle relative symlink well, so we override it to a new one
+                        # If the path isn't an absolute path, we add a realtive prefix.
+                        old_read_link=`which readlink`
+                        readlink () {
+                            path=`$old_read_link "$1"`;
+                            if [ $(echo "$path" | cut -c 1-1) = '/' ]; then
+                                echo $path;
+                            else
+                                echo "`dirname $1`/$path";
+                            fi
+                        }
+                        # --- 
+                    SH
+
+                    # patch the rsync for copy dSYM symlink
+                    script = script.gsub "rsync --delete", "rsync --copy-links --delete"
+                    
+                    script = patch + script
+                end
+                script
             end
         end
     end

data/lib/cocoapods-ppbuild/Main.rb

@@ -25,6 +25,7 @@ module Pod
                 DSL.dont_remove_source_code = true
             end
 
+            # 设置是否保存源码，默认 true
             def remove_source_code_for_prebuilt_frameworks!
                 DSL.dont_remove_source_code = false
             end
@@ -115,7 +116,7 @@ Pod::HooksManager.register('cocoapods-ppbuild', :pre_install) do |installer_cont
     require_relative 'helper/prebuild_sandbox'
     require_relative 'Prebuild'
     
-    Pod::UI.puts "火速编译中..."
+    # Pod::UI.puts "火速编译中..."
     
     # Fetch original installer (which is running this pre-install hook) options,
     # then pass them to our installer to perform update if needed
@@ -147,7 +148,8 @@ Pod::HooksManager.register('cocoapods-ppbuild', :pre_install) do |installer_cont
     # install
     lockfile = installer_context.lockfile
     binary_installer = Pod::Installer.new(prebuild_sandbox, prebuild_podfile, lockfile)
-    
+
+    require_relative 'Integration'
     if binary_installer.have_exact_prebuild_cache? && !update
         binary_installer.install_when_cache_hit!
     else
@@ -169,7 +171,6 @@ Pod::HooksManager.register('cocoapods-ppbuild', :pre_install) do |installer_cont
     # install
     Pod::UI.puts "\n"
     Pod::UI.puts "🤖  Pod Install"
-    require_relative 'Integration'
     # go on the normal install step ...
 end
 

data/lib/cocoapods-ppbuild/Prebuild.rb

@@ -62,7 +62,6 @@ module Pod
                 UI.puts "Using #{name}"
             end
         end
-    
 
         # Build the needed framework files
         def prebuild_frameworks! 
@@ -87,22 +86,22 @@ 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)
-                    if tars.nil? || tars.empty?
-                        raise "There's no target named (#{pod_name}) in Pod.xcodeproj.\n #{self.pod_targets.map(&:name)}" if t.nil?
+                    if tars.nil?
+                        tars = []
                     end
                     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
@@ -121,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)
 
@@ -225,15 +225,13 @@ module Pod
             end
         end
 
-        # patch the post install hook
-        old_method2 = instance_method(:run_plugins_post_install_hooks)
+        # hook run_plugins_post_install_hooks 方法
+        install_hooks_method = instance_method(:run_plugins_post_install_hooks)
         define_method(:run_plugins_post_install_hooks) do 
-            old_method2.bind(self).()
+            install_hooks_method.bind(self).()
             if Pod::is_prebuild_stage
                 self.prebuild_frameworks!
             end
         end
-
-
     end
 end

data/lib/cocoapods-ppbuild/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsPpbuild
-  VERSION = "0.0.4"
+  VERSION = "1.0.2"
 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,20 @@ 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)
+            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)
@@ -107,3 +114,22 @@ module Pod
         end
     end
 end
+
+module Pod
+    class Sandbox
+        # hook 清除pod方法，得到删除的pod，通知主pod更新
+        clean_method = instance_method(:clean_pod)
+        define_method(:clean_pod) do |pod_name|
+            if Pod::is_prebuild_stage
+                if Pod::Prebuild::Passer.prebuild_pod_targets_changes.nil?
+                    Pod::Prebuild::Passer.prebuild_pod_targets_changes = [pod_name]
+                else
+                    Pod::Prebuild::Passer.prebuild_pod_targets_changes = (Pod::Prebuild::Passer.prebuild_pod_targets_changes + [pod_name]).uniq
+                end
+            end
+            clean_method.bind(self).(pod_name)
+        end
+    end
+end
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-ppbuild
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 1.0.2
 platform: ruby
 authors:
 - 彭懂
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2021-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -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: {}