cocoapods-packager-ext 0.0.28 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4a7c4eb8ea2da2a0ba4062e761774f735b9f876d844a5d496572ca8f8f8ba06
-  data.tar.gz: 0bd6ff054c0a6a9693a6874f6d49c2756648b49b3a677e1bd0a20b004ee014d9
+  metadata.gz: 666bf99ad7bef68dce559b4102ba7eba97699de43128cad3283feb706ee0b165
+  data.tar.gz: 4cdd6ef5bb2f576c038b13a320f288b7e11a08052267c50685d0b06ae9240315
 SHA512:
-  metadata.gz: d2bea48cee61556923f7f931eda06e82b39424adda0f3b144e4f75eceb3c98dab15aa029ecba464b0c4dc1ed686482f597e57b333c118f468f0e7de1863a381a
-  data.tar.gz: 1a1d97ad12dee4bbf539c417896b0ebe85867302130a3fa6fc97c8e678597340bb58d2f5d6debdd897ad4150907fb1cc422dbadfbf30b4b797011434b9621db8
+  metadata.gz: 5ac87c3210c7d6af667263b113ca9d74d09e2a929131906ddb7851921016f72a5b4de76a022a420fd544dfe1842a936ebfc1dd7146ab10d173fb08484bb67893
+  data.tar.gz: 57a875b65878a040c97f8042d1703d01db2ae50dc8cbf7a62066d173b8bc8f43fe63c6f92b9ec4e856791e6030c8e67b0b014de9a189e91497670b3177d84d48

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,22 @@ 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('')
+                            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 +149,13 @@ 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'))
+                    clean_dummy_files(static_sandbox.target_support_files_root)
+                    if @dynamic
+                        clean_dummy_files(dynamic_sandbox.target_support_files_root)
+                    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
@@ -212,9 +233,37 @@ MAP
         end
     end
 
+    alias xcodebuild_t xcodebuild
+
+    def xcodebuild(defines = '', args = '', build_dir = 'build', target = 'Pods-packager', project_root = @static_sandbox_root, config = @config)
+      if defined?(Pod::DONT_CODESIGN)
+        args = "#{args} CODE_SIGN_IDENTITY=\"\" CODE_SIGNING_REQUIRED=NO"
+      end
+
+      command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration #{config} -target #{target} -project #{project_root}/Pods.xcodeproj 2>&1"
+      output = `#{command}`.lines.to_a
+
+      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}"`
+        end
+        puts UI::BuildFailedReport.report(command, output)
+
+        # Note: We use `Process.exit` here because it fires a `SystemExit`
+        # exception, which gives the caller a chance to clean up before the
+        # process terminates.
+        #
+        # See http://ruby-doc.org/core-1.9.3/Process.html#method-c-exit
+        Process.exit
+      end
+    end
+
     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.28"
+  VERSION = "0.0.33"
 end

metadata

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