cocoapods-fy-bin 0.1.3 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfbe15f09b3aece53749debbbdbe6dd608e3aa2d4e1eb28f1b50a489126f3649
-  data.tar.gz: ba4f8ed697e8ba9c1042b02c5b013babc4ce92f392be0d5a7d768ed995277ef6
+  metadata.gz: a0366cd54caf14a564266fc214c5d60fbe97d96773b4354ea0e69a0696160f41
+  data.tar.gz: 6f8122f4f8f4e067f4e8f18163a930612fb8c5f2a452b7b8e81da4b98c6034b4
 SHA512:
-  metadata.gz: ad083e5e22c74dc74c4d1b65a91bbbd0ae7e945e00b279c17b8337f2f8bfb83ea5d94534ab0af984f4f0359e514f886acfe8f58f9606acc5294760b4732d2cb5
-  data.tar.gz: 8efa614a3381cca34b80c129c226ca709e99b0e9444328cdbea906fecf5e575c7f505aa4586faa7dc1d725a7a1e361a19d38bc0b79d1815180ea24520db82e14
+  metadata.gz: 0eb16f11626788cda94240af0e863cd41b1654a0245305c520c543205cdcfdf88f371cb96f680061f7ed0f9224e991b4a646ea5b197c3b373649cf57a3dd21f4
+  data.tar.gz: f0a5bc9d0e07d5aa3edd87a9a21b1c1cb76d776b3e3b4acebfaa928f0c3194b2fd8218b31ed2852c2ce67ca405d96b4fa4bab8078d2b7b8475f4e1ebb26068aa

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.3'
+  VERSION = '0.1.6'
 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 = "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
 
@@ -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.3
+  version: 0.1.6
 platform: ruby
 authors:
 - dr