cocoapods-kz 0.0.13 → 0.0.15

data/lib/cocoapods-kz/helpers/kz_global_helper.rb

@@ -7,6 +7,21 @@ require_relative 'kz_config_result'
 require_relative 'kz_pod_target'
 
 module KZ
+  class KZOnDemandResourcesInfo
+    attr_accessor :enable
+    attr_accessor :config_plist_path_patterns
+    attr_accessor :bundle_id
+    attr_accessor :odr_target_name
+
+    def initialize
+      @enable = false
+      @config_plist_path_patterns = {}
+      @bundle_id = ""
+      @odr_target_name = ""
+    end
+
+  end
+
   KZ_POD_CONFIG_VERSION = '1.0.2'
   KZ_POD_CONFIG_ROOT = Pod::Config.instance.installation_root + 'Pods/KZPodConfigure'
   KZ_POD_CONFIG_SUPPORT_FILES = KZ_POD_CONFIG_ROOT + 'SupportFiles'
@@ -55,7 +70,7 @@ module KZ
     attr_accessor :generate_kz_pod_targets
     attr_accessor :debug_shell_log_tag
     attr_accessor :arm64_simulator
-    attr_accessor :on_demand_resources_bundle_id
+    attr_accessor :on_demand_resources_info
 
     private_class_method :new
 
@@ -70,6 +85,7 @@ module KZ
       @olde_lock_file_content = nil
       @debug_shell_log_tag = "&> /dev/null"
       @arm64_simulator = false
+      @on_demand_resources_info = KZOnDemandResourcesInfo.new
     end
 
     def debug=(value)
@@ -96,10 +112,6 @@ module KZ
         FileUtils.rm_rf(KZ_POD_CONFIG_POD_TEMPDIR) if File.exist?(KZ_POD_CONFIG_POD_TEMPDIR)
         FileUtils.mkdir_p(KZ_POD_CONFIG_POD_TEMPDIR)
 
-        FileUtils.rm(FLEX_COMPLIER_PATH) if File.exist?(FLEX_COMPLIER_PATH)
-        FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/FlexCompiler', FLEX_COMPLIER_PATH)
-        system("chmod +x #{FLEX_COMPLIER_PATH}")
-
         FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/kz_generator_framework.sh', KZ_GENERATOR_FRAMEWORK_PATH)
         system("chmod +x #{KZ_GENERATOR_FRAMEWORK_PATH}")
 
@@ -116,8 +128,8 @@ module KZ
 
         Pod::Config.instance.podfile.use_frameworks!(:linkage => :static)
 
-        if !@on_demand_resources_bundle_id.nil?
-          FileUtils.rm_r(KZ_ON_DEMAND_RESOURCES) if File.exist?(KZ_ON_DEMAND_RESOURCES)
+        FileUtils.rm_r(KZ_ON_DEMAND_RESOURCES) if File.exist?(KZ_ON_DEMAND_RESOURCES)
+        if on_demand_resources_info.enable
           FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/on_demand_resources/', KZ_ON_DEMAND_RESOURCES)
           system("chmod +x #{KZ_ON_DEMAND_RESOURCES_SHELL}")
         end
@@ -127,6 +139,21 @@ module KZ
       end
     end
 
+    def handle_flexCompiler
+      flexlib_info = @kz_analyzer.pod_of_flexlib_info
+      FileUtils.rm(FLEX_COMPLIER_PATH) if File.exist?(FLEX_COMPLIER_PATH)
+      if flexlib_info.have_flexLib_pod
+        if flexlib_info.flexLib_version.major >= 4
+          FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/FlexCompiler_V1', FLEX_COMPLIER_PATH)
+        else
+          FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/FlexCompiler', FLEX_COMPLIER_PATH)
+        end
+      elsif flexlib_info.have_kzswiftui_pod
+        FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/FlexCompiler_V1', FLEX_COMPLIER_PATH)
+      end
+      system("chmod +x #{FLEX_COMPLIER_PATH}") if File.exist?(FLEX_COMPLIER_PATH)
+    end
+
     def analyze_special_parameters(use_code_tag, use_framework_tag, pod_names)
       specify_pod_names = []
       if pod_names.count > 0
@@ -159,10 +186,13 @@ module KZ
     end
 
     def have_flexLib_pod_target
+      return @kz_analyzer.pod_of_flexlib_info.have_kzswiftui_pod || @kz_analyzer.pod_of_flexlib_info.have_flexLib_pod
+    end
+
+    def check_and_copy_flex_compiler
       @kz_analyzer.all_kz_pod_targets.values.each do |target|
         return true if target.root_name == 'FlexLib' || target.root_name == 'KZSwiftUI'
       end
-      false
     end
 
     def write_lock_file

data/lib/cocoapods-kz/helpers/kz_pod_target.rb

@@ -5,6 +5,10 @@ require_relative 'kz_global_helper'
 
 module KZ
 
+  Initial_Install_Tags = "Initial Install Tags"
+  Prefetched_Tag_Order = "Prefetched Tag Order"
+  Download_Only_On_Demand = "Download Only On Demand"
+
   class KZPodTarget
 
     attr_reader :native_pod_target
@@ -50,6 +54,9 @@ module KZ
 
     attr_accessor :disable_to_simulator_frameworks
 
+    attr_accessor :on_demand_resources_config_patterns
+    attr_accessor :on_demand_resources_config_path
+
     def initialize(native_pod_target)
       @native_pod_target = native_pod_target
       @name = native_pod_target.name
@@ -235,10 +242,11 @@ module KZ
     end
 
     # 获取target对应的配置根目录，部分文件需要依赖版本进行存储
-    def pod_config_cache_path(concat_version, vendored_framework = false)
+    def pod_config_cache_path(concat_version, vendored_framework = false, on_demand_resources = false)
       kz_target_config_folder = KZ_POD_CONFIG_POD_TARGETS + @name
       kz_target_config_folder += @version if concat_version
       kz_target_config_folder += "vendored_framework" if vendored_framework
+      kz_target_config_folder += "on_demand_resources" if on_demand_resources
       kz_target_config_folder
     end
 
@@ -341,11 +349,77 @@ module KZ
       @native_pod_target.configuration_build_dir
     end
 
-    def add_on_demand_resources(path)
-      @on_demand_resources.push(path).uniq!
+    def on_demand_resources_info
+      return {} if @on_demand_resources_config_patterns.nil?
+
+      pod_root = self.native_pod_target.sandbox.pod_dir(self.root_name)
+      path_list = Pod::Sandbox::PathList.new(pod_root)
+      list = path_list.glob(@on_demand_resources_config_patterns)
+      result = list.select {|path| path.extname == ".plist" }
+
+      on_demand_resources_info = {}
+      result.each do |config_plist_path|
+        plist_hash = Xcodeproj::Plist.read_from_path(config_plist_path)
+        initial_plist_hash = plist_hash[Initial_Install_Tags]
+        traversal_resource_for_tag(initial_plist_hash, path_list) do |tag_resources|
+          on_demand_resources_info[Initial_Install_Tags] = tag_resources
+        end
+
+        prefetched_plist_hash = plist_hash[Prefetched_Tag_Order]
+        traversal_resource_for_tag(prefetched_plist_hash, path_list) do |tag_resources|
+          on_demand_resources_info[Prefetched_Tag_Order] = tag_resources
+        end
+
+        download_plist_hash = plist_hash[Download_Only_On_Demand]
+        traversal_resource_for_tag(download_plist_hash, path_list) do |tag_resources|
+          on_demand_resources_info[Download_Only_On_Demand] = tag_resources
+        end
+      end
+      on_demand_resources_info
     end
-    def get_on_demand_resources
-      @on_demand_resources
+
+    def traversal_resource_for_tag(plist_hash, path_list)
+      if !plist_hash.nil? && plist_hash.size > 0
+        tag_resources = {}
+
+        plist_hash.each do |tag, resource_paths|
+          valid_paths = []
+          resource_paths.each do |resource_path|
+            valid_path = path_list.relative_path_in_snadbox?(resource_path)
+            unless valid_path.nil?
+              valid_paths.append(valid_path)
+            end
+          end
+          if valid_paths.size > 0
+            tag_resources[tag] = valid_paths
+          end
+        end
+
+        yield(tag_resources)
+      end
+    end
+
+    def all_xcassets_paths
+      @all_xcassets_paths ||= begin
+        all_xcassets_paths = []
+        native_pod_target.file_accessors.each do |file_accessor|
+          file_accessor.resource_bundles.map do |_, paths|
+            paths.each do |path|
+              if path.extname == ".xcassets"
+                all_xcassets_paths << path
+              end
+            end
+          end
+        end
+        all_xcassets_paths
+      end
+    end
+
+    def get_swift_lldb_ast_path
+      if current_should_build? and current_uses_swift?
+        return "$(TARGET_BUILD_DIR)/#{root_name}/#{product_name}/Modules/#{product_basename}.swiftmodule/$(NATIVE_ARCH_ACTUAL)-$(LLVM_TARGET_TRIPLE_VENDOR)-$(SHALLOW_BUNDLE_TRIPLE).swiftmodule"
+      end
+      nil
     end
 
   end

