cocoapods-packager-ext 0.0.29 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9812e5e9a1d1b816716bbdea4c7143cd00a5bb409ced69e87057091795f661c
-  data.tar.gz: 49840f81b8ee853a34f1427b2e632b88d397e043ed11e872fcc24de6c5c37073
+  metadata.gz: 1c90b7fdb68ad58b455f67d03ec4d22b67653a76491a4cf3c221a2ef18f3a9fe
+  data.tar.gz: 06b2ade59b1efe45f6b1e33b4171c45891e848b55a3ec3c0da39f7a159a77985
 SHA512:
-  metadata.gz: a9de7513e68ce21c894a88f9d4404ec2ee2089e844354ecee9adf3817fdc0d39b72b9c8f8d5e25c80374795f2c713213d980376be458b2f20b81eda975554e27
-  data.tar.gz: d4da5a7071c4145eeb38b9b4dfbbef0e98239954c06761fa22ef1a4851c6f316ee4e9092ebff814b1c296b2ba152ce3812e45014d45fb8a02386ffd2be2bffc9
+  metadata.gz: 32691adb42d4ba2b51ea8e97b2e3af6bf4598cd94991ddef156943b203046f551a911320f1b5ac5e92975d0caaddb048fef57b0a6a4d054daad86f76ba4ab0e6
+  data.tar.gz: 63dbddb0fb40586560ad751b65eddc1314b62a701f319d1bcb7ea0b173a0351c2f3df00b32cf8edee52fb1f1f5220f09144f6e029c4501fc73b6ee3124acac49

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

@@ -78,7 +78,7 @@ module Pod
   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}.source_files = ['#{platform.name.to_s}/Headers/*.{h}',"#{platform.name.to_s}/Modules/module.modulemap"]
   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
@@ -123,6 +123,23 @@ RB
 
         end
 
+        def clean_dummy_files(path)
+            Dir.entries(path).each do |sub|
+                if sub != '.' && sub != '..'
+                    if File.directory?("#{path}/#{sub}")
+                        clean_dummy_files("#{path}/#{sub}")
+                    else
+                        if(sub =~ /-dummy.m$/)
+                            File.open("#{path}/#{sub}",'w')do |file|
+                                file.write('')
+                                UI.message " - clean dummy file:#{sub}"
+                            end
+                        end
+                    end
+                end
+            end
+        end
+
         alias perform_build_t perform_build
         def perform_build(platform, static_sandbox, dynamic_sandbox,static_installer)
             if @select_archs.length > 0 || @exclude_dep_items.length > 0
@@ -133,6 +150,15 @@ RB
                     dynamic_sandbox_root = "#{config.sandbox_root}/#{dynamic_sandbox.root.to_s.split('/').last}"
                 end
 
+                if (ENV['ENABLE_CLEAN_DUMMY_FILE'] && (ENV['ENABLE_CLEAN_DUMMY_FILE'].upcase == 'YES' || ENV['ENABLE_CLEAN_DUMMY_FILE'].upcase == 'TRUE'))
+                    UI.title 'Clean Dummy Files' do
+                        clean_dummy_files(static_sandbox.target_support_files_root)
+                        if @dynamic
+                            clean_dummy_files(dynamic_sandbox.target_support_files_root)
+                        end
+                    end
+                end
+
                 builder = Pod::Builder.new(
                   platform,
                   static_installer,

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

@@ -5,7 +5,23 @@ module Pod
 
     alias build_static_library_t build_static_library
     def build_static_library
-      build_static_library_t
+
+      UI.puts("Building static library #{@spec} with configuration #{@config}")
+
+      defines = compile
+      build_sim_libraries(defines)
+
+      platform_path = Pathname.new(@platform.name.to_s)
+      platform_path.mkdir unless platform_path.exist?
+
+      output = platform_path + "lib#{@spec.name}-#{@platform.name.to_s}.a"
+
+      if @platform.name == :ios
+        build_static_library_for_ios(output)
+      else
+        build_static_library_for_mac(output)
+      end
+
       platform_path = Pathname.new(@platform.name.to_s)
       header_path = platform_path+'Headers'
       header_path.mkpath unless header_path.exist?
@@ -23,6 +39,11 @@ module Pod
       if @exclude_dep_items.length > 0
         static_libs = static_libs_in_sandbox('build') + static_libs_in_sandbox('build-sim') + vendored_libraries
         static_libs.reject! {|lib| @exclude_dep_items.any? {|item| lib.to_s.include? item}}
+        UI.section 'Fetch output libs' do
+          static_libs.each do |lib|
+            UI.message lib
+          end
+        end
         libs = ios_architectures.map do |arch|
           library = "#{@static_sandbox_root}/build/package-#{arch}.a"
           `libtool -arch_only #{arch} -static -o #{library} #{static_libs.join(' ')}`
@@ -30,7 +51,7 @@ module Pod
         end
 
         `lipo -create -output #{output} #{libs.join(' ')}`
-        
+
         # static_libs = static_libs_in_sandbox('build')
         # sim_libs = static_libs_in_sandbox('build-sim')
         # for item in @black_deps
@@ -241,7 +262,8 @@ MAP
 
     alias initialize_t initialize
     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,exclude_dep_items=[],select_archs=[])
-      @exclude_dep_items = exclude_dep_items
+      @exclude_dep_items = ['libPods-packager.a']
+      @exclude_dep_items.concat(exclude_dep_items) if exclude_dep_items
       @select_archs = select_archs
       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 

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

@@ -1,3 +1,3 @@
 module CocoapodsPackagerExt
-  VERSION = "0.0.29"
+  VERSION = "0.0.34"
 end

metadata

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