cocoapods-fy-bin 0.0.9 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 349f56acd81d29471129eed2a459165a89fbd3b8558b118f9b531441bae5d8cc
-  data.tar.gz: 21b8eca394a490c8df72db1aed106272ad877065e18b6420da0a75e75edfc930
+  metadata.gz: 27ca77f7e13d94ec0a6aad54d5455bc9b2123451d22fd1b4f1aad4a5a9df0901
+  data.tar.gz: b849bbb48f53940fadac933adae49c6b2e69fca3b0c2b3305c2202dc6505dd30
 SHA512:
-  metadata.gz: 238a5aca517a885d3d08ac700c8af22607511e1c3dc7beb4d1f199b3afdaadec6e57d0974463f14db8f4e22ce88a6d3028179102ccbb77b8a6d68ceff4e992b2
-  data.tar.gz: ce69f0aa064cbac03c582852b1b667b69838d8042eb15a5b6fe3e4c3a06afb7165dfdc576853352086ace3ef29f5a4d62224336565440bee826004f5ee8b14c5
+  metadata.gz: b0025dcd7e6064523a2d7446c6da8bb990913769addab3d13d2f5d60f7a776858af9338effdb6568daa91a370b46fc556df0cbee6471d94173ee63f4a1ecce61
+  data.tar.gz: 1f4df164c4a91f40fba2d4d28f6e7edca6807828a156bc4225594a98ce4b501d6f67df2de5d37e0e7141e8f7fdd52ed42620a05acaec2a7a0a3215067e993d1a

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

@@ -32,7 +32,7 @@ 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前的脚本命令"]
           ].concat(Pod::Command::Gen.options).concat(super).uniq
         end
 
@@ -55,7 +55,7 @@ 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') || ''
           @config = argv.option('configuration', 'Release')
 
           @framework_path
@@ -90,7 +90,7 @@ module Pod
                                             @zip,
                                             @spec,
                                             @archs,
-                                            @pre_build_shells,
+                                            @pre_build_shell,
                                             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,7 @@ 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前的脚本命令"]
           ].concat(Pod::Command::Gen.options).concat(super).uniq
         end
 
@@ -40,7 +40,7 @@ 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') || ''
           @config = argv.option('configuration', 'Debug')
           @additional_args = argv.remainder!
 
@@ -128,8 +128,8 @@ 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
           argvs += ["--configuration=#{@config}"]
           

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

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.0.9'
+  VERSION = '0.1.2'
 end
 
 module Pod

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

@@ -20,7 +20,7 @@ module CBin
                      zip,
                      rootSpec,
                      archs,
-                     pre_build_shells,
+                     pre_build_shell,
                      skip_archive = false,
                      build_model="Release")
         @spec = spec
@@ -29,7 +29,7 @@ module CBin
         @rootSpec = rootSpec
         @isRootSpec = rootSpec.name == spec.name
         @archs = archs
-        @pre_build_shells = pre_build_shells
+        @pre_build_shell = pre_build_shell
         @skip_archive = skip_archive
         @framework_output = framework_output
         @zip = zip
@@ -58,7 +58,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, @isRootSpec, @build_model)
           @@build_defines = builder.build if @isRootSpec
           begin
             @framework_path = builder.lipo_build(@@build_defines) unless @skip_archive
@@ -72,7 +72,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, isRootSpec = true, build_model="Debug")
         @spec = spec
         @source_dir = source_dir
         @file_accessor = file_accessor
@@ -18,7 +18,7 @@ module CBin
         @build_model = build_model
         @isRootSpec = isRootSpec
         @archs = archs
-        @pre_build_commands = pre_build_shells
+        @pre_build_shell = pre_build_shell
         #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 +75,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
@@ -176,7 +176,7 @@ module CBin
         # 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,10 +203,9 @@ module CBin
       end
 
       # 编译前需执行的的shell脚本
-      def pre_build_shell
-        command_args = @pre_build_commands.split(",")
-        command_args.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.0.9
+  version: 0.1.2
 platform: ruby
 authors:
 - dr