cocoapods-packager-ext 0.0.27 → 0.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ef9bb3e65c3e233810884f3717314f0f57e7339c0c1033b7860671e9aaab58e
-  data.tar.gz: 3ee71ef36791f0abc2d00d0edd60bbeed3a05e691aa1e2a4a3d16e272e2e5879
+  metadata.gz: 73aad4670e0835a37acaa91e16fa612e6a09b65d57577d4ec329ea29352779f0
+  data.tar.gz: 299c27370c0e83ea2a974bafc5459ec00063dee1992e38f22740b1ee22d74b84
 SHA512:
-  metadata.gz: df0bf8fc80d5fa9249c8141cad9dee3e6c80df4864ce15816dfc3e34fc07ffb7b01d06517b01d80ffc183b450c14d6784c3cd90bab5d3600f2a26f8980bc357f
-  data.tar.gz: c7576dd9cb0dc25541b8f58efb2b49ee7e9911f7b9410f9032bf969ca7c8527d61b6be88268ed09d8f286c37d55a790b33f47bdf922fe968df2bc232c8e9c1b3
+  metadata.gz: 9c0fcffa49b641db14d7170723e0fb94181562330e3dedd44d02614b3e3b4873aa9da7963ac1b9aea7e598754139001d50cc718513d08d634b2d404468b1d632
+  data.tar.gz: 9f54ff7fe7b714663f1c59c19774df52725fd7eaaeaedf1f0d1c2ea6bc696c56f163dc6be6b2e04c91d9c59912eb11f15ba8396fd082e96aa23c08c923b6216a

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

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/ext/validator.rb

@@ -0,0 +1,25 @@
+require 'pathname'
+module Pod
+  class Validator
+
+    alias _xcodebuild_t _xcodebuild
+    def _xcodebuild(command, raise_on_failure = false)
+      begin
+        _xcodebuild_t(command, raise_on_failure)
+      rescue => e
+        if ENV['PUSH_BACKUP_PATH']
+          for item in command
+            if item.include?(".xcworkspace")
+              # puts command.join(' ')
+              path = Pathname.new(item).parent
+              puts path
+              `mv #{path} #{ENV['PUSH_BACKUP_PATH']}`
+            end
+          end
+        end
+        raise e
+      end
+    end
+     
+  end
+end

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

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

data/lib/cocoapods_plugin.rb

@@ -1,2 +1,3 @@
 require 'cocoapods-packager-ext/command'
 require 'cocoapods-packager-ext/ext/builder.rb'
+require 'cocoapods-packager-ext/ext/validator.rb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-packager-ext
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.32
 platform: ruby
 authors:
 - kyle.zhou
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2021-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,6 +73,7 @@ files:
 - lib/cocoapods-packager-ext/ext/downloader/lnpath.rb
 - lib/cocoapods-packager-ext/ext/downloader_ext.rb
 - lib/cocoapods-packager-ext/ext/pod_utils.rb
+- lib/cocoapods-packager-ext/ext/validator.rb
 - lib/cocoapods-packager-ext/gem_version.rb
 - lib/cocoapods_plugin.rb
 - spec/command/ext_spec.rb