cocoapods-packager-ext 0.0.15 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c9348a830f7157f3b0331be8528d62167b0fc2e57de1e303cd8302a83fab703
-  data.tar.gz: 68acb37a1efc18f3e97dd44e5b49f39d2771b1360cbfeeabacc5480f64d8d1f9
+  metadata.gz: 3fe4f327fcf1e83c2c98b3e7536e32d0a7a282d35d2a01785e976ec5d42ea490
+  data.tar.gz: 8e511d747b8cd997dad144f8bdbc07fb291798524022db110c63a23eb0a0d2d2
 SHA512:
-  metadata.gz: d57083f40c95d0f75d4045605c877873eb1ebda93685bcdb51d2c7ffe4f0315daf9283ecb5d7d52091bd6ca387dd69ba815f46116d514f51d57b13d88d6ebb79
-  data.tar.gz: a332c19502173bda40694c68879807d4b054ef3b67b1374d226690d3267934f64c0d7e81b642df33f5028f6ace91f25f1104c326affad33b650b54630f43ec4b
+  metadata.gz: f3d309b76e55409eb00290a3a8417f748f78ebc381d3ad4276d262d602b87391381765e60e469caf0f4922de3846f0de8181f3d130cde37fa2da899f72024ffd
+  data.tar.gz: '05863f3099b61ba477b227eca7734f52fcb2deac2cd549f55042cdcd6b51ec9d9712df4acee2d572981ef768b3b0bbc06959f0ae2185d8596931b8ff7f73ed37'

data/cocoapods-packager-ext.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
-  spec.add_runtime_dependency(%q<cocoapods-packager>.freeze,["1.5.0"])
+  spec.add_runtime_dependency(%q<cocoapods-packager>.freeze,["1.5.1"])
   
 end

data/lib/cocoapods-packager-ext/command/package_ext.rb

@@ -26,10 +26,11 @@ module Pod
                 alias options_t options
                 def options
                     o = options_t
-                    o.push(['--all-deps','add all-depends'])
+                    o.push(['--all-deps','embedded all-depends'])
                     o.push(['--archs','select archs'])
                     o.push(['--black-deps','select exclude deps'])
                     o.push(['--podfile','select deps version from podfile'])
+                    o.push(['--platform','select platform'])
                     o.concat(super)
                 end
             rescue
@@ -45,13 +46,39 @@ module Pod
             @select_archs = argv.option('archs','').split(',')
             @black_deps = argv.option('black-deps','').split(',')
             @podfile = argv.option('podfile','')
+            @platform = argv.option('platform','')
             initialize_t argv
         end
 
+        alias build_package_t build_package
+        def build_package
+            if @platform == ''
+                build_package_t
+            else
+                builder = SpecBuilder.new(@spec, @source, @embedded, @dynamic)
+                newspec = builder.spec_metadata
+                
+                @spec.available_platforms.each do |platform|
+                    if @platform.include?(platform.name.to_s)
+                        UI.puts 'build package platform:'+platform.name.to_s
+                        build_in_sandbox(platform)
+                        newspec += builder.spec_platform(platform)
+                    else
+                        UI.puts 'jump build platforms:'+platform.to_s
+                    end
+                end
+
+                newspec += builder.spec_close
+                File.open(@spec.name + '.podspec', 'w') { |file| file.write(newspec) }
+            end
+
+
+
+        end
 
         alias perform_build_t perform_build
-        def perform_build(platform, static_sandbox, dynamic_sandbox)
-            if @all_deps
+        def perform_build(platform, static_sandbox, dynamic_sandbox,static_installer)
+            if @all_deps || @select_archs.length > 0
                 static_sandbox_root = config.sandbox_root.to_s
 
                 if @dynamic
@@ -60,28 +87,30 @@ module Pod
                 end
 
                 builder = Pod::Builder.new(
-                    @source_dir,
-                    static_sandbox_root,
-                    dynamic_sandbox_root,
-                    static_sandbox.public_headers.root,
-                    @spec,
-                    @embedded,
-                    @mangle,
-                    @dynamic,
-                    @config,
-                    @bundle_identifier,
-                    @exclude_deps,
-                    @all_deps,
-                    @black_deps,
-                    @select_archs
+                  platform,
+                  static_installer,
+                  @source_dir,
+                  static_sandbox_root,
+                  dynamic_sandbox_root,
+                  static_sandbox.public_headers.root,
+                  @spec,
+                  @embedded,
+                  @mangle,
+                  @dynamic,
+                  @config,
+                  @bundle_identifier,
+                  @exclude_deps,
+                  @all_deps,
+                  @black_deps,
+                  @select_archs
                 )
 
-                builder.build(platform, @library)
+                builder.build(@package_type)
 
                 return unless @embedded
                 builder.link_embedded_resources
             else
-                perform_build_t(platform,static_sandbox,dynamic_sandbox)
+                perform_build_t(platform,static_sandbox,dynamic_sandbox,static_installer)
             end
         end
 

data/lib/cocoapods-packager-ext/ext/builder.rb

@@ -2,7 +2,7 @@ require "fileutils"
 
 module Pod
   class Builder
-    
+    #移动资源文件和静态库文件到build目录
     def deal_target(path)
       for item in @target_type_ext
         if File.extname(path) == item
@@ -47,37 +47,12 @@ module Pod
       end
     end
 
-    alias build_library_t build_library
-    def build_library(platform, defines, output)
-      deal_target(@static_sandbox_root)
-
-
-      build_library_t platform,defines,output
-    end
-
-    alias ios_build_options_t ios_build_options
-    def ios_build_options
-      if @select_archs.size != 0
-        return "ARCHS=\'#{@select_archs.join(' ')}\' OTHER_CFLAGS=\'-fembed-bitcode -Qunused-arguments\'"
-      else
-        return "ARCHS=\'x86_64 i386 arm64 armv7\' OTHER_CFLAGS=\'-fembed-bitcode -Qunused-arguments\'"
-      end
-    end
 
-    alias build_sim_libraries_t build_sim_libraries
-    def build_sim_libraries(platform, defines)
-        if @select_archs.size != 0 && !@select_archs.include?('i386') && !@select_archs.include?('x86_64')
-          return 
-        else
-          UI.puts 'start build sim'
-          build_sim_libraries_t platform,defines
-        end
-    end
-
-    alias build_static_lib_for_ios_t build_static_lib_for_ios
-    def build_static_lib_for_ios(static_libs, _defines, output)
+    alias build_static_library_for_ios_t build_static_library_for_ios
+    def build_library(output)
+      deal_target(@static_sandbox_root)
       if @all_deps
-        return if static_libs.count == 0
+        static_libs = static_libs_in_sandbox('build')
         sim_libs = static_libs_in_sandbox('build-sim')
         for item in @black_deps
           static_libs.delete_if do |obj|
@@ -90,20 +65,46 @@ module Pod
         UI.puts "links statics:#{static_libs.join(' ')}, sim_libs:#{sim_libs.join(' ')}"
         `xcrun -r libtool -no_warning_for_no_symbols -static -o #{output} #{static_libs.join(' ')} #{sim_libs.join(' ')}`
       else
-        build_static_lib_for_ios static_libs,_defines,output
+        build_static_library_for_ios output
+      end
+    end
+
+    # alias ios_build_options_t ios_build_options
+    # def ios_build_options
+    #   if @select_archs.size != 0
+    #     return "ARCHS=\'#{@select_archs.join(' ')}\' OTHER_CFLAGS=\'-fembed-bitcode -Qunused-arguments\'"
+    #   else
+    #     return ios_build_options_t
+    #   end
+    # end
+    alias ios_architectures_t ios_architectures
+    def ios_architectures
+      if @select_archs.size != 0
+        return @select_archs
+      else
+        return ios_architectures_t
       end
-      
+    end
+
+    alias build_sim_libraries_t build_sim_libraries
+    def build_sim_libraries(defines)
+        if @select_archs.size != 0 && !@select_archs.include?('i386') && !@select_archs.include?('x86_64')
+          return 
+        else
+          UI.puts 'start build sim'
+          build_sim_libraries_t defines
+        end
     end
 
     alias initialize_t initialize
-    def initialize(source_dir, static_sandbox_root, dynamic_sandbox_root, public_headers_root, spec, embedded, mangle, dynamic, config, bundle_identifier, exclude_deps, all_deps,black_deps,select_archs)
+    def initialize(platform, static_installer, source_dir, static_sandbox_root, dynamic_sandbox_root, public_headers_root, spec, embedded, mangle, dynamic, config, bundle_identifier, exclude_deps,all_deps= false ,black_deps=[],select_archs=[])
       @all_deps = all_deps
       @black_deps = black_deps
       @select_archs = select_archs
       @target_type_ext = ['.a','.bundle']
       @target_dir_ext_ext = "#{static_sandbox_root}/build"
       @black_list_ext = ["#{static_sandbox_root}/build","#{static_sandbox_root}/build-sim"]
-      initialize_t(source_dir, static_sandbox_root, dynamic_sandbox_root, public_headers_root, spec, embedded, mangle, dynamic, config, bundle_identifier, exclude_deps)
+      initialize_t(platform, static_installer,source_dir, static_sandbox_root, dynamic_sandbox_root, public_headers_root, spec, embedded, mangle, dynamic, config, bundle_identifier, exclude_deps)
     end 
   end
 end

data/lib/cocoapods-packager-ext/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsPackagerExt
-  VERSION = "0.0.15"
+  VERSION = "0.0.21"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-packager-ext
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.21
 platform: ruby
 authors:
 - kyle.zhou
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.1
 description: A short description of cocoapods-packager-ext.
 email:
 - kyle.zhou@qq.com