cocoapods-packager-ext 0.0.33 → 0.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 666bf99ad7bef68dce559b4102ba7eba97699de43128cad3283feb706ee0b165
-  data.tar.gz: 4cdd6ef5bb2f576c038b13a320f288b7e11a08052267c50685d0b06ae9240315
+  metadata.gz: 5ad2bac85151291f7b57d8c6537b717cd223909e0c3a4ac9295b05739b43c4b5
+  data.tar.gz: ec0b8db3e48ec15668aacc5bd03684bbe381faea86f26a0d2fdf50901e951d20
 SHA512:
-  metadata.gz: 5ac87c3210c7d6af667263b113ca9d74d09e2a929131906ddb7851921016f72a5b4de76a022a420fd544dfe1842a936ebfc1dd7146ab10d173fb08484bb67893
-  data.tar.gz: 57a875b65878a040c97f8042d1703d01db2ae50dc8cbf7a62066d173b8bc8f43fe63c6f92b9ec4e856791e6030c8e67b0b014de9a189e91497670b3177d84d48
+  metadata.gz: 5a12db24915242da8ee55723ae404e19bd9cbb30d41ee8d6a4982d0767eac442c0c88e1790820c0bc548b4e55f1b5c9c6d394127c8067bf76393f93c06e8fe09
+  data.tar.gz: b99ca30d3df7995ade41d1129ed8cba2f074f0dec277816dc862cbc4a6e39142dc09acb0a19801357f820496d65d52e8515168ae2f3f789e74ff00e5a81d9bb2

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
@@ -132,6 +134,7 @@ RB
                         if(sub =~ /-dummy.m$/)
                             File.open("#{path}/#{sub}",'w')do |file|
                                 file.write('')
+                                UI.message " - clean dummy file:#{sub}"
                             end
                         end
                     end
@@ -150,10 +153,14 @@ RB
                 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)
+                    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(

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

@@ -89,6 +89,28 @@ module Pod
       end
     end
 
+    alias compile_t compile
+    def compile
+      defines = "GCC_PREPROCESSOR_DEFINITIONS='$(inherited) PodsDummy_Pods_#{@spec.name}=PodsDummy_PodPackage_#{@spec.name}'"
+      if ENV['GCC_PREPROCESSOR_DEFINITIONS']
+        defines << ' ' << " #{ENV['GCC_PREPROCESSOR_DEFINITIONS']}"
+        UI.puts "Set GCC_PREPROCESSOR_DEFINITIONS:#{defines}"
+      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 +267,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.33"
+  VERSION = "0.0.37"
 end

metadata

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