cocoapods-bb-bin 0.1.4 → 0.1.5
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 +4 -4
- data/lib/cocoapods-bb-bin/command/bin/auto.rb +6 -4
- data/lib/cocoapods-bb-bin/config/config.rb +1 -3
- data/lib/cocoapods-bb-bin/config/config_builder.rb +1 -1
- data/lib/cocoapods-bb-bin/gem_version.rb +1 -1
- data/lib/cocoapods-bb-bin/helpers/build_helper.rb +1 -0
- data/lib/cocoapods-bb-bin/helpers/framework.rb +7 -1
- data/lib/cocoapods-bb-bin/helpers/framework_builder.rb +3 -2
- data/lib/cocoapods-bb-bin/native/podfile_generator.rb +7 -7
- data/lib/cocoapods-bb-bin/source_provider_hook.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 92aac3b42f5f900aa8994380291b97a8794502bb6983d850ce3bf3dc4ef005ee
|
4
|
+
data.tar.gz: 7a103332b3845ba48a457b87a55e916afe4f8fe53e98e899a8f147e1785f90b7
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 6236774e980f7e3455944cf3cc825a0c270cde86f489c60a294cef5308c0d35ebea030f7e1ff142cd9e7b7a07ccd2e623d97dde99852d5215d6e03ccedc91960
|
7
|
+
data.tar.gz: fd318d8fe2f1a9c6b8bf749ebc0e13df80996b48b7435e33b206638b2908a2403a0d88a343acac3d1c43201befecc5f286fdfd907d8393c34ba5db6b9279d2c5
|
@@ -221,6 +221,8 @@ module Pod
|
|
221
221
|
if filename == 'Podfile'
|
222
222
|
podfile_path = File.join(filepath,"#{filename}")
|
223
223
|
create_link(podfile_path, current_path)
|
224
|
+
pods_path = File.join(filepath,"Pods")
|
225
|
+
create_link(pods_path, current_path)
|
224
226
|
return podfile_path
|
225
227
|
end
|
226
228
|
end
|
@@ -232,14 +234,14 @@ module Pod
|
|
232
234
|
podfile_path = File.join(current_path,"Example/Podfile")
|
233
235
|
if File.file?(podfile_path)
|
234
236
|
create_link(podfile_path, current_path)
|
237
|
+
pods_path = File.join(current_path,"Example/Pods")
|
238
|
+
create_link(pods_path, current_path)
|
235
239
|
end
|
236
240
|
end
|
237
241
|
|
238
242
|
def create_link(source_file, dest_file)
|
239
|
-
|
240
|
-
|
241
|
-
UI.puts "创建软链接 source:#{source_file} link:#{dest_file}"
|
242
|
-
end
|
243
|
+
system("ln -s #{source_file} #{dest_file}")
|
244
|
+
UI.puts "create link source:#{source_file} dest:#{dest_file}"
|
243
245
|
end
|
244
246
|
end
|
245
247
|
end
|
@@ -94,7 +94,7 @@ module CBin
|
|
94
94
|
|
95
95
|
def config
|
96
96
|
@config ||= begin
|
97
|
-
|
97
|
+
@config = OpenStruct.new load_config
|
98
98
|
validate!
|
99
99
|
@config
|
100
100
|
end
|
@@ -131,6 +131,4 @@ module CBin
|
|
131
131
|
def self.config
|
132
132
|
@config ||= Config.new
|
133
133
|
end
|
134
|
-
|
135
|
-
|
136
134
|
end
|
@@ -27,7 +27,7 @@ module CBin
|
|
27
27
|
if File.exist?(path)
|
28
28
|
config = JSON.parse(File.read(path))
|
29
29
|
@white_pod_list = config['archive-white-pod-list']
|
30
|
-
UI.warn "======
|
30
|
+
UI.warn "====== white_pod_list = #{@white_pod_list}" if @white_pod_list
|
31
31
|
@ignore_git_list = config['ignore-git-list']
|
32
32
|
UI.warn "====== ignore_git_list = #{@ignore_git_list}" if @ignore_git_list
|
33
33
|
@ignore_http_list = config['ignore-http-list']
|
@@ -10,9 +10,10 @@ module CBin
|
|
10
10
|
attr_reader :swift_module_path
|
11
11
|
attr_reader :fwk_path
|
12
12
|
|
13
|
-
def initialize(name, platform)
|
13
|
+
def initialize(name, platform, embedded=false)
|
14
14
|
@name = name
|
15
15
|
@platform = platform
|
16
|
+
@embedded = embedded
|
16
17
|
end
|
17
18
|
|
18
19
|
def make
|
@@ -79,6 +80,11 @@ module CBin
|
|
79
80
|
|
80
81
|
def make_root
|
81
82
|
@root_path = Pathname.new(@platform)
|
83
|
+
|
84
|
+
if @embedded
|
85
|
+
@root_path += Pathname.new(@name + '.embeddedframework')
|
86
|
+
end
|
87
|
+
|
82
88
|
@root_path.mkpath unless @root_path.exist?
|
83
89
|
end
|
84
90
|
end
|
@@ -42,10 +42,11 @@ module CBin
|
|
42
42
|
|
43
43
|
UI.puts "framework lipo build"
|
44
44
|
|
45
|
-
if CBin::Build::Utils.is_swift_module(@spec) || !CBin::Build::Utils.uses_frameworks?
|
45
|
+
# if CBin::Build::Utils.is_swift_module(@spec) || !CBin::Build::Utils.uses_frameworks?
|
46
|
+
if CBin::Build::Utils.is_framework(@spec) # 默认生成framework为静态库.a
|
46
47
|
UI.section("Building static Library #{@spec}") do
|
47
48
|
# defines = compile
|
48
|
-
UI.puts "
|
49
|
+
UI.puts "static framework lipo build"
|
49
50
|
# build_sim_libraries(defines)
|
50
51
|
output = framework.versions_path + Pathname.new(@spec.name)
|
51
52
|
|
@@ -22,9 +22,10 @@ module Pod
|
|
22
22
|
def podfile_for_spec(spec)
|
23
23
|
generator = self
|
24
24
|
dir = configuration.gen_dir_for_pod(spec.name)
|
25
|
+
project_name = configuration.project_name_for_spec(spec)
|
25
26
|
|
26
27
|
Pod::Podfile.new do
|
27
|
-
project "#{
|
28
|
+
project "#{project_name}.xcodeproj"
|
28
29
|
workspace "#{spec.name}.xcworkspace"
|
29
30
|
|
30
31
|
plugin 'cocoapods-generate'
|
@@ -101,16 +102,16 @@ module Pod
|
|
101
102
|
|
102
103
|
|
103
104
|
inhibit_all_warnings! if generator.inhibit_all_warnings?
|
104
|
-
use_modular_headers! if generator.use_modular_headers?
|
105
|
+
# use_modular_headers! if generator.use_modular_headers?
|
106
|
+
# podfile 配置 use_frameworks! :linkage => :static 支持modulemap by hm 21/10/19
|
107
|
+
if generator.use_modular_headers? || generator.use_frameworks_value.to_s == '{:linkage=>:static}'
|
108
|
+
use_modular_headers!
|
109
|
+
end
|
105
110
|
|
106
111
|
# This is the pod declaration for the local pod,
|
107
112
|
# it will be inherited by the concrete target definitions below
|
108
|
-
|
109
113
|
pod_options = generator.dependency_compilation_kwargs(spec.name)
|
110
114
|
pod_options[:path] = spec.defined_in_file.relative_path_from(dir).to_s
|
111
|
-
# generator.configuration.podfile.dependencies[0].external_source
|
112
|
-
|
113
|
-
|
114
115
|
{ testspecs: test_specs, appspecs: app_specs }.each do |key, specs|
|
115
116
|
pod_options[key] = specs.map { |s| s.name.sub(%r{^#{Regexp.escape spec.root.name}/}, '') }.sort unless specs.empty?
|
116
117
|
end
|
@@ -196,4 +197,3 @@ module Pod
|
|
196
197
|
end
|
197
198
|
end
|
198
199
|
end
|
199
|
-
|
@@ -6,7 +6,7 @@ Pod::HooksManager.register('cocoapods-bb-bin', :pre_install) do |_context, _|
|
|
6
6
|
require 'cocoapods-bb-bin/native'
|
7
7
|
|
8
8
|
#pod bin update || install 不走这里
|
9
|
-
if $ARGV[1]
|
9
|
+
if $ARGV[1] == 'update' || $ARGV[1] != 'install'
|
10
10
|
|
11
11
|
else
|
12
12
|
# pod bin repo update 更新二进制私有源
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cocoapods-bb-bin
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- humin
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-10-
|
11
|
+
date: 2021-10-19 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: parallel
|