cocoapods-fy-bin 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c74b770ea4b7bbe73552a6e712806ecfeb15f5577f5af3ceaf9e32b2c7ca572c
-  data.tar.gz: c0214a11e1d99cd967c761435a97b8fff1b10279bdba3bdb0030295c76ebb8e0
+  metadata.gz: dfbe15f09b3aece53749debbbdbe6dd608e3aa2d4e1eb28f1b50a489126f3649
+  data.tar.gz: ba4f8ed697e8ba9c1042b02c5b013babc4ce92f392be0d5a7d768ed995277ef6
 SHA512:
-  metadata.gz: 9b24eea4630d9d98291eb273fe40f0063d9c22a703461f88e05507d81de51211c41ba642a72872e850cc6c39bac8872b28b9a1bea23fbab2e727e5af4e4f3a21
-  data.tar.gz: d19f8b103b16f37de2a8fb3c0e2fefed7bf7fccd3118d05fec05ad7679c6d0d46b75ede01bcddb6de190e6498690ab3e7a6cba68936ca26c6fe03a430279faba
+  metadata.gz: ad083e5e22c74dc74c4d1b65a91bbbd0ae7e945e00b279c17b8337f2f8bfb83ea5d94534ab0af984f4f0359e514f886acfe8f58f9606acc5294760b4732d2cb5
+  data.tar.gz: 8efa614a3381cca34b80c129c226ca709e99b0e9444328cdbea906fecf5e575c7f505aa4586faa7dc1d725a7a1e361a19d38bc0b79d1815180ea24520db82e14

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_shells', "xcodebuild前的脚本命令"]
+              ['--pre_build_shell', "xcodebuild前的脚本命令"],
+              ['--toolchain', "设置toolchain"]
           ].concat(Pod::Command::Gen.options).concat(super).uniq
         end
 
@@ -55,7 +56,8 @@ module Pod
           @sources = argv.option('sources') || []
           @platform = Platform.new(:ios)
           @archs = argv.option('archs', 'armv7,arm64')
-          @pre_build_shells = argv.option('pre_build_shells', '')
+          @pre_build_shell = argv.option('pre_build_shell') || ''
+          @toolchain = argv.option('toolchain') || ''
           @config = argv.option('configuration', 'Release')
 
           @framework_path
@@ -90,7 +92,8 @@ module Pod
                                             @zip,
                                             @spec,
                                             @archs,
-                                            @pre_build_shells,
+                                            @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_shells', "xcodebuild前的脚本命令"]
+              ['--pre_build_shell', "xcodebuild前的脚本命令"],
+              ['--toolchain', "设置toolchain"]
           ].concat(Pod::Command::Gen.options).concat(super).uniq
         end
 
@@ -40,7 +41,8 @@ module Pod
           @all_make = argv.flag?('all-make', false)
           @verbose = argv.flag?('verbose', true)
           @archs = argv.flag?('archs', 'arm64')
-          @pre_build_shells = argv.flag?('pre_build_shells', '')
+          @pre_build_shell = argv.option('pre_build_shell') || ''
+          @toolchain = argv.option('toolchain') || ''
           @config = argv.option('configuration', 'Debug')
           @additional_args = argv.remainder!
 
@@ -128,8 +130,11 @@ module Pod
           if @archs
             argvs += ["--archs=#{@archs}"]
           end
-          if @pre_build_shells
-            argvs += ["--pre_build_shells=#{@pre_build_shells}"]
+          if @pre_build_shell
+            argvs += ["--pre_build_shell=#{@pre_build_shell}"]
+          end
+          if @toolchain
+            argvs += ["--toolchain=#{@toolchain}"]
           end
           argvs += ["--configuration=#{@config}"]
           

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

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.1.0'
+  VERSION = '0.1.3'
 end
 
 module Pod

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

@@ -20,7 +20,8 @@ module CBin
                      zip,
                      rootSpec,
                      archs,
-                     pre_build_shells,
+                     pre_build_shell,
+                     toolchain,
                      skip_archive = false,
                      build_model="Release")
         @spec = spec
@@ -29,7 +30,8 @@ module CBin
         @rootSpec = rootSpec
         @isRootSpec = rootSpec.name == spec.name
         @archs = archs
-        @pre_build_shells = pre_build_shells
+        @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_shells, @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
@@ -72,7 +74,7 @@ module CBin
         source_dir = zip_dir
         file_accessor = Sandbox::FileAccessor.new(Pathname.new('.').expand_path, @spec.consumer(@platform))
         Dir.chdir(workspace_directory) do
-          builder = CBin::Library::Builder.new(@spec, file_accessor, @platform, source_dir , @archs, @pre_build_shells, @framework_path)
+          builder = CBin::Library::Builder.new(@spec, file_accessor, @platform, source_dir , @archs, @pre_build_shell, @framework_path)
           builder.build
         end
       end

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_shells, 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
@@ -18,7 +18,8 @@ module CBin
         @build_model = build_model
         @isRootSpec = isRootSpec
         @archs = archs
-        @pre_build_commands = pre_build_shells
+        @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
@@ -75,7 +76,7 @@ module CBin
 
         # archs = %w[i386 x86_64]
         archs = ios_architectures_sim
-        pre_build_shell
+        pre_build_command
         archs.map do |arch|
           xcodebuild(defines, "-sdk iphonesimulator ARCHS=\'#{arch}\' ", "build-#{arch}",@build_model)
         end
@@ -171,12 +172,14 @@ 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
           # archs = %w[arm64 armv7 armv7s]
-          pre_build_shell
+          pre_build_command
           archs.map do |arch|
             # -fembed-bitcode支持bitcode BUILD_LIBRARY_FOR_DISTRIBUTION=YES 构建向后兼容的framework
             xcodebuild(defines, "ARCHS=\'#{arch}\' OTHER_CFLAGS=\'-fembed-bitcode -Qunused-arguments\' DEBUG_INFORMATION_FORMAT=\'dwarf-with-dsym\' BUILD_LIBRARY_FOR_DISTRIBUTION=YES","build-#{arch}",@build_model)
@@ -203,9 +206,9 @@ module CBin
       end
 
       # 编译前需执行的的shell脚本
-      def pre_build_shell
-        @pre_build_commands.each do |command_arg|
-          command = "sh #{command_arg}"
+      def pre_build_command
+        unless @pre_build_shell.empty? then
+          command = "sh #{@pre_build_shell}"
           puts command
           UI.message "command = #{command}"
           output = `#{command}`.lines.to_a

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

@@ -11,14 +11,14 @@ module CBin
     class Builder
       include Pod
 
-      def initialize(spec, file_accessor, platform, source_dir, archs, pre_build_shells, framework_path)
+      def initialize(spec, file_accessor, platform, source_dir, archs, pre_build_shell, framework_path)
         @spec = spec
         @source_dir = source_dir
         @file_accessor = file_accessor
         @platform = platform
         @framework = framework_path
         @archs = archs
-        @pre_build_shells = pre_build_shells
+        @pre_build_shell = pre_build_shell
         @source_files = "#{@source_dir}/#{library.name_path}"
         @source_zip_file = "#{@source_files}.zip"
       end

metadata

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