cocoapods-binaryhqp 0.4.9 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14566192d217044c6dc8d8b93af1d0296c14f092006c9880cf8beb689802cd34
-  data.tar.gz: 6e22703f0dad2e1f8cbdff851ad26d8b1033dd530e5c98c000e10d9900b65fcc
+  metadata.gz: 565caa20391d4ee0ad9cd3620069122545da6ad40faaf74907d1d2d3284cf2bf
+  data.tar.gz: bea179595b39bca57caee759a3de746fdfc4da037881f9cca9f8e08eb776a8f0
 SHA512:
-  metadata.gz: dc6a18e6324e3d5b6a37aed9a10c2477b3037752026439de9416fda800c234407b2cf3f8d9ac13496c14ab8a9dc588072d195ac508919c284a1a0d21b7773b6b
-  data.tar.gz: 93547fff043c799c6489041300733cb676f9daf1792df574181359178254cf8696295960740fb86e04a8f0cc09099037036e768dad581e185438fe434fec0018
+  metadata.gz: d5313617b1242d2e669e8cc11f8dc8dce6706f2736a01b676fbefec2d54b0ff2f41304819c3e33ef0941c4c7f600b37c424ce723fe16071eeebd9c657c97c826
+  data.tar.gz: a4b55835877d6b415b68ce5178c449846093ee40384351cb68f139bd6a7ffadba0e7e2175340ece7c9b00c7569287de4f5386cd5b79f904c75872fb37ec7a567

data/.vscode/launch.json

@@ -8,8 +8,10 @@
       "useBundler": true,
       "cwd": "${workspaceRoot}/demo", // pod 命令执行的路径
       "program": "/usr/local/bin/pod",
-      // "args": ["update", "--verbose","--sources=http://gitlab.9tong.com/ios-group/HQPFoundation/hqpspecs.git"], // `pod` 命令的参数
+      // "args": ["update", "--verbose"]// `pod` 命令的参数
       "args": ["install", "--verbose"]
+      // "args": ["install","--hsource", "--verbose"]
+      // "args":["install", "--help"]
       }
     ]
   }

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    cocoapods-binaryhqp (0.4.7)
+    cocoapods-binaryhqp (0.4.9)
+      CFPropertyList
       cocoapods
       fourflusher
-      plist
       xcpretty
 
 GEM
@@ -87,7 +87,6 @@ GEM
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
-    plist (3.6.0)
     prettybacon (0.0.2)
       bacon (~> 1.2)
     public_suffix (4.0.6)

data/README.md

@@ -33,16 +33,17 @@ Then in the flowing normal install process, we hook the integration functions to
 
 ## Installation
 
