cocoapods-fy-bin 0.1.5 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 051f76a29803d0b551a611de84c54c8c818e64f3fbd93289be027f8392640c88
-  data.tar.gz: 8183208c3b697a7a664dd692bc720a83595c56ea7546ef08e34b11af2fc2f100
+  metadata.gz: 1d7b3392b5c0f86ef30102bdfaa6082789a6551bd29b89882a2169017f52e4ce
+  data.tar.gz: 84883396084cd316e277e2d8e4221365aecff4ac4861b76e6397bcdda8c90f31
 SHA512:
-  metadata.gz: 0b5e192c7d09eca7258698ac67a12a1ccee679e963b013a753d2ba38cfacf94d34b524e0cfa4401844c38bda11248cedd012cb7cc65c11498f75abd14d31b560
-  data.tar.gz: 2a644bd033819e45445cc657700fa8abb4d853dd8cd1cd3ec0e98dd1677cf8b332ac4dfc4d1d9306278484aa43a735ad91b6a7bdbec98598705b59c4aa9d8e4d
+  metadata.gz: 641a61b03a5744633f16a913aa3da2b85c7d6b1f9f1988728e174e0378239b3dbf83c95e4c36fd9901a099fd64a83d7fe2b58224706f6de6f889b6da362416d5
+  data.tar.gz: 64b8b127610c403e399686b347fdf346d2cc1d0f8b8c70142140b47c376f0aa738dc6d24b9759053c5dc8adace34892a35a179a25bc776d659dc23d2ebcbb552

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

@@ -59,6 +59,7 @@ module Pod
           @archs = argv.option('archs', 'armv7,arm64')
           @pre_build_shell = argv.option('pre_build_shell') || ''
           @suf_build_shell = argv.option('suf_build_shell') || ''
+          @build_permission = argv.option('build_permission') || ''
           @toolchain = argv.option('toolchain') || ''
           @config = argv.option('configuration', 'Release')
 
@@ -96,6 +97,7 @@ module Pod
                                             @archs,
                                             @pre_build_shell,
                                             @suf_build_shell,
+                                            @build_permission,
                                             @toolchain,
                                             CBin::Config::Builder.instance.white_pod_list.include?(@spec.name),
                                             @config)

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

@@ -24,7 +24,8 @@ module Pod
               ['--archs', "需要二进制组件的架构"],
               ['--pre_build_shell', "xcodebuild前的脚本命令"],
               ['--suf_build_shell', "xcodebuild后的脚本命令"],
-              ['--toolchain', "设置toolchain"]
+              ['--toolchain', "设置toolchain"],
+              ['--build_permission', "xcodebuild权限"]
           ].concat(Pod::Command::Gen.options).concat(super).uniq
         end
 
@@ -44,6 +45,7 @@ module Pod
           @archs = argv.flag?('archs', 'arm64')
           @pre_build_shell = argv.option('pre_build_shell') || ''
           @suf_build_shell = argv.option('suf_build_shell') || ''
+          @build_permission = argv.option('build_permission') || ''
           @toolchain = argv.option('toolchain') || ''
           @config = argv.option('configuration', 'Debug')
           @additional_args = argv.remainder!
@@ -138,6 +140,9 @@ module Pod
           if @suf_build_shell
             argvs += ["--suf_build_shell=#{@suf_build_shell}"]
           end
+          if @build_permission
+            argvs += ["--build_permission=#{@build_permission}"]
+          end
           if @toolchain
             argvs += ["--toolchain=#{@toolchain}"]
           end

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

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

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

@@ -22,6 +22,7 @@ module CBin
                      archs,
                      pre_build_shell,
                      suf_build_shell,
+                     build_permission,
                      toolchain,
                      skip_archive = false,
                      build_model="Release")
@@ -33,6 +34,7 @@ module CBin
         @archs = archs
         @pre_build_shell = pre_build_shell
         @suf_build_shell = suf_build_shell
+        @build_permission = build_permission
         @toolchain = toolchain
         @skip_archive = skip_archive
         @framework_output = framework_output
@@ -62,7 +64,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, @suf_build_shell, @toolchain, @isRootSpec, @build_model)
+          builder = CBin::Framework::Builder.new(@spec, file_accessor, @platform, source_dir, @archs, @pre_build_shell, @suf_build_shell, @build_permission, @toolchain, @isRootSpec, @build_model)
           @@build_defines = builder.build if @isRootSpec
           begin
             @framework_path = builder.lipo_build(@@build_defines) unless @skip_archive
@@ -76,7 +78,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_shell, @framework_path)
+          builder = CBin::Library::Builder.new(@spec, file_accessor, @platform, source_dir , @archs, @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_shell, suf_build_shell, toolchain, isRootSpec = true, build_model="Debug")
+      def initialize(spec, file_accessor, platform, source_dir, archs, pre_build_shell, suf_build_shell, build_permission, toolchain, isRootSpec = true, build_model="Debug")
         @spec = spec
         @source_dir = source_dir
         @file_accessor = file_accessor
@@ -20,6 +20,7 @@ module CBin
         @archs = archs
         @pre_build_shell = pre_build_shell
         @suf_build_shell = suf_build_shell
+        @build_permission = build_permission
         @toolchain = toolchain
         #vendored_static_frameworks 只有 xx.framework  需要拼接为 xx.framework/xx by slj
         vendored_static_frameworks = file_accessor.vendored_static_frameworks.map do |framework|
@@ -186,6 +187,7 @@ module CBin
             # -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)
           end
+        suf_build_command
         # else
           # xcodebuild(defines,options)
         # end
@@ -250,10 +252,10 @@ module CBin
       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 = "#{@build_permission}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 = "#{@build_permission}xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration #{build_model} -target #{target_name} -project ./Pods.xcodeproj 2>&1"
           puts command
         end
 

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-fy-bin
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.8
 platform: ruby
 authors:
 - dr
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-07 00:00:00.000000000 Z
+date: 2022-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel