cocoapods-jxedt 0.0.10 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 777002b95ef4f80296a0e6289a5a90ad04c2f71e49d2e647fd21e145c872b871
-  data.tar.gz: 0dc4fee30c433a0e07c89c114c61e9f2355746618fd3cf2055f011e9e767b4b4
+  metadata.gz: ad01cd6bd2da4418b03764271caab2236a186ea81f3c9f77a885910d12263d78
+  data.tar.gz: aa9f410bbbea81420a9d04f01c379428aece86e8449c9ec10a461a79d03825fe
 SHA512:
-  metadata.gz: 239b4f5621619a359f42159c0d14bad1402e75b56862af836ae297b6ff88667b0bf8fc6b2bbdc5a1f65d31fade8b04895de910f2d50c99e2ba7f03f19e12ce14
-  data.tar.gz: 198b0e23d430d4788b3fe14cee2562041b8323ac9ad68ac12b215613a9ea443caa6c427e6d49f51fb539687f81c2e0caab8de2290362227ab268de8e34ea0472
+  metadata.gz: a0a5d962b702c2fde4f3ac10a81e027ba555f72310b31fee0530e94587eb7e56019ddf0d5e64951dd8f3c0e50626afbf286aa3c15b31a678bbb99413dcc5e8d1
+  data.tar.gz: 60e70a3f5be60178cf721b4d69b113d065275eb415f70655feb718279b9b2ad9de3bfb8a9ce0a01050b2972a7c2346ef7bbcd723849054d40bf79dc7b84db124

data/lib/cocoapods-jxedt/binary/config.rb

@@ -11,6 +11,7 @@ module Jxedt
             :binary_dir => "framework的保存路径，相对于'Pods/Pods.xcodeproj'的相对路径。默认为'../_Prebuild'",
             :binary_switch => "二进制开关，关闭则不hook pre_install过程。默认为true",
             :prebuild_job => "开启编译任务，设置为false则不触发编译。默认为true",
+            :keep_source_project => "保留源码的pods工程，默认保留，方便查看源码",
             :dev_pods_enabled => "Development Pods是否支持binary。默认为false",
             :excluded_pods => "排除binary的pods",
             :xcconfig_configuration_alias => "xcconfig文件中configuration的别名，configurations设置为多个值的时候会用到，用于搜索替换。一般不需要设置，有默认值为'cocoapods-jxedt-binary'",
@@ -59,6 +60,10 @@ module Jxedt
             @dsl_config[:prebuild_job] || @dsl_config[:prebuild_job].nil?
         end
 
+        def keep_source_project?
+            @dsl_config[:keep_source_project] || false
+        end
+
         def dev_pods_enabled?
             @dsl_config[:dev_pods_enabled] || false
         end

data/lib/cocoapods-jxedt/binary/helper/prebuild_sandbox.rb

@@ -1,4 +1,46 @@
 module Pod
+  # The sandbox provides support for the directory that CocoaPods uses for an
+  # installation. In this directory the Pods projects, the support files and
+  # the sources of the Pods are stored.
+  #
+  # CocoaPods assumes to have control of the sandbox.
+  #
+  # Once completed the sandbox will have the following file structure:
+  #
+  #     Pods
+  #     |
+  #     +-- Headers
+  #     |   +-- Private
+  #     |   |   +-- [Pod Name]
+  #     |   +-- Public
+  #     |       +-- [Pod Name]
+  #     |
+  #     +-- Local Podspecs
+  #     |   +-- External Sources
+  #     |   +-- Normal Sources
+  #     |
+  #     +-- Target Support Files
+  #     |   +-- [Target Name]
+  #     |       +-- Pods-acknowledgements.markdown
+  #     |       +-- Pods-acknowledgements.plist
+  #     |       +-- Pods-dummy.m
+  #     |       +-- Pods-prefix.pch
+  #     |       +-- Pods.xcconfig
+  #     |
+  #     +-- [Pod Name]
+  #     |
+  #     +-- Manifest.lock
+  #     |
+  #     +-- Pods.xcodeproj
+  #  (if installation option 'generate_multiple_pod_projects' is enabled)
+  #     |
+  #     +-- PodTarget1.xcodeproj
+  #     |
+  #    ...
+  #     |
+  #     +-- PodTargetN.xcodeproj
+  #
+  #
   class PrebuildSandbox < Sandbox
     # [String] standard_sandbox_path
     def self.from_standard_sandbox_path(path)
@@ -10,9 +52,77 @@ module Pod
       from_standard_sandbox_path(sandbox.root)
     end
 
+    def make_source_link(source, target)
+      source = Pathname.new(source)
+      target = Pathname.new(target)
+      target.parent.mkpath unless target.parent.exist?
+      target.rmtree if target.exist?
+      relative_source = source.relative_path_from(target.parent)
+      FileUtils.ln_sf(relative_source, target)
+    end
+
+    def source_path
+      '../Pods-Source'
+    end
+
+    def headers_root
+      root + source_path + 'Headers'
+    end
+
     def project_path