data/lib/cocoapods-kz/helpers/repair_module_import.rb

@@ -31,7 +31,7 @@ module KZ
 
       @all_kz_pod_targets.values.each do |kz_pod_target|
         next unless kz_pod_target.is_dev_pod
-        next unless @specify_pod_names.count > 0 && @specify_pod_names.include?(kz_pod_target.name)
+        next unless @specify_pod_names.count == 0 || (@specify_pod_names.count > 0 && @specify_pod_names.include?(kz_pod_target.name))
 
         need_repair_files = []
         kz_pod_target.native_pod_target.file_accessors.each do |file_accessor|

data/lib/cocoapods-kz/native/build_configuration.rb

@@ -0,0 +1,12 @@
+module Xcodeproj
+  class Project
+    module Object
+      class XCBuildConfiguration
+        def kz_simple_attributes_buildSettings_hash
+          simple_attributes_hash["buildSettings"]
+        end
+      end
+    end
+  end
+end
+

data/lib/cocoapods-kz/native/dls.rb

@@ -40,14 +40,20 @@ module Pod
         KZ::KZGlobalHelper.instance.kz_pod_config.merge!(kz_pod_config)
       end
 
-      def kz_cocoapods_configure(*requirements)
-        configure = requirements.last
-        return false unless configure.is_a?(Hash)
-
-        on_demand_resources_bundle_id = configure.delete(:on_demand_resources_bundle_id)
-        if !on_demand_resources_bundle_id.nil? && on_demand_resources_bundle_id.is_a?(String)
-          KZ::KZGlobalHelper.instance.on_demand_resources_bundle_id = on_demand_resources_bundle_id
+      def odr_target(name, options = nil)
+        if options
+          raise Informative, "Unsupported options `#{options}` for " \
+            "target `#{name}`."
         end
+        KZ::KZGlobalHelper.instance.on_demand_resources_info.enable = true
+        KZ::KZGlobalHelper.instance.on_demand_resources_info.odr_target_name = name
+
+        parent = current_target_definition
+        definition = TargetDefinition.new(name, parent)
+        self.current_target_definition = definition
+        yield if block_given?
+      ensure
+        self.current_target_definition = parent
       end
 
     end

data/lib/cocoapods-kz/native/file_accessor.rb

@@ -70,18 +70,38 @@ module Pod
         end
       end
 
+      alias_method :origin_vendored_libraries, :vendored_libraries
+      def vendored_libraries
+        if self.kz_pod_target and KZ::KZGlobalHelper.instance.arm64_simulator
+          return []
+        else
+          origin_vendored_libraries
+        end
+      end
+
       alias_method :origin_vendored_frameworks, :vendored_frameworks
       def vendored_frameworks
         if self.kz_pod_target
-          frameworks = origin_vendored_frameworks
-          if KZ::KZGlobalHelper.instance.arm64_simulator && frameworks.count > 0
-            frameworks = KZ::KZFrameworkManager.handle_origin_framework(frameworks, self.kz_pod_target)
+          new_frameworks = []
+          if KZ::KZGlobalHelper.instance.arm64_simulator
+            libraries = origin_vendored_libraries
+            if libraries.count > 0
+              new_frameworks.concat(KZ::KZFrameworkManager.handle_origin_library(libraries, self.kz_pod_target))
+            end
+            frameworks = origin_vendored_frameworks
+            if frameworks.count > 0
+              new_frameworks.concat(KZ::KZFrameworkManager.handle_origin_framework(frameworks, self.kz_pod_target))
+            end
+          else
+            new_frameworks.concat(origin_vendored_frameworks)
           end
+
+          # 是否开启framework模式
           result = KZ::KZGlobalHelper.instance.pod_config_result_with_target(self.kz_pod_target)
           if !self.spec.test_specification && result
-            frameworks.concat(result.get_framework_paths)
+            new_frameworks.concat(result.get_framework_paths)
           end
-          frameworks
+          new_frameworks
         else
           origin_vendored_frameworks
         end

data/lib/cocoapods-kz/native/installer.rb

@@ -1,6 +1,6 @@
 require 'cocoapods/installer'
 require 'cocoapods-kz/helpers/kz_global_helper'
-require 'cocoapods-kz/helpers/kz_generator'
+require 'cocoapods-kz/helpers/kz_generator_hmap'
 
 module Pod
   class Installer
