cocoapods-packager-ext 0.0.34 → 0.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c90b7fdb68ad58b455f67d03ec4d22b67653a76491a4cf3c221a2ef18f3a9fe
-  data.tar.gz: 06b2ade59b1efe45f6b1e33b4171c45891e848b55a3ec3c0da39f7a159a77985
+  metadata.gz: 7e3ea2e42a96e582a1ceca0f405a2b3944d309e1b24f946866083b1deed0bea6
+  data.tar.gz: 28d914b4b6c08da5e91a19a4f02b7a026bb9a38d723cf2de271585289b14d0e3
 SHA512:
-  metadata.gz: 32691adb42d4ba2b51ea8e97b2e3af6bf4598cd94991ddef156943b203046f551a911320f1b5ac5e92975d0caaddb048fef57b0a6a4d054daad86f76ba4ab0e6
-  data.tar.gz: 63dbddb0fb40586560ad751b65eddc1314b62a701f319d1bcb7ea0b173a0351c2f3df00b32cf8edee52fb1f1f5220f09144f6e029c4501fc73b6ee3124acac49
+  metadata.gz: 934083375da5cc1b912e3df751092fba6217fb0a01f0380d9d5c3ddce2cc46c1c84f943d2abde5bed560cc722879ac2801706aa8960bc5ffd61b6c2b1faf5367
+  data.tar.gz: 781192d7a6c2a112b8ea8a69eaec4b69e3c8785abd33052aaa8013d465a0bd90828180f0cd229a40641daae31201beb72c227605fcef95c9ef7e486a1ac76fa7

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
@@ -157,6 +159,8 @@ RB
                             clean_dummy_files(dynamic_sandbox.target_support_files_root)
                         end
                     end
+                else
+                    UI.puts 'Jump clean dummy files'
                 end
 
                 builder = Pod::Builder.new(

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

@@ -89,6 +89,29 @@ module Pod
       end
     end
 
+    alias compile_t compile
+    def compile
+      if ENV['GCC_PREPROCESSOR_DEFINITIONS']
+        defines = "GCC_PREPROCESSOR_DEFINITIONS='$(inherited) PodsDummy_Pods_#{@spec.name}=PodsDummy_PodPackage_#{@spec.name} #{ENV['GCC_PREPROCESSOR_DEFINITIONS']}'"
+        UI.puts "Set GCC_PREPROCESSOR_DEFINITIONS:#{defines}"
+      else
+        defines = "GCC_PREPROCESSOR_DEFINITIONS='$(inherited) PodsDummy_Pods_#{@spec.name}=PodsDummy_PodPackage_#{@spec.name}'"
+      end
+      defines << ' ' << @spec.consumer(@platform).compiler_flags.join(' ')
+
+      if @platform.name == :ios
+        options = ios_build_options
+      end
+
+      xcodebuild(defines, options)
+
+      if @mangle
+        return build_with_mangling(options)
+      end
+
+      defines
+    end
+
     def static_linker_defines
       static_libs = static_libs_in_sandbox('build') + static_libs_in_sandbox('build-sim')
       static_libs = static_libs.map { |path| Pathname("#{Dir.pwd}/#{path}").parent.to_s }
@@ -245,9 +268,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)
 

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

@@ -18,12 +18,29 @@ module Pod
 
         archs = []
         dynamic_target = Pod::PodTarget.new(dynamic_sandbox, BuildType.dynamic_framework, static_target.user_build_configurations, archs, platform, static_target.specs, static_target.target_definitions, file_accessors)
+        ln_source_to_dynamic_target(static_installer,dynamic_sandbox)
         dynamic_target
       end
       alias copy_dynamic_target_t copy_dynamic_target
       def copy_dynamic_target(static_sandbox, _dynamic_target, dynamic_sandbox)
-        command = "ln -sf #{static_sandbox.root}/#{@spec.name} #{dynamic_sandbox.root}"
-        `#{command}`
+        if Dir.exist? static_sandbox.root+@spec.name
+          command = "ln -sf #{static_sandbox.root}/#{@spec.name} #{dynamic_sandbox.root}"
+          `#{command}`
+        end
+      end
+
+      def ln_source_to_dynamic_target(static_installer, dynamic_sandbox)
+        if not Dir.exist? static_installer.sandbox.root+@spec.name
+          file_accessors = static_installer.pod_targets.select { |t| t.pod_name == @spec.name }.flat_map(&:file_accessors)
+          if file_accessors && file_accessors.length > 0
+            source_root = file_accessors[0].path_list.root
+            command = "ln -sf #{source_root} #{dynamic_sandbox.root}/#{@spec.name}"
+            `#{command}`
+          else
+            UI.puts "#{@spec.name} 根目录找不到"
+
+          end
+        end
       end
 
       alias write_pod_project_t write_pod_project

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

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

metadata

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