cocoapods-fy-bin 0.1.2 → 0.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 27ca77f7e13d94ec0a6aad54d5455bc9b2123451d22fd1b4f1aad4a5a9df0901
4
- data.tar.gz: b849bbb48f53940fadac933adae49c6b2e69fca3b0c2b3305c2202dc6505dd30
3
+ metadata.gz: dfbe15f09b3aece53749debbbdbe6dd608e3aa2d4e1eb28f1b50a489126f3649
4
+ data.tar.gz: ba4f8ed697e8ba9c1042b02c5b013babc4ce92f392be0d5a7d768ed995277ef6
5
5
  SHA512:
6
- metadata.gz: b0025dcd7e6064523a2d7446c6da8bb990913769addab3d13d2f5d60f7a776858af9338effdb6568daa91a370b46fc556df0cbee6471d94173ee63f4a1ecce61
7
- data.tar.gz: 1f4df164c4a91f40fba2d4d28f6e7edca6807828a156bc4225594a98ce4b501d6f67df2de5d37e0e7141e8f7fdd52ed42620a05acaec2a7a0a3215067e993d1a
6
+ metadata.gz: ad083e5e22c74dc74c4d1b65a91bbbd0ae7e945e00b279c17b8337f2f8bfb83ea5d94534ab0af984f4f0359e514f886acfe8f58f9606acc5294760b4732d2cb5
7
+ data.tar.gz: 8efa614a3381cca34b80c129c226ca709e99b0e9444328cdbea906fecf5e575c7f505aa4586faa7dc1d725a7a1e361a19d38bc0b79d1815180ea24520db82e14
@@ -32,7 +32,8 @@ module Pod
32
32
  ['--configuration', 'Build the specified configuration (e.g. Debug). Defaults to Release'],
33
33
  ['--env', "该组件上传的环境 %w[debug release]"],
34
34
  ['--archs', "需要二进制组件的架构"],
35
- ['--pre_build_shell', "xcodebuild前的脚本命令"]
35
+ ['--pre_build_shell', "xcodebuild前的脚本命令"],
36
+ ['--toolchain', "设置toolchain"]
36
37
  ].concat(Pod::Command::Gen.options).concat(super).uniq
37
38
  end
38
39
 
@@ -56,6 +57,7 @@ module Pod
56
57
  @platform = Platform.new(:ios)
57
58
  @archs = argv.option('archs', 'armv7,arm64')
58
59
  @pre_build_shell = argv.option('pre_build_shell') || ''
60
+ @toolchain = argv.option('toolchain') || ''
59
61
  @config = argv.option('configuration', 'Release')
60
62
 
61
63
  @framework_path
@@ -91,6 +93,7 @@ module Pod
91
93
  @spec,
92
94
  @archs,
93
95
  @pre_build_shell,
96
+ @toolchain,
94
97
  CBin::Config::Builder.instance.white_pod_list.include?(@spec.name),
95
98
  @config)
96
99
  builder.build
@@ -22,7 +22,8 @@ module Pod
22
22
  ['--configuration', 'Build the specified configuration (e.g. Release ). Defaults to Debug'],
23
23
  ['--env', "该组件上传的环境 %w[debug release]"],
24
24
  ['--archs', "需要二进制组件的架构"],
25
- ['--pre_build_shell', "xcodebuild前的脚本命令"]
25
+ ['--pre_build_shell', "xcodebuild前的脚本命令"],
26
+ ['--toolchain', "设置toolchain"]
26
27
  ].concat(Pod::Command::Gen.options).concat(super).uniq
27
28
  end
28
29
 
@@ -41,6 +42,7 @@ module Pod
41
42
  @verbose = argv.flag?('verbose', true)
42
43
  @archs = argv.flag?('archs', 'arm64')
43
44
  @pre_build_shell = argv.option('pre_build_shell') || ''
45
+ @toolchain = argv.option('toolchain') || ''
44
46
  @config = argv.option('configuration', 'Debug')
45
47
  @additional_args = argv.remainder!
46
48
 
@@ -131,6 +133,9 @@ module Pod
131
133
  if @pre_build_shell
132
134
  argvs += ["--pre_build_shell=#{@pre_build_shell}"]
133
135
  end
136
+ if @toolchain
137
+ argvs += ["--toolchain=#{@toolchain}"]
138
+ end
134
139
  argvs += ["--configuration=#{@config}"]
135
140
 
136
141
  archive = Pod::Command::Bin::Archive.new(CLAide::ARGV.new(argvs))
@@ -1,6 +1,6 @@
1
1
 
2
2
  module CBin
3
- VERSION = '0.1.2'
3
+ VERSION = '0.1.3'
4
4
  end
5
5
 
6
6
  module Pod
@@ -21,6 +21,7 @@ module CBin
21
21
  rootSpec,
22
22
  archs,
23
23
  pre_build_shell,
24
+ toolchain,
24
25
  skip_archive = false,
25
26
  build_model="Release")
26
27
  @spec = spec
@@ -30,6 +31,7 @@ module CBin
30
31
  @isRootSpec = rootSpec.name == spec.name
31
32
  @archs = archs
32
33
  @pre_build_shell = pre_build_shell
34
+ @toolchain = toolchain
33
35
  @skip_archive = skip_archive
34
36
  @framework_output = framework_output
35
37
  @zip = zip
@@ -58,7 +60,7 @@ module CBin
58
60
  source_dir = Dir.pwd
59
61
  file_accessor = Sandbox::FileAccessor.new(Pathname.new('.').expand_path, @spec.consumer(@platform))
60
62
  Dir.chdir(workspace_directory) do
61
- builder = CBin::Framework::Builder.new(@spec, file_accessor, @platform, source_dir, @archs, @pre_build_shell, @isRootSpec, @build_model)
63
+ builder = CBin::Framework::Builder.new(@spec, file_accessor, @platform, source_dir, @archs, @pre_build_shell, @toolchain, @isRootSpec, @build_model)
62
64
  @@build_defines = builder.build if @isRootSpec
63
65
  begin
64
66
  @framework_path = builder.lipo_build(@@build_defines) unless @skip_archive
@@ -10,7 +10,7 @@ module CBin
10
10
  class Builder
11
11
  include Pod
12
12
  #Debug下还待完成
13
- def initialize(spec, file_accessor, platform, source_dir, archs, pre_build_shell, isRootSpec = true, build_model="Debug")
13
+ def initialize(spec, file_accessor, platform, source_dir, archs, pre_build_shell, toolchain, isRootSpec = true, build_model="Debug")
14
14
  @spec = spec
15
15
  @source_dir = source_dir
16
16
  @file_accessor = file_accessor
@@ -19,6 +19,7 @@ module CBin
19
19
  @isRootSpec = isRootSpec
20
20
  @archs = archs
21
21
  @pre_build_shell = pre_build_shell
22
+ @toolchain = toolchain
22
23
  #vendored_static_frameworks 只有 xx.framework 需要拼接为 xx.framework/xx by slj
23
24
  vendored_static_frameworks = file_accessor.vendored_static_frameworks.map do |framework|
24
25
  path = framework
@@ -171,7 +172,9 @@ module CBin
171
172
  defines = "GCC_PREPROCESSOR_DEFINITIONS='$(inherited)'"
172
173
  defines += " SWIFT_ACTIVE_COMPILATION_CONDITIONS='$(inherited)' "
173
174
  defines += @spec.consumer(@platform).compiler_flags.join(' ')
174
-
175
+ unless @toolchain.empty? then
176
+ defines += "-toolchain \"#{@toolchain}\""
177
+ end
175
178
  options = ios_build_options
176
179
  # if is_debug_model
177
180
  archs = ios_architectures
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cocoapods-fy-bin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.2
4
+ version: 0.1.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - dr