@@ -12,10 +12,18 @@ module Pod
       # 因为kz_pod_target提供不少方法，需要判断pod文件情况，所以依赖分析需要挪到download之后
       if KZ::KZGlobalHelper.instance.generate_kz_pod_targets
         main_project = aggregate_targets.first.user_project
+        main_project.targets.each do |main_target|
+          if main_target.display_name == KZ::KZGlobalHelper.instance.on_demand_resources_info.odr_target_name
+            bundle_id = main_target.build_configurations.first.kz_simple_attributes_buildSettings_hash["PRODUCT_BUNDLE_IDENTIFIER"]
+            KZ::KZGlobalHelper.instance.on_demand_resources_info.bundle_id = bundle_id unless bundle_id.nil?
+          end
+        end
+
         kz_analyer = KZ::KZAnalyzer.new(pod_targets, self.sandbox.development_pods)
         kz_analyer.analyer
         KZ::KZGlobalHelper.instance.kz_analyzer = kz_analyer
         KZ::KZGlobalHelper.instance.kz_generator = KZ::KZGenerator.new(main_project)
+        KZ::KZGlobalHelper.instance.handle_flexCompiler
       end
     end
 
@@ -24,7 +32,8 @@ module Pod
       if KZ::KZGlobalHelper.instance.kz_pod_enable
         # hmap的创建需要在download之后，integrate之前
         KZ::KZGlobalHelper.instance.kz_generator.create_hamp
-        unless KZ::KZGlobalHelper.instance.on_demand_resources_bundle_id.nil?
+
+        if KZ::KZGlobalHelper.instance.on_demand_resources_info.enable
           KZ::KZGlobalHelper.instance.kz_generator.create_on_demand_resources
         end
       end

data/lib/cocoapods-kz/native/path_list.rb

@@ -0,0 +1,11 @@
+module Pod
+  class Sandbox
+    class PathList
+
+      def relative_path_in_snadbox?(relative_path)
+        full_path = root.join(relative_path)
+        full_path.exist? ? full_path : nil
+      end
+    end
+  end
+end

data/lib/cocoapods-kz/native/pod_target_installer.rb

@@ -42,26 +42,6 @@ module Pod
 
             target_installation_result
           end
-
-          alias_method :origin_filter_resource_file_references, :filter_resource_file_references
-          def filter_resource_file_references(resource_file_references)
-            kz_pod_target = self.target.weakRef_kz_pod_target
-            if kz_pod_target
-              new_resource_file_references = []
-              odr_resources = kz_pod_target.get_on_demand_resources
-              resource_file_references.each do |path|
-                new_resource_file_references.push(path) unless odr_resources.include?(path)
-              end
-              origin_filter_resource_file_references(new_resource_file_references) do |compile_phase_refs, resources_phase_refs|
-                yield compile_phase_refs, resources_phase_refs
-              end
-            else
-              origin_filter_resource_file_references(resource_file_references) do |compile_phase_refs, resources_phase_refs|
-                yield compile_phase_refs, resources_phase_refs
-              end
-            end
-          end
-
         end
       end
     end

data/lib/cocoapods-kz/native/specification.rb

@@ -27,5 +27,11 @@ module Pod
         {}
       end
     end
+
+    def on_demand_resources_config_plists=(paths)
+      if KZ::KZGlobalHelper.instance.on_demand_resources_info.enable
+        KZ::KZGlobalHelper.instance.on_demand_resources_info.config_plist_path_patterns[self.name] = Array(paths)
+      end
+    end
   end
 end

data/lib/cocoapods-kz/native/target_installer_helper.rb

@@ -21,6 +21,9 @@ module Pod
                 kz_clean_xcconfig(xcconfig)
                 main_hamp_search_path = '"' + KZ::KZ_POD_CONFIG_ROOT_STR + "/#{self.target.user_project.root_object.display_name}.hmap" + '"'
                 pod_targets = self.target.pod_targets_for_build_configuration(generator.configuration_name)
+
+                swift_lldb_ast_paths = []
+                on_demand_resources_config_paths = []
                 pod_targets.each do |native_pod_target|
                   kz_pod_target = native_pod_target.weakRef_kz_pod_target
                   if kz_pod_target
@@ -33,15 +36,37 @@ module Pod
                     if kz_pod_target.force_load
                       kz_add_force_load_tag(xcconfig, kz_pod_target)
                     end
+
+                    # 添加swift ast path
+                    ast_path = kz_pod_target.get_swift_lldb_ast_path
+                    if !ast_path.nil? and generator.configuration_name == "Debug"
+                      swift_lldb_ast_paths << ast_path
+                    end
+
+                    unless kz_pod_target.on_demand_resources_config_path.nil?
+                      on_demand_resources_config_paths << (kz_pod_target.name + ":" + kz_pod_target.on_demand_resources_config_path)
+                    end
                   end
                 end
+
+                kz_add_swift_lldb_ast_paths(xcconfig, swift_lldb_ast_paths)
                 xcconfig.attributes['HEADER_SEARCH_PATHS'] = main_hamp_search_path
                 xcconfig.attributes['USE_HEADERMAP'] = 'NO'
                 if KZ::KZGlobalHelper.instance.arm64_simulator
                   xcconfig.attributes.delete("EXCLUDED_ARCHS[sdk=iphonesimulator*]")
                   xcconfig.attributes['VALID_ARCHS'] = 'arm64 arm64_32 x86_64'
                 end
-                
+                if KZ::KZGlobalHelper.instance.on_demand_resources_info.odr_target_name == self.target.name.sub('Pods-', '')
+                  xcconfig.attributes["ENABLE_ON_DEMAND_RESOURCES"] = "NO"
+
+                  on_demadn_resources_paths = ""
+                  on_demand_resources_config_paths.each do |path|
+                    on_demadn_resources_paths += ((on_demadn_resources_paths.empty? ? ''  : ' ') + '"' + path + '"')
+                  end
+                  xcconfig.attributes["KZ_ON_DEMAND_RESOURCES_PATHS"] = on_demadn_resources_paths unless on_demadn_resources_paths.empty?
+                  xcconfig.attributes["KZ_POD_CONFIG_ROOT"] = KZ::KZ_POD_CONFIG_ROOT_STR
+                end
+
                 kz_update_xcconfig_file(xcconfig, path)
                 return
               end
@@ -175,6 +200,16 @@ module Pod
             force_flags.add(KZ.deal_path_for_xcconfig(kz_pod_target.force_load_info, true))
           end
 
+          def kz_add_swift_lldb_ast_paths(xcconfig, swift_lldb_ast_paths)
+            if swift_lldb_ast_paths.count > 0
+              other_linker_flags = xcconfig.other_linker_flags
+              simple = other_linker_flags[:simple]
+              swift_lldb_ast_paths.each do |swift_lldb_ast_path|
+                simple.add("-Wl,-add_ast_path,#{KZ.deal_path_for_xcconfig(swift_lldb_ast_path, true)}")
+              end
+            end
+          end
+
         end
       end
     end

data/lib/cocoapods-kz/native/target_integrator.rb

@@ -7,24 +7,18 @@ module Pod
         alias_method :origin_integrate!, :integrate!
         def integrate!
           origin_integrate!
-
-          unless KZ::KZGlobalHelper.instance.on_demand_resources_bundle_id.nil?
-            add_on_demand_resources_script_phase
-          end
+          handle_on_demand_resources_script_phase
         end
 
-        def add_on_demand_resources_script_phase
+        def handle_on_demand_resources_script_phase
           phase_name = "[KZ] On Demand Resources Build"
           native_targets.each do |native_target|
-            if native_target.isa == "PBXNativeTarget" && native_target.product_type == "com.apple.product-type.application"
-              phase = TargetIntegrator.create_or_update_shell_script_build_phase(native_target, phase_name)
+            phase = TargetIntegrator.create_or_update_shell_script_build_phase(native_target, phase_name)
+            if native_target.name == KZ::KZGlobalHelper.instance.on_demand_resources_info.odr_target_name
               native_target.build_phases.push(phase).uniq! unless native_target.build_phases.include?(phase)
               phase.shell_script = KZ.deal_path_for_xcconfig(KZ::KZ_ON_DEMAND_RESOURCES_SHELL, true)
-
-              native_target.build_configurations.each do |config|
-                config.build_settings["ENABLE_ON_DEMAND_RESOURCES"] = "NO"
-                config.build_settings["KZ_POD_CONFIG_ROOT"] = KZ::KZ_POD_CONFIG_ROOT_STR
-              end
+            else
+              native_target.build_phases.delete(phase) if native_target.build_phases.include?(phase)
             end
           end
         end

data/lib/cocoapods-kz/native.rb

@@ -14,4 +14,6 @@ if Pod.match_version?('~> 1.11')
   require 'cocoapods-kz/native/pods_project_writer'
   require 'cocoapods-kz/native/pod_target_integrator'
   require 'cocoapods-kz/native/target_integrator'
+  require 'cocoapods-kz/native/path_list'
+  require 'cocoapods-kz/native/build_configuration'
 end