cocoapods-packager-ext 0.0.22 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d1533e3a81379cabda6ffb6cf8a0ec7ac1e044d42af7f41e94344cd480bd38f
-  data.tar.gz: 53da1e28b909db61fa9cdabf3cb242307d2eea126da42dd0381ce481c2e07bea
+  metadata.gz: 0ef9bb3e65c3e233810884f3717314f0f57e7339c0c1033b7860671e9aaab58e
+  data.tar.gz: 3ee71ef36791f0abc2d00d0edd60bbeed3a05e691aa1e2a4a3d16e272e2e5879
 SHA512:
-  metadata.gz: 4ba30867ac2e65c3e0540e9897cbcf06306493786233333b8a90c5ca593c277f7bec718b054c47bd68f79417da06a600a15e46a880280d4905885b5516c74093
-  data.tar.gz: 247481474b4035c2c7bbe819edf2080e05f9af133a0c4fea4800b880eb34b44031582290ef0d22e018487e0a37d3ce2f87eca052f891ae42ae856ce9a7880f4e
+  metadata.gz: df0bf8fc80d5fa9249c8141cad9dee3e6c80df4864ce15816dfc3e34fc07ffb7b01d06517b01d80ffc183b450c14d6784c3cd90bab5d3600f2a26f8980bc357f
+  data.tar.gz: c7576dd9cb0dc25541b8f58efb2b49ee7e9911f7b9410f9032bf969ca7c8527d61b6be88268ed09d8f286c37d55a790b33f47bdf922fe968df2bc232c8e9c1b3

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

@@ -65,16 +65,34 @@ module Pod
             begin
                 perform_build(platform, static_sandbox, dynamic_sandbox, static_installer)
             ensure # in case the build fails; see Builder#xcodebuild.
-                if ENV['ENABLE_BACKUP_WORKSPACE']
-                    target_dir = "#{@source_dir}/#{@spec.name}-#{@spec.version}/workspace_#{platform}"
-                    Dir.mkdir target_dir
-                    `mv "#{Dir.pwd}" "#{target_dir}"`
+                if ENV['ENABLE_BACKUP_WORKSPACE'] && (ENV['ENABLE_BACKUP_WORKSPACE'].upcase == 'YES' || ENV['ENABLE_BACKUP_WORKSPACE'].upcase == 'TRUE')
+                else
+                    Pathname.new(config.sandbox_root).rmtree
+                    FileUtils.rm_f('Podfile.lock')
                 end
-                Pathname.new(config.sandbox_root).rmtree
-                FileUtils.rm_f('Podfile.lock')
             end
         end
 
+        def spec_library(platform)
+            spec = <<RB
+  s.#{platform.name.to_s}.deployment_target    = '#{platform.deployment_target}'
+  s.#{platform.name.to_s}.vendored_libraries  = ['#{platform.name.to_s}/*.a']
+  s.#{platform.name.to_s}.public_header_files = ['#{platform.name.to_s}/Headers/*.{h}']
+  s.#{platform.name.to_s}.source_files = ['#{platform.name.to_s}/Headers/*.{h}']
+  s.#{platform.name.to_s}.resource = ['#{platform.name.to_s}/Resources/*.bundle']
+  s.#{platform.name.to_s}.module_map   = "#{platform.name.to_s}/Modules/module.modulemap"
+RB
+        end
+
+        def spec_framework(platform)
+            spec = <<RB
+  s.#{platform.name.to_s}.public_header_files = ['#{platform.name.to_s}/Headers/*.{h}']
+  s.#{platform.name.to_s}.source_files = ['#{platform.name.to_s}/**/Headers/*.{h}']
+  s.#{platform.name.to_s}.resource = ['#{platform.name.to_s}/**/Resources/*.bundle']
+  s.#{platform.name.to_s}.module_map   = "#{platform.name.to_s}/**/Modules/module.modulemap"
+RB
+        end
+
         alias build_package_t build_package
         def build_package
             if @platform == ''
@@ -87,7 +105,13 @@ module Pod
                     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)
+                        if @library
+                            newspec += spec_library(platform)
+                        else
+                            newspec += builder.spec_platform(platform)
+                        end
+
+
                     else
                         UI.puts 'jump build platforms:'+platform.to_s
                     end

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

@@ -2,7 +2,22 @@ require "fileutils"
 
 module Pod
   class Builder
-   
+
+    alias build_static_library_t build_static_library
+    def build_static_library
+      build_static_library_t
+      platform_path = Pathname.new(@platform.name.to_s)
+      header_path = platform_path+'Headers'
+      header_path.mkpath unless header_path.exist?
+
+      module_map_path = platform_path+'Modules'
+      module_map_path.mkpath unless module_map_path.exist?
+      copy_headers_to_target header_path,module_map_path
+
+      resources_path = platform_path+'Resources'
+      resources_path.mkpath unless resources_path.exist?
+      copy_resources_to_target resources_path
+    end
     alias build_static_library_for_ios_t build_static_library_for_ios
     def build_static_library_for_ios(output)
       if @exclude_dep_items.length > 0
