cocoapods-fy-bin 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 903d552160f64b602e42d047b1fe988fa929552de5367eec788a8504aa728f8f
-  data.tar.gz: a4dea89c78f4f46bcdaf23727edc749985bcf005ad2e259d0fca24a6e66a6c73
+  metadata.gz: 1cde9c2113365214bafc0dc783ae238b2547753c74c7f53541ff4f780b11608b
+  data.tar.gz: fcd9346532f14f66642cf518c0ad66ec373e269d5c7a246823d57bb9289966d7
 SHA512:
-  metadata.gz: 63973a62bbe459379dd395d2115c063839d4dce25c9262f4809ab00cd1a17623f664965a972ffd1ef26322c550d07717db84a471d75bd8e53f92836d39aa777d
-  data.tar.gz: 82f61369e2eaa1159b8f13bb51fb12b1c033c13ed6e86cfbe68d1caf18af0a6d6cac7da9eb7cb80dcc17d22cc5e265435709e0a930057e66cd27936b653d8a42
+  metadata.gz: 852a379929907b914d0f5af1b92211e03b8bceb174a8d160705cd22c1d158ecf63f7c9df0bf0bd168c365e9d09bd79e7f63d7fb97939d11a8623bb1b18a1f91c
+  data.tar.gz: 54cff8f722c75f1bb9e9836ffe16e55022cdf1ddace2e568824d84678168c8db4abf388f1a3938df16fbaec28ebc29db028ec5bb1ca0119ad933b3c3d0e49553

data/lib/cocoapods-fy-bin/command/bin/archive.rb

@@ -32,7 +32,8 @@ module Pod
               ['--configuration', 'Build the specified configuration (e.g. Debug). Defaults to Release'],
               ['--env', "该组件上传的环境 %w[debug release]"],
               ['--archs', "需要二进制组件的架构"],
-              ['--pre_build_shell', "xcodebuild前的脚本命令"]
+              ['--pre_build_shell', "xcodebuild前的脚本命令"],
+              ['--toolchain', "设置toolchain"]
           ].concat(Pod::Command::Gen.options).concat(super).uniq
         end
 
@@ -56,6 +57,7 @@ module Pod
           @platform = Platform.new(:ios)
           @archs = argv.option('archs', 'armv7,arm64')
           @pre_build_shell = argv.option('pre_build_shell') || ''
+          @toolchain = argv.option('toolchain') || ''
           @config = argv.option('configuration', 'Release')
 
           @framework_path
@@ -91,6 +93,7 @@ module Pod
                                             @spec,
                                             @archs,
                                             @pre_build_shell,
+                                            @toolchain,
                                             CBin::Config::Builder.instance.white_pod_list.include?(@spec.name),
                                             @config)
           builder.build

data/lib/cocoapods-fy-bin/command/bin/auto.rb

@@ -22,7 +22,8 @@ module Pod
               ['--configuration', 'Build the specified configuration (e.g. Release ). Defaults to Debug'],
               ['--env', "该组件上传的环境 %w[debug release]"],
               ['--archs', "需要二进制组件的架构"],
-              ['--pre_build_shell', "xcodebuild前的脚本命令"]
+              ['--pre_build_shell', "xcodebuild前的脚本命令"],
+              ['--toolchain', "设置toolchain"]
           ].concat(Pod::Command::Gen.options).concat(super).uniq
         end
 
@@ -41,6 +42,7 @@ module Pod
           @verbose = argv.flag?('verbose', true)
           @archs = argv.flag?('archs', 'arm64')
           @pre_build_shell = argv.option('pre_build_shell') || ''
+          @toolchain = argv.option('toolchain') || ''
           @config = argv.option('configuration', 'Debug')
           @additional_args = argv.remainder!
 
@@ -131,6 +133,9 @@ module Pod
           if @pre_build_shell
             argvs += ["--pre_build_shell=#{@pre_build_shell}"]
           end
+          if @toolchain
+            argvs += ["--toolchain=#{@toolchain}"]
+          end
           argvs += ["--configuration=#{@config}"]
           
           archive = Pod::Command::Bin::Archive.new(CLAide::ARGV.new(argvs))

data/lib/cocoapods-fy-bin/gem_version.rb

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.1.1'
+  VERSION = '0.1.4'
 end
 
 module Pod

data/lib/cocoapods-fy-bin/helpers/build_helper.rb

@@ -21,6 +21,7 @@ module CBin
                      rootSpec,
                      archs,
                      pre_build_shell,
+                     toolchain,
                      skip_archive = false,
                      build_model="Release")
         @spec = spec
@@ -30,6 +31,7 @@ module CBin
         @isRootSpec = rootSpec.name == spec.name
         @archs = archs
         @pre_build_shell = pre_build_shell
+        @toolchain = toolchain
         @skip_archive = skip_archive
         @framework_output = framework_output
         @zip = zip
@@ -58,7 +60,7 @@ module CBin
         source_dir = Dir.pwd
         file_accessor = Sandbox::FileAccessor.new(Pathname.new('.').expand_path, @spec.consumer(@platform))
         Dir.chdir(workspace_directory) do
-          builder = CBin::Framework::Builder.new(@spec, file_accessor, @platform, source_dir, @archs, @pre_build_shell, @isRootSpec, @build_model)
+          builder = CBin::Framework::Builder.new(@spec, file_accessor, @platform, source_dir, @archs, @pre_build_shell, @toolchain, @isRootSpec, @build_model)
           @@build_defines = builder.build if @isRootSpec
           begin
             @framework_path = builder.lipo_build(@@build_defines) unless @skip_archive

data/lib/cocoapods-fy-bin/helpers/framework_builder.rb

@@ -10,7 +10,7 @@ module CBin
     class Builder
       include Pod
 #Debug下还待完成
-      def initialize(spec, file_accessor, platform, source_dir, archs, pre_build_shell, isRootSpec = true, build_model="Debug")
+      def initialize(spec, file_accessor, platform, source_dir, archs, pre_build_shell, toolchain, isRootSpec = true, build_model="Debug")
         @spec = spec
         @source_dir = source_dir
         @file_accessor = file_accessor
@@ -19,6 +19,7 @@ module CBin
         @isRootSpec = isRootSpec
         @archs = archs
         @pre_build_shell = pre_build_shell
+        @toolchain = toolchain
         #vendored_static_frameworks 只有 xx.framework  需要拼接为 xx.framework/xx by slj
         vendored_static_frameworks = file_accessor.vendored_static_frameworks.map do |framework|
           path = framework
@@ -171,7 +172,9 @@ module CBin
         defines = "GCC_PREPROCESSOR_DEFINITIONS='$(inherited)'"
         defines += "  SWIFT_ACTIVE_COMPILATION_CONDITIONS='$(inherited)' "
         defines += @spec.consumer(@platform).compiler_flags.join(' ')
-
+        unless @toolchain.empty? then
+          defines += "-toolchain \"#{@toolchain}\""
+        end
         options = ios_build_options
         # if is_debug_model
           archs = ios_architectures
@@ -204,6 +207,7 @@ module CBin
 
       # 编译前需执行的的shell脚本
       def pre_build_command
+        unless @pre_build_shell.empty? then
           command = "sh #{@pre_build_shell}"
           puts command
           UI.message "command = #{command}"
@@ -218,15 +222,16 @@ module CBin
 
             Process.exit
           end
+        end
       end
 
       def xcodebuild(defines = '', args = '', build_dir = 'build', build_model = 'Debug')
 
         unless File.exist?("Pods.xcodeproj") #cocoapods-generate v2.0.0
-          command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{File.join(File.expand_path("..", build_dir), File.basename(build_dir))} clean build -configuration #{build_model} -target #{target_name} -project ./Pods/Pods.xcodeproj 2>&1"
+          command = "sudo xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{File.join(File.expand_path("..", build_dir), File.basename(build_dir))} clean build -configuration #{build_model} -target #{target_name} -project ./Pods/Pods.xcodeproj 2>&1"
           puts command
         else
-          command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration #{build_model} -target #{target_name} -project ./Pods.xcodeproj 2>&1"
+          command = "sudo xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration #{build_model} -target #{target_name} -project ./Pods.xcodeproj 2>&1"
           puts command
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-fy-bin
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
 platform: ruby
 authors:
 - dr