cocoapods-packager-ext 0.0.30 → 0.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cf3493cfe83b8790bdfa13709f4e84bb20db74fbde3119238271bb70116a956
-  data.tar.gz: 8e2e9067e59073349177faca6d4bc639b77702b1382a219e106b0a3b5b990588
+  metadata.gz: 06bc606336fe05543708fe279c8510b0a14140b8cdadd9f5626f6a1034fcf734
+  data.tar.gz: 2419dd1bdd1d8143ae4ea7c247bd862739bed0eab726e3c4b87eeedbca15db61
 SHA512:
-  metadata.gz: 2d75c72039e332ed8c440c2ada29ab66a1856964f1c45eb1cd3ce74d65e5f7c6585ef215670e40b12b59c986c89d60d527d9aac138c9beccce1bb880c251e454
-  data.tar.gz: e743071dc7bc7c06e1142f6bba438c60c225ba529e423ecfa72d2550e82648122e6e0f9feefbcb833ff258200d348a68bad437374e612508d565deff8d388204
+  metadata.gz: 259ce3729f900080bdcf8934b13dcf796905881a447ee40651317e692be94f4a5b083e2d1cf7b2d5562a4c5c1a1a2e2ef5fa6dc857bdd14eef14d9bf0490fd7a
+  data.tar.gz: 3cb6310654d3c74661912500c53bd171f1aaab6ec1de6c46dbbca4fa3cc99de0a73994c2113906f0196fae7d30346f02b3d17d1d03dea3d774a591339a1dc429

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

@@ -66,7 +66,9 @@ module Pod
                 perform_build(platform, static_sandbox, dynamic_sandbox, static_installer)
             ensure # in case the build fails; see Builder#xcodebuild.
                 if ENV['ENABLE_BACKUP_WORKSPACE'] && (ENV['ENABLE_BACKUP_WORKSPACE'].upcase == 'YES' || ENV['ENABLE_BACKUP_WORKSPACE'].upcase == 'TRUE')
+                    UI.message 'Backup Workspace'
                 else
+                    UI.message 'Delete Workspace'
                     Pathname.new(config.sandbox_root).rmtree
                     FileUtils.rm_f('Podfile.lock')
                 end
@@ -123,6 +125,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 +152,17 @@ 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
+                else
+                    UI.puts 'Jump clean dummy files'
+                end
+
                 builder = Pod::Builder.new(
                   platform,
                   static_installer,

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

@@ -39,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(' ')}`
@@ -46,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
@@ -240,9 +245,11 @@ MAP
 
       if $?.exitstatus != 0
         if ENV['ENABLE_BACKUP_WORKSPACE'] && (ENV['ENABLE_BACKUP_WORKSPACE'].upcase == 'YES' || ENV['ENABLE_BACKUP_WORKSPACE'].upcase == 'TRUE')
-          target_dir = "#{@source_dir}/#{@spec.name}-#{@spec.version}"
-          work_dir = Dir.pwd
-          `mv "#{work_dir}" "#{target_dir}"`
+          UI.title 'Backup Workspace' do
+            target_dir = "#{@source_dir}/#{@spec.name}-#{@spec.version}"
+            work_dir = Dir.pwd
+            `mv "#{work_dir}" "#{target_dir}"`
+          end
         end
         puts UI::BuildFailedReport.report(command, output)
 
@@ -257,7 +264,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.30"
+  VERSION = "0.0.35"
 end

metadata

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