-        super
-        # root + 'Pods.xcodeproj'
+      root + source_path + 'Pods-Source.xcodeproj'
+    end
+
+    def specifications_root
+      # root + source_path + 'Local Podspecs'
+      super
+    end
+
+    def target_support_files_root
+      root + source_path + 'Target Support Files'
+    end
+
+    def link_source_project!
+      root.children.each do |child|
+        next if ['Headers', 'Local Podspecs', 'Target Support Files'].include? child.basename.to_s
+        next if ['.lock', '.xcodeproj'].include? child.extname.to_s
+        make_source_link(child, root + source_path + child.basename)
+      end 
+    end
+
+    def clean_source_project!
+      return if Jxedt.config.keep_source_project?
+
+      source_project_path = root + source_path
+      source_project_path.rmtree if source_project_path.exist?
+    end
+  end
+end
+
+module Pod
+  class Installer
+    # The {UserProjectIntegrator} integrates the libraries generated by
+    # TargetDefinitions of the {Podfile} with their correspondent user
+    # projects.
+    #
+    class UserProjectIntegrator
+      alias_method :old_create_workspace, :create_workspace
+      def create_workspace
+        old_create_workspace unless sandbox.is_a?(Pod::PrebuildSandbox)
+      end
+    end
+  end
+end
+
+module Pod
+  class Installer
+    # Cleans up the sandbox directory by removing stale target support files and headers.
+    #
+    class SandboxDirCleaner
+      alias_method :old_clean!, :clean!
+      def clean!
+        old_clean! unless @sandbox.is_a?(Pod::PrebuildSandbox)
+      end
     end
   end
 end

data/lib/cocoapods-jxedt/binary/hooks/pre_install.rb

@@ -44,8 +44,12 @@ module Jxedt
             require_relative '../prebuild'
 
             # prebuild_job
-            log_section "🚀  Prebuild frameworks" if Jxedt.config.prebuild_job?
-            Jxedt::Prebuild.new(source_installer).build if Jxedt.config.prebuild_job?
+            sandbox.link_source_project!
+            if Jxedt.config.prebuild_job?
+                log_section "🚀  Prebuild frameworks"
+                Jxedt::Prebuild.new(source_installer).build 
+            end
+            sandbox.clean_source_project!
 
             log_section "🤖  Resume pod installation"
             require_relative '../targets/pod_target'

data/lib/cocoapods-jxedt/binary/targets/pod_target.rb

@@ -1,4 +1,54 @@
 module Pod
+    class PodTarget < Target
+        alias_method :old_resource_paths, :resource_paths
+        def resource_paths
+            resource_paths = old_resource_paths
+            # 没有使用二进制不处理
+            return resource_paths unless self.use_binary
+
+            # 遍历所有的resources
+            resource_paths.each do |name, resources|
+                resources.map! {|resource_file|
+                    resource_extname = Pathname.new(resource_file).basename.extname
+                    # 如果文件不需要编译，跳过
+                    next resource_file unless self.class.resource_extension_compilable?(resource_extname)
+                    
+                    # 确定编译后的文件名称
+                    output_extname = self.class.output_extension_for_resource(resource_extname)
+                    output_file_name = "#{Pathname.new(resource_file).basename.sub_ext('')}#{output_extname}"
+                    # 从framework中查找编译后的文件
+                    file_accessors.each do |file_accessor|
+                        file_accessor.vendored_frameworks.each do |framework_file|
+                            framework_name = Pathname.new(framework_file).basename.sub_ext('').to_s
+                            # 只处理和当前target module_name相同的framework，否则跳过
+                            next if self.product_module_name != framework_name
+                            
+                            # xcframework和framework文件分别处理，而且只查找.framework根目录下的文件
+                            if '.xcframework' == Pathname.new(framework_file).basename.extname
+                                files = Dir.glob("#{framework_file}/**/#{framework_name}.framework/#{output_file_name}")
+                                next if files.size == 0 # 没有查找到文件跳过
+
+                                if Gem::Version.new(Pod::VERSION) >= Gem::Version.new('1.10.0')
+                                    resource_file = "${PODS_XCFRAMEWORKS_BUILD_DIR}/#{self.name}/#{framework_name}.framework/#{output_file_name}"
+                                else
+                                    resource_file = "${PODS_CONFIGURATION_BUILD_DIR}/#{framework_name}.framework/#{output_file_name}"
+                                end
+                            else
+                                files = Dir.glob("#{framework_file}/#{output_file_name}")
+                                next if files.size == 0 # 没有查找到文件跳过
+
+                                resource_path = Pathname.new("#{framework_file}/#{output_file_name}") # 真实路径
+                                resource_file = "${PODS_ROOT}/#{resource_path.relative_path_from(self.sandbox.root)}"
+                            end
+                        end
+                    end
+                    resource_file
+                }.reject!(&:nil?)
+            end
+            resource_paths
+        end
+    end
+    
     class Target
       # @since 1.5.0
       class BuildSettings

data/lib/cocoapods-jxedt/command/statistics/statistics.rb

@@ -59,7 +59,7 @@ module Pod
                     
                     # print
                     index, failed = 0, []
-                    used_binary.sort_by {|hash| hash[:name] }.each do |hash|
+                    used_binary.sort_by {|hash| hash[:name].capitalize }.each do |hash|
                         name = hash[:name]
 
                         checksum = lockfile.spec_checksums_hash_key(name)

data/lib/cocoapods-jxedt/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsJxedt
-  VERSION = "0.0.10"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-jxedt
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - guojiashuang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-20 00:00:00.000000000 Z
+date: 2023-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods