cocoapods-ppbuild 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a60801b88a3a65f9772965dbb9f3902abb9359af6d13f22417f14b7e8473843
-  data.tar.gz: cccc9a3f322b92e85832435a7b3deae1a79afc36d5651c9bdc48e174bd3453fc
+  metadata.gz: c5573fd6b439b3b7f14cd3af40775271c6adb2df5d2694ea06a052b765e7bca7
+  data.tar.gz: 34ff8d8e4212d82b442b950191569c232b4abbcc4e2767520d579c9be8ba940c
 SHA512:
-  metadata.gz: ed89338e7ec4b7a6695b2679c6ebe092550c51ad89b9c56b8b99bdfe6638f510ae58feb3528f8ff14c0ea5c02c3a3a559d746e9108f0b0eab1020f96a91c7e57
-  data.tar.gz: 3722e1443ad0cdf5e0aebf029c3fd1cdd4cac946e5d8f17dc81fdbac16af96deef2f02ff9f067a1f5cd87e4140e76e8a7b0dedc5ed24ccded17b191b0481343c
+  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)
                     
@@ -111,6 +112,7 @@ module Pod
                             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
@@ -135,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|
@@ -164,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

@@ -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

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
@@ -228,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/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsPpbuild
-  VERSION = "0.0.4"
+  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.4
+  version: 0.0.5
 platform: ruby
 authors:
 - 彭懂
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2021-09-29 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: {}