cocoapods-packager-ext 0.0.25 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 843ed35c16571ceeee0764e3e4c57a04e7b4a685034b5dcc84a2e93749f25d4d
-  data.tar.gz: 89aa1981270916590dbbc66498003827fe8767ac9e7649b73b7d4e83f580cfb7
+  metadata.gz: 4cf3493cfe83b8790bdfa13709f4e84bb20db74fbde3119238271bb70116a956
+  data.tar.gz: 8e2e9067e59073349177faca6d4bc639b77702b1382a219e106b0a3b5b990588
 SHA512:
-  metadata.gz: 7b7444d6c654437884ff56f75db10c5121f1baf2019905602cb50b5fee3b1619639c7709b0e980d6425edfd60afca93a398a643ffbc62c90d4f5b9b4f6355159
-  data.tar.gz: 61bcc0509f78db3166daf2611025447ced051b42be36d9255f84603aa5f1782024edfd3c36494fe55e40b305c0ed9791da873f351fbefde43f31daa7bb545117
+  metadata.gz: 2d75c72039e332ed8c440c2ada29ab66a1856964f1c45eb1cd3ce74d65e5f7c6585ef215670e40b12b59c986c89d60d527d9aac138c9beccce1bb880c251e454
+  data.tar.gz: e743071dc7bc7c06e1142f6bba438c60c225ba529e423ecfa72d2550e82648122e6e0f9feefbcb833ff258200d348a68bad437374e612508d565deff8d388204

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

@@ -65,7 +65,8 @@ module Pod
             begin
                 perform_build(platform, static_sandbox, dynamic_sandbox, static_installer)
             ensure # in case the build fails; see Builder#xcodebuild.
-                if not ENV['ENABLE_BACKUP_WORKSPACE']
+                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
@@ -77,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?
@@ -61,7 +77,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\'"
@@ -167,7 +183,7 @@ MAP
 
     alias copy_resources_t copy_resources
     def copy_resources
-      copy_resources_to_target @fwk.resources_path
+      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?
@@ -212,6 +228,33 @@ 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

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/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.25"
+  VERSION = "0.0.30"
 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.25
+  version: 0.0.30
 platform: ruby
 authors:
 - kyle.zhou
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-23 00:00:00.000000000 Z
+date: 2021-06-29 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