cocoapods-packager-ext 0.0.35 → 0.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06bc606336fe05543708fe279c8510b0a14140b8cdadd9f5626f6a1034fcf734
-  data.tar.gz: 2419dd1bdd1d8143ae4ea7c247bd862739bed0eab726e3c4b87eeedbca15db61
+  metadata.gz: b16d76f32b0b7b59eb3b83e52d11ab527aa43a8e69e3e7c143e12940490c0f08
+  data.tar.gz: e247f9e36013617ebdb8838a8e41fc6e84b03091a0e2d036327113aeea824076
 SHA512:
-  metadata.gz: 259ce3729f900080bdcf8934b13dcf796905881a447ee40651317e692be94f4a5b083e2d1cf7b2d5562a4c5c1a1a2e2ef5fa6dc857bdd14eef14d9bf0490fd7a
-  data.tar.gz: 3cb6310654d3c74661912500c53bd171f1aaab6ec1de6c46dbbca4fa3cc99de0a73994c2113906f0196fae7d30346f02b3d17d1d03dea3d774a591339a1dc429
+  metadata.gz: 355011736958b8e2806766ed83d77a17dfa89b11e227b2d5db3fba04358fccac38be736f11943d555fc6579ee33f00ea6ad6e54d9108153246fd3ee5c8bfb1b7
+  data.tar.gz: 833e373bef5a9cccb689cf659688953d6af73a6849603725da17d10539d26f993a5c5ef6320b4ae2d45e221df5798bde1415ddcdb25d991255a809be98293916

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 }
@@ -241,6 +264,7 @@ MAP
       end
 
       command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration #{config} -target #{target} -project #{project_root}/Pods.xcodeproj 2>&1"
+      UI.puts "exec command: #{command}"
       output = `#{command}`.lines.to_a
 
       if $?.exitstatus != 0

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.35"
+  VERSION = "0.0.39"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-packager-ext
 version: !ruby/object:Gem::Version
-  version: 0.0.35
+  version: 0.0.39
 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