cocoapods-fy-bin 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cde9c2113365214bafc0dc783ae238b2547753c74c7f53541ff4f780b11608b
-  data.tar.gz: fcd9346532f14f66642cf518c0ad66ec373e269d5c7a246823d57bb9289966d7
+  metadata.gz: 051f76a29803d0b551a611de84c54c8c818e64f3fbd93289be027f8392640c88
+  data.tar.gz: 8183208c3b697a7a664dd692bc720a83595c56ea7546ef08e34b11af2fc2f100
 SHA512:
-  metadata.gz: 852a379929907b914d0f5af1b92211e03b8bceb174a8d160705cd22c1d158ecf63f7c9df0bf0bd168c365e9d09bd79e7f63d7fb97939d11a8623bb1b18a1f91c
-  data.tar.gz: 54cff8f722c75f1bb9e9836ffe16e55022cdf1ddace2e568824d84678168c8db4abf388f1a3938df16fbaec28ebc29db028ec5bb1ca0119ad933b3c3d0e49553
+  metadata.gz: 0b5e192c7d09eca7258698ac67a12a1ccee679e963b013a753d2ba38cfacf94d34b524e0cfa4401844c38bda11248cedd012cb7cc65c11498f75abd14d31b560
+  data.tar.gz: 2a644bd033819e45445cc657700fa8abb4d853dd8cd1cd3ec0e98dd1677cf8b332ac4dfc4d1d9306278484aa43a735ad91b6a7bdbec98598705b59c4aa9d8e4d

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

@@ -33,6 +33,7 @@ module Pod
               ['--env', "该组件上传的环境 %w[debug release]"],
               ['--archs', "需要二进制组件的架构"],
               ['--pre_build_shell', "xcodebuild前的脚本命令"],
+              ['--suf_build_shell', "xcodebuild后的脚本命令"],
               ['--toolchain', "设置toolchain"]
           ].concat(Pod::Command::Gen.options).concat(super).uniq
         end
@@ -57,6 +58,7 @@ module Pod
           @platform = Platform.new(:ios)
           @archs = argv.option('archs', 'armv7,arm64')
           @pre_build_shell = argv.option('pre_build_shell') || ''
+          @suf_build_shell = argv.option('suf_build_shell') || ''
           @toolchain = argv.option('toolchain') || ''
           @config = argv.option('configuration', 'Release')
 
@@ -93,6 +95,7 @@ module Pod
                                             @spec,
                                             @archs,
                                             @pre_build_shell,
+                                            @suf_build_shell,
                                             @toolchain,
                                             CBin::Config::Builder.instance.white_pod_list.include?(@spec.name),
                                             @config)

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

@@ -23,6 +23,7 @@ module Pod
               ['--env', "该组件上传的环境 %w[debug release]"],
               ['--archs', "需要二进制组件的架构"],
               ['--pre_build_shell', "xcodebuild前的脚本命令"],
+              ['--suf_build_shell', "xcodebuild后的脚本命令"],
               ['--toolchain', "设置toolchain"]
           ].concat(Pod::Command::Gen.options).concat(super).uniq
         end
@@ -42,6 +43,7 @@ module Pod
           @verbose = argv.flag?('verbose', true)
           @archs = argv.flag?('archs', 'arm64')
           @pre_build_shell = argv.option('pre_build_shell') || ''
+          @suf_build_shell = argv.option('suf_build_shell') || ''
           @toolchain = argv.option('toolchain') || ''
           @config = argv.option('configuration', 'Debug')
           @additional_args = argv.remainder!
@@ -133,6 +135,9 @@ module Pod
           if @pre_build_shell
             argvs += ["--pre_build_shell=#{@pre_build_shell}"]
           end
+          if @suf_build_shell
+            argvs += ["--suf_build_shell=#{@suf_build_shell}"]
+          end
           if @toolchain
             argvs += ["--toolchain=#{@toolchain}"]
           end

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

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

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

@@ -21,6 +21,7 @@ module CBin
                      rootSpec,
                      archs,
                      pre_build_shell,
+                     suf_build_shell,
                      toolchain,
                      skip_archive = false,
                      build_model="Release")
@@ -31,6 +32,7 @@ module CBin
         @isRootSpec = rootSpec.name == spec.name
         @archs = archs
         @pre_build_shell = pre_build_shell
+        @suf_build_shell = suf_build_shell
         @toolchain = toolchain
         @skip_archive = skip_archive
         @framework_output = framework_output
@@ -60,7 +62,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, @toolchain, @isRootSpec, @build_model)
+          builder = CBin::Framework::Builder.new(@spec, file_accessor, @platform, source_dir, @archs, @pre_build_shell, @suf_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, toolchain, isRootSpec = true, build_model="Debug")
+      def initialize(spec, file_accessor, platform, source_dir, archs, pre_build_shell, suf_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
+        @suf_build_shell = suf_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|
@@ -80,7 +81,7 @@ module CBin
         archs.map do |arch|
           xcodebuild(defines, "-sdk iphonesimulator ARCHS=\'#{arch}\' ", "build-#{arch}",@build_model)
         end
-
+        suf_build_command
       end
 
 
@@ -169,12 +170,13 @@ module CBin
       end
 
       def compile
-        defines = "GCC_PREPROCESSOR_DEFINITIONS='$(inherited)'"
-        defines += "  SWIFT_ACTIVE_COMPILATION_CONDITIONS='$(inherited)' "
-        defines += @spec.consumer(@platform).compiler_flags.join(' ')
+        defines = ""
         unless @toolchain.empty? then
           defines += "-toolchain \"#{@toolchain}\""
         end
+        defines += "GCC_PREPROCESSOR_DEFINITIONS='$(inherited)'"
+        defines += "  SWIFT_ACTIVE_COMPILATION_CONDITIONS='$(inherited)' "
+        defines += @spec.consumer(@platform).compiler_flags.join(' ')
         options = ios_build_options
         # if is_debug_model
           archs = ios_architectures
@@ -225,13 +227,33 @@ module CBin
         end
       end
 
+      # 编译后需执行的的shell脚本
+      def suf_build_command
+        unless @suf_build_shell.empty? then
+          command = "sh #{@suf_build_shell}"
+          puts command
+          UI.message "command = #{command}"
+          output = `#{command}`.lines.to_a
+
+          if $CHILD_STATUS.exitstatus != 0
+            raise <<~EOF
+            Shell command failed: #{command}
+            Output:
+            #{output.map { |line| "    #{line}" }.join}
+            EOF
+
+            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 = "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"
+          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"
           puts command
         else
-          command = "sudo xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration #{build_model} -target #{target_name} -project ./Pods.xcodeproj 2>&1"
+          command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration #{build_model} -target #{target_name} -project ./Pods.xcodeproj 2>&1"
           puts command
         end
 
@@ -239,6 +261,7 @@ module CBin
         output = `#{command}`.lines.to_a
 
         if $CHILD_STATUS.exitstatus != 0
+          suf_build_command
           raise <<~EOF
             Build command failed: #{command}
             Output:

metadata

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