-## 编译方法
-sudo gem build cocoapods-binaryhqp.gemspec && sudo gem install cocoapods-binaryhqp-0.4.7.gem
+## 安装方法 
+
+sudo gem install cocoapods-binaryhqp
+
 
 ## Usage
 
 ``` ruby
-plugin 'cocoapods-binary'
+plugin 'cocoapods-binaryhqp'
 
 use_frameworks!
-# all_binary!
 
 target "HP" do
     pod "ExpectoPatronum", :binary => true
@@ -55,6 +56,10 @@ end
 
 **Note**: cocoapods-binary require `use_frameworks!`. If your worry about the boot time and other problems introduced by dynamic framework, static framework is a good choice. Another [plugin](https://github.com/leavez/cocoapods-static-swift-framework) made by me to make all pods static frameworks is recommended.
 
+## 全部使用源码
+ - pod install --hsource
+ 
+
 #### Options
 
 If you want to disable binary for a specific pod when using `all_binary!`, place a `:binary => false` to it.

data/lib/cocoapods-binaryhqp/Integration.rb

@@ -214,9 +214,12 @@ module Pod
                 # https://github.com/leavez/cocoapods-binary/issues/29
                 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"}
+                    # 只对动态库处理，静态库由mainTarget处理resource_bundles,静态库不能清空resource_bundles
+                    if not targets.first.build_as_static_framework? 
+                        spec.attributes_hash["resource_bundles"] = nil 
+                        spec.attributes_hash["resources"] ||= []
+                        spec.attributes_hash["resources"] += bundle_names.map{|n| n+".bundle"}
+                    end
                 end
 
                 # to avoid the warning of missing license

data/lib/cocoapods-binaryhqp/Main.rb

@@ -2,6 +2,7 @@
 require_relative 'helper/podfile_options'
 require_relative 'tool/tool'
 require_relative 'gem_version'
+require_relative 'command_option/command_option'
 
 module Pod    
     class Podfile
@@ -13,6 +14,10 @@ module Pod
                 DSL.prebuild_all = true
             end
 
+            def all_source!
+                DSL.framework_source_all = true
+            end
+
             # Enable bitcode for prebuilt frameworks
             def enable_bitcode_for_prebuilt_frameworks!
                 DSL.bitcode_enabled = true
@@ -60,6 +65,9 @@ module Pod
             class_attr_accessor :prebuild_all
             prebuild_all = false
 
+            class_attr_accessor :framework_source_all
+            framework_source_all = false
+
             class_attr_accessor :bitcode_enabled
             bitcode_enabled = false
 
@@ -122,6 +130,9 @@ Pod::HooksManager.register('cocoapods-binaryhqp', :pre_install) do |installer_co
     Pod::Installer.force_disable_integration true # don't integrate targets
     Pod::Config.force_disable_write_lockfile true # disbale write lock file for perbuild podfile
     Pod::Installer.disable_install_complete_message true # disable install complete message
+
+    Pod::Podfile::DSL.framework_source_all = Pod::Podfile::DSL.framework_source_all || Pod::Command::Install::all_use_source
+    Pod::UI.puts("全部使用源码") if Pod::Podfile::DSL.framework_source_all  
     
     # make another custom sandbox
     standard_sandbox = installer_context.sandbox
@@ -134,8 +145,8 @@ Pod::HooksManager.register('cocoapods-binaryhqp', :pre_install) do |installer_co
     lockfile = installer_context.lockfile
     binary_installer = Pod::Installer.new(prebuild_sandbox, prebuild_podfile, lockfile)
 
-    binary_installer.delete_standard_sand_box_pod(standard_sandbox)
-    
+    binary_installer.delete_all_standard_sandbox_pod(standard_sandbox)
+
     if binary_installer.have_exact_prebuild_cache? && !update
         binary_installer.install_when_cache_hit!
     else

data/lib/cocoapods-binaryhqp/Prebuild.rb

@@ -146,6 +146,11 @@ module Pod
             self.sandbox.exsited_framework_target_names.each do |name|
                 UI.puts "Using #{name}" if config.verbose
             end
+
+            self.resolve_dependencies
+            #处理资源文件
+            self.handle_static_framework_resouces
+            
         end
 
         def delete_standard_sand_box_pod(standard_sanbox)
@@ -155,11 +160,61 @@ module Pod
     
                 need_update_pods.each do |pod_name|
                     pod_path = Pathname.new(standard_sanbox.root.to_s + "/#{pod_name}")
-                    Pod::UI.puts("删除 #{pod_path.to_s}") 
+                    Pod::UI.puts("删除 #{pod_path.to_s}") if config.verbose
+                    pod_path.rmtree if pod_path.exist?
+                end                
+            end
+        end
+
+        def delete_all_standard_sandbox_pod(standard_sanbox)
+            if lockfile
+                changes = lockfile.detect_changes_with_podfile(podfile)
+                need_update_pods = (changes[:added] + changes[:changed] + changes[:removed] + changes[:unchanged]).to_a
+    
+                need_update_pods.each do |pod_name|
+                    pod_path = Pathname.new(standard_sanbox.root.to_s + "/#{pod_name}")
+                    Pod::UI.puts("删除 #{pod_path.to_s}") if config.verbose
                     pod_path.rmtree if pod_path.exist?
                 end                
             end
         end
+        # 处理静态库资源
+        def handle_static_framework_resouces
+            all_static_framework_targets = pod_targets.reject{|pod_target| not pod_target.static_framework? or pod_target.resource_paths.empty? }
+            all_static_framework_targets.each do |target|        
+                output_path = sandbox.framework_folder_path_for_target_name(target.name)
+                if target.static_framework? and !target.resource_paths.empty?
+                    framework_path = output_path + target.framework_name
+                    standard_sandbox_path = sandbox.standard_sanbox_path
+                    resources = begin
+                        if Pod::VERSION.start_with? "1.5"
+                            target.resource_paths
+                        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.map do |path|
+                        prebuild_real_path = (path.gsub('${PODS_ROOT}', sandbox.root.to_s) if path.start_with? '${PODS_ROOT}')|| ""
+                        real_file_path = framework_path + File.basename(path)
+                        if Pathname.new(prebuild_real_path).exist? and not Pathname.new(real_file_path).exist?
+                            # 静态库的resource,拷贝至framework目录下
+                            FileUtils.cp_r(prebuild_real_path, real_file_path, :remove_destination => true)
+                        end
+                        object = Prebuild::Passer::ResourcePath.new
+                        object.real_file_path = real_file_path
+                        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
+                    end
+                    Prebuild::Passer.resources_to_copy_for_static_framework[target.name] = path_objects
+                end
+            end
+        end
     
 
         # Build the needed framework files
@@ -213,7 +268,6 @@ module Pod
 
             targets = targets.reject {|pod_target| sandbox.local?(pod_target.pod_name) }
 
-            
             # build!
             Pod::UI.puts "Prebuild frameworks (total #{targets.count})"
             Pod::Prebuild.remove_build_dir(sandbox_path)
@@ -227,37 +281,13 @@ module Pod
                 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)
-
-                # save the resource paths for later installing
-                if target.static_framework? and !target.resource_paths.empty?
-                    framework_path = output_path + target.framework_name
-                    standard_sandbox_path = sandbox.standard_sanbox_path
-
-                    resources = begin
-                        if Pod::VERSION.start_with? "1.5"
-                            target.resource_paths
-                        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.map do |path|
-                        object = Prebuild::Passer::ResourcePath.new
-                        object.real_file_path = framework_path + File.basename(path)
-                        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
-                    end
-                    Prebuild::Passer.resources_to_copy_for_static_framework[target.name] = path_objects
-                end
-
-            end            
+            end
+            # check static_framework resources
+            self.handle_static_framework_resouces
             Pod::Prebuild.remove_build_dir(sandbox_path)
 
+      
+
 
             # copy vendored libraries and frameworks
             targets.each do |target|
@@ -297,10 +327,11 @@ module Pod
             useless_target_names = sandbox.exsited_framework_target_names.reject do |name| 
                 all_needed_names.include? name
             end
-            useless_target_names.each do |name|
-                path = sandbox.framework_folder_path_for_target_name(name)
-                path.rmtree if path.exist?
-            end
+            # 不删除已经编译好的framework
+            # useless_target_names.each do |name|
+            #     path = sandbox.framework_folder_path_for_target_name(name)
+            #     path.rmtree if path.exist?
+            # end
 
             if not Podfile::DSL.dont_remove_source_code 
                 # only keep manifest.lock and framework folder in _Prebuild

data/lib/cocoapods-binaryhqp/command_option/command_option.rb

@@ -0,0 +1,51 @@
+module Pod
+    class Command
+      class Install < Command
+        @@use_source = false
+
+        class << self
+          alias :original_options :options
+        end
+        def self.options
+          [['--hsource', 'from cocoapods-binaryhqp, all frameworks use source code']].concat(original_options)
+        end
+  
+        alias :original_initialize :initialize
+        def initialize(argv)
+          @@use_source = argv.flag?('hsource', false)
+          original_initialize(argv)
+        end
+
+        def self.all_use_source
+            @@use_source
+        end
+
+        def self.set_all_use_source(use)
+          @@use_source = use
+        end
+
+        
+      end
+    end
+end
+
+module Pod
+  class Command
+    class Update < Command
+      class << self
+        alias :original_options :options
+      end
+      def self.options
+        [['--hsource', 'from cocoapods-binaryhqp, all frameworks use source code']].concat(original_options)
+      end
+
+      alias :original_initialize :initialize
+      def initialize(argv)
+        use = argv.flag?('hsource', false)
+        Pod::Command::Install.set_all_use_source(use)
+        original_initialize(argv)
+      end
+    end
+  end
+end
+  

data/lib/cocoapods-binaryhqp/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsBinaryHqp
-    VERSION = "0.4.9"
+    VERSION = "0.5.3"
 end

data/lib/cocoapods-binaryhqp/helper/feature_switches.rb

@@ -28,14 +28,18 @@ module Pod
                 end
 
                 # patched content
-                should_prebuild = Pod::Podfile::DSL.prebuild_all
+                should_prebuild = Pod::Podfile::DSL.prebuild_all || (not Pod::Podfile::DSL.framework_source_all)
                 local = false
                 
                 options = args.last
                 if options.is_a?(Hash) and options[Pod::Prebuild.keyword] != nil
-                    should_prebuild = options[Pod::Prebuild.keyword]
+                    should_prebuild = options[Pod::Prebuild.keyword] && (not Pod::Podfile::DSL.framework_source_all)
                     local = (options[:path] != nil)
                 end
+
+                if Pod::Command::Install.all_use_source
+                    should_prebuild = false
+                end
                 
                 if should_prebuild and (not local)
                     old_method.bind(self).(name, *args)

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

@@ -11,13 +11,17 @@ module Pod
 
         ## --- option for setting using prebuild framework ---
         def parse_prebuild_framework(name, requirements)
-            should_prebuild = Pod::Podfile::DSL.prebuild_all
+            should_prebuild = Pod::Podfile::DSL.prebuild_all && (not Pod::Podfile::DSL.framework_source_all)
 
             options = requirements.last
             if options.is_a?(Hash) && options[Pod::Prebuild.keyword] != nil 
-                should_prebuild = options.delete(Pod::Prebuild.keyword)
+                should_prebuild = options.delete(Pod::Prebuild.keyword) && (not Pod::Podfile::DSL.framework_source_all)
                 requirements.pop if options.empty?
             end
+
+            if Pod::Command::Install.all_use_source
+                should_prebuild = false
+            end
     
             pod_name = Specification.root_name(name)
             set_prebuild_for_pod(pod_name, should_prebuild)

data/lib/cocoapods-binaryhqp/rome/build_framework.rb

@@ -32,6 +32,8 @@ def build_for_iosish_platform(sandbox,
   # make less arch to iphone simulator for faster build
   custom_build_options_simulator += ['ARCHS=x86_64', 'ONLY_ACTIVE_ARCH=NO'] if simulator == 'iphonesimulator'
 
+  custom_build_options += ['ARCHS=arm64']
+
   is_succeed, _ = xcodebuild(sandbox, target_label, device, deployment_target, other_options + custom_build_options)
   exit 1 unless is_succeed
   is_succeed, _ = xcodebuild(sandbox, target_label, simulator, deployment_target, other_options + custom_build_options_simulator)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binaryhqp
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.3
 platform: ruby
 authors:
 - leavez
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-30 00:00:00.000000000 Z
+date: 2021-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -118,6 +118,7 @@ files:
 - lib/cocoapods-binaryhqp/Integration.rb
 - lib/cocoapods-binaryhqp/Main.rb
 - lib/cocoapods-binaryhqp/Prebuild.rb
+- lib/cocoapods-binaryhqp/command_option/command_option.rb
 - lib/cocoapods-binaryhqp/gem_version.rb
 - lib/cocoapods-binaryhqp/helper/feature_switches.rb
 - lib/cocoapods-binaryhqp/helper/names.rb