cocoapods-bb-bin 0.2.12.0 → 0.2.12.1

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: 513d66c8a95960b33e0aab22e3bcb22932d3670b1e252a29599080e037229ca5
4
- data.tar.gz: 6669c915cc922f2049714b3b2d80a1022a4889cbf1de00f08abf86ba59144bfa
3
+ metadata.gz: 4d5c9dc9c33f4245e030d715d55e309678e375521e83a8259f45f036a3a3f088
4
+ data.tar.gz: e95605db07c04677b8fa12a7b8d370d6c43111de70a6756166b2a32f650e410e
5
5
  SHA512:
6
- metadata.gz: 469be51e7790b3ea7590cd1a4f82ddd1d8af3e29e748e377088a52d7248d770c6c40bfcef1a9f2e7dd2df142245e6e6f1ab0e15483c9b68dd7db66078191b241
7
- data.tar.gz: 245147d9cff2f982077ad8769fd24f2f604b1e6257e7e50ba06eab80f94eab43a4016f18c6f1b31eaf26c64a8a29cca61913faae1c15551ae4436258586b8b4f
6
+ metadata.gz: '0389e757366131fd5f070d95f1e840e98aa15a9c024452837f094674e0d4b8c37198da28ed833be87f9bf41c9f96151c6f9ee65b44b46014ba12eb903c017d12'
7
+ data.tar.gz: 6e68f0bf5a61cc3527faf825be323c26c03f248a1afda1d84a06a43bd8331e5cfb3069a7edbe31d88819ab05c720b1d61125ebc7abaf76880f6b34f6a15b6cbb
@@ -90,6 +90,13 @@ module Pod
90
90
  return sources_sepc
91
91
  end
92
92
 
93
+ def build_workspace
94
+ worksppace_path = File.expand_path("#{CBin::Config::Builder.instance.gen_dir}/#{@spec.name}")
95
+ path = File.join(worksppace_path, "#{@spec.name}.xcworkspace")
96
+ raise Informative, "#{path} File no exist, please check" unless File.exist?(path)
97
+ return path
98
+ end
99
+
93
100
  def build_root_spec
94
101
  builder = CBin::Build::Helper.new(@spec,
95
102
  @platform,
@@ -101,7 +108,8 @@ module Pod
101
108
  @zip,
102
109
  @spec,
103
110
  CBin::Config::Builder.instance.white_pod_list.include?(@spec.name),
104
- @config)
111
+ @config,
112
+ build_workspace)
105
113
  builder.build
106
114
  builder.clean_workspace if @clean && !@all_make
107
115
  end
@@ -145,7 +153,8 @@ module Pod
145
153
  @zip,
146
154
  @spec,
147
155
  false ,
148
- @config)
156
+ @config,
157
+ build_workspace)
149
158
  builder.build
150
159
  rescue Object => exception
151
160
  UI.puts exception
@@ -188,7 +197,7 @@ module Pod
188
197
  end
189
198
 
190
199
  argvs << spec_file if spec_file
191
- # UI.puts "argvs:#{argvs}"
200
+ UI.puts "generate_project argvs:#{argvs}"
192
201
  gen = Pod::Command::Gen.new(CLAide::ARGV.new(argvs))
193
202
  gen.validate!
194
203
  gen.run
@@ -1,7 +1,7 @@
1
1
  require 'cocoapods'
2
2
 
3
3
  module CBin
4
- VERSION = '0.2.12.0'
4
+ VERSION = '0.2.12.1'
5
5
  end
6
6
 
7
7
  module Pod
@@ -25,7 +25,8 @@ module CBin
25
25
  zip,
26
26
  rootSpec,
27
27
  skip_archive = false,
28
- build_model="Release")
28
+ build_model="Release",
29
+ workspace=nil)
29
30
  @spec = spec
30
31
  @platform = platform
31
32
  @build_model = build_model
@@ -38,10 +39,11 @@ module CBin
38
39
  @support_maccatalyst = support_maccatalyst
39
40
  @spec_sources = spec_sources
40
41
  @zip = zip
42
+ @workspace = workspace
41
43
 
42
44
  @framework_path
43
45
 
44
- UI.puts "build initialize...#{spec}"
46
+ UI.puts "build initialize...#{spec} rootSpec:#{rootSpec} build_model:#{build_model} workspace:#{workspace}"
45
47
  end
46
48
 
47
49
  # build framework
@@ -97,9 +99,9 @@ module CBin
97
99
  # build xcframework
98
100
  def build_static_xcframework
99
101
  source_dir = Dir.pwd
100
- UI.puts "xcframework source_dir=#{source_dir}"
102
+ UI.puts "xcframework source_dir=#{source_dir} workspace:#{@workspace}"
101
103
  isGenDylib = @xcframework_dylib_output
102
- builder = CBin::XCFramework::XCBuilder.new(@spec, @spec_sources, @support_maccatalyst, isGenDylib)
104
+ builder = CBin::XCFramework::XCBuilder.new(@spec, @spec_sources, @support_maccatalyst, isGenDylib, @workspace)
103
105
  builder.build
104
106
  end
105
107
 
@@ -14,7 +14,7 @@ module CBin
14
14
  class XCBuilder
15
15
  include Pod
16
16
  include Pod::Config::Mixin
17
- def initialize(spec,spec_sources, support_maccatalyst=false,isGenDylib=false)
17
+ def initialize(spec, spec_sources, support_maccatalyst=false, isGenDylib=false, workspace=nil)
18
18
  @spec = spec
19
19
  @spec_sources = spec_sources.split(',') unless spec_sources.nil?
20
20
  @name = "#{@spec.name}.podspec"
@@ -28,9 +28,10 @@ module CBin
28
28
  @symbols = true
29
29
  @support_maccatalyst = support_maccatalyst # 默认不再支持MacCatalyst方式支持iOS应用在mac平台运行库生成
30
30
  @support_dynamic = isGenDylib
31
+ @workspace = workspace
31
32
 
32
33
  target_dir = "#{Dir.pwd}/#{@spec.name}-#{@spec.version}"
33
- UI.puts "build initialize...#{spec} spec_sources:#{spec_sources} target_dir:#{target_dir} 是否支持Mac Catalyst:#{support_maccatalyst} 是否生成动态库:#{isGenDylib}"
34
+ UI.puts "build initialize...#{spec} spec_sources:#{spec_sources} target_dir:#{target_dir} 是否支持Mac Catalyst:#{support_maccatalyst} 是否生成动态库:#{isGenDylib} workspace:#{workspace}"
34
35
  end
35
36
 
36
37
  def build
@@ -61,6 +62,7 @@ module CBin
61
62
  "--use-modular-headers=#{@use_modular_headers}",
62
63
  "--archive-export", # 默认archive导出dylib
63
64
  # "--no-archive-export",
65
+ "--workspace=#{@workspace}",
64
66
  ]
65
67
  if @force
66
68
  argvs += ['--force']
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cocoapods-bb-bin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.12.0
4
+ version: 0.2.12.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - humin
@@ -83,7 +83,7 @@ dependencies:
83
83
  requirements:
84
84
  - - ">="
85
85
  - !ruby/object:Gem::Version
86
- version: 0.2.7.2
86
+ version: 0.2.7.3
87
87
  - - "<"
88
88
  - !ruby/object:Gem::Version
89
89
  version: '1.0'
@@ -93,7 +93,7 @@ dependencies:
93
93
  requirements:
94
94
  - - ">="
95
95
  - !ruby/object:Gem::Version
96
- version: 0.2.7.2
96
+ version: 0.2.7.3
97
97
  - - "<"
98
98
  - !ruby/object:Gem::Version
99
99
  version: '1.0'