@@ -46,7 +61,7 @@ module Pod
     end
 
     def ios_build_options
-      if ENV['DISABLE_BITCODE']
+      if ENV['DISABLE_BITCODE'] && (ENV['DISABLE_BITCODE'].upcase == 'YES' || ENV['DISABLE_BITCODE'].upcase == 'TRUE')
         "ARCHS=\'#{ios_architectures.join(' ')}\' OTHER_CFLAGS=\'-Qunused-arguments\'"
       else
         "ARCHS=\'#{ios_architectures.join(' ')}\' OTHER_CFLAGS=\'-fembed-bitcode -Qunused-arguments\'"
@@ -92,12 +107,20 @@ module Pod
         return ios_architectures_t
       end
     end
+
     alias copy_headers_t copy_headers
     def copy_headers
+      copy_headers_to_target @fwk.headers_path
+    end
+
+    def copy_headers_to_target(headers_target_path = nil ,module_map_target_path = nil )
+      headers_target_path = @fwk.headers_path if headers_target_path.nil?
+      module_map_target_path = @fwk.module_map_path if module_map_target_path.nil?
+
       headers_source_root = "#{@public_headers_root}/#{@spec.name}"
 
       Dir.glob("#{headers_source_root}/**/*.h").
-        each { |h| `ditto #{h} #{@fwk.headers_path}/#{h.sub(headers_source_root, '')}` }
+        each { |h| `ditto #{h} #{headers_target_path}/#{h.sub(headers_source_root, '')}` }
 
       # If custom 'module_map' is specified add it to the framework distribution
       # otherwise check if a header exists that is equal to 'spec.name', if so
@@ -116,10 +139,10 @@ framework module #{@spec.name} {
 MAP
       else
 
-        f = File.new(File.join("#{@fwk.headers_path}","#{@spec.name}.h"), "w+")
+        f = File.new(File.join("#{headers_target_path}","#{@spec.name}.h"), "w+")
         f.puts("#import <UIKit/UIKit.h>")
         f.puts("#import <Foundation/Foundation.h>")
-        Dir.foreach(@fwk.headers_path) do |filename|
+        Dir.foreach(headers_target_path) do |filename|
           if filename != "." and filename != ".."
             f.puts("#import \"#{filename}\"")
           end
@@ -137,13 +160,17 @@ MAP
       end
 
       unless module_map.nil?
-        @fwk.module_map_path.mkpath unless @fwk.module_map_path.exist?
-        File.write("#{@fwk.module_map_path}/module.modulemap", module_map)
+        module_map_target_path.mkpath unless module_map_target_path.exist?
+        File.write("#{module_map_target_path}/module.modulemap", module_map)
       end
     end
 
     alias copy_resources_t copy_resources
     def copy_resources
+      copy_resources_to_target @fwk.resources_path unless @dynamic
+    end
+    def copy_resources_to_target(resources_target_path = nil )
+      resources_target_path = @fwk.resources_path if resources_target_path.nil?
       if @exclude_deps
         bundles = @static_installer.pod_targets.flat_map(&:file_accessors).flat_map{|item|item.resources}
       else
@@ -154,14 +181,23 @@ MAP
         bundles.tap{|path| FileUtils.cp_r path,resources_path}
         `cp -rp #{@static_sandbox_root}/build/*.bundle #{resources_path} 2>&1`
       else
-        `cp -rp #{@static_sandbox_root}/build/*.bundle #{@fwk.resources_path} 2>&1`
+        `cp -rp #{@static_sandbox_root}/build/*.bundle #{resources_path} 2>&1`
         resources = expand_paths(@spec.consumer(@platform).resources)
         if resources.count == 0 && bundles.count == 0
-          @fwk.delete_resources
+          if @fwk
+            @fwk.delete_resources
+          else
+            if resources_target_path.exist?
+              FileUtils.rm_rf resources_target_path
+            end
+          end
           return
         end
         if resources.count > 0
-          `cp -rp #{resources.join(' ')} #{@fwk.resources_path}`
+          `cp -rp #{resources.join(' ')} #{resources_target_path}`
+        end
+        if bundles.count > 0
+          `cp -rp #{bundles.join(' ')} #{resources_target_path}`
         end
       end
     end

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

@@ -45,7 +45,7 @@ module Pod
             config.build_settings['USER_HEADER_SEARCH_PATHS'] = "$(inherited) #{header_path}"
             config.build_settings['OTHER_LDFLAGS'] = '$(inherited) -ObjC'
 
-            if ENV['DISABLE_BITCODE']
+            if ENV['DISABLE_BITCODE'] && (ENV['DISABLE_BITCODE'].upcase == 'YES' || ENV['DISABLE_BITCODE'].upcase == 'TRUE')
               config.build_settings['ENABLE_BITCODE'] = 'NO'
             end
           end

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

@@ -1,3 +1,3 @@
 module CocoapodsPackagerExt
-  VERSION = "0.0.22"
+  VERSION = "0.0.27"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-packager-ext
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.27
 platform: ruby
 authors:
 - kyle.zhou
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler