pod-pipeline 0.5.10 → 0.5.11
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/pod-pipeline/command/build.rb +7 -3
- data/lib/pod-pipeline/util/header.rb +8 -6
- metadata +8 -8
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: dc0446d7e3aac978fc595fa2f19d87cc18a6f59b8431b4652e699c4fec61f466
|
4
|
+
data.tar.gz: 2041b518ff0a053ff2154d0f885d20c91765ab2aee9b3df470794c45591bc260
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f94c9e775747a23be586c69b243e5dda5256eb8daca923ef2613a8b8813bf5534a987247f3d75f9e5fd4f37d7b3a0d848c57d0be6fb5f24258f00719a6923643
|
7
|
+
data.tar.gz: 411ffb81d938082f3a6232f2e5c87328f36c0151d5931f95fb1bcc5d2de8c60bb795825d0389e9ce0ca174989e0694b53f9403102c534976afb2fc8cd5a78cd2
|
@@ -76,6 +76,9 @@ module PPL
|
|
76
76
|
combine_headers(@combines.include?('local'), @combines.include?('pod'))
|
77
77
|
end
|
78
78
|
|
79
|
+
#合并本地头文件
|
80
|
+
add_headers
|
81
|
+
|
79
82
|
#合并二进制文件
|
80
83
|
puts "\n[合并 #{@combines.join(", ")} 的二进制文件]"
|
81
84
|
combine_binarys(@combines.include?('local'), @combines.include?('pod'))
|
@@ -103,7 +106,9 @@ module PPL
|
|
103
106
|
end
|
104
107
|
|
105
108
|
def add_headers
|
109
|
+
puts "\n[合并 本地的头文件]"
|
106
110
|
header_stands = "#{@output}/Example/Pods/Headers/Public/#{@podspec.name}/*.h"
|
111
|
+
puts "\n合并路径:#{header_stands}"
|
107
112
|
Dir[header_stands].each do |header_stand|
|
108
113
|
if File.ftype(header_stand).eql? 'link'
|
109
114
|
header_file = "#{File.dirname(header_stand)}/#{File.readlink(header_stand)}"
|
@@ -116,7 +121,8 @@ module PPL
|
|
116
121
|
end
|
117
122
|
end
|
118
123
|
end
|
119
|
-
header_files = "#{@build_path}/**/#{@podspec.name}.framework/Headers/*.h"
|
124
|
+
header_files = "#{@build_path}/**/#{@podspec.name}/#{@podspec.name}.framework/Headers/*.h"
|
125
|
+
puts "\n合并路径:#{header_files}"
|
120
126
|
Dir[header_files].each do |header_file|
|
121
127
|
if File.ftype(header_file).eql? 'file'
|
122
128
|
header_file_basename = File.basename(header_file)
|
@@ -144,8 +150,6 @@ module PPL
|
|
144
150
|
end
|
145
151
|
|
146
152
|
Header.combine(headers, inputs, @combine_include, @combine_exclude)
|
147
|
-
|
148
|
-
add_headers
|
149
153
|
end
|
150
154
|
|
151
155
|
def combine_binarys(local_dependency, pod_dependency)
|
@@ -45,11 +45,13 @@ module PPL
|
|
45
45
|
input_queue
|
46
46
|
end
|
47
47
|
|
48
|
-
def self.combine_reset(header,
|
48
|
+
def self.combine_reset(header, inputs)
|
49
49
|
content = File.read(header)
|
50
50
|
replace = PPL::Scanner.name
|
51
|
-
|
52
|
-
|
51
|
+
inputs.each do |input|
|
52
|
+
Dir[input].each do |input_path|
|
53
|
+
content = content.gsub("#import <#{File.basename(input_path, '.framework')}", "#import <#{replace}")
|
54
|
+
end
|
53
55
|
end
|
54
56
|
File.write(header, content)
|
55
57
|
end
|
@@ -72,12 +74,12 @@ module PPL
|
|
72
74
|
|
73
75
|
combine_collect(inputs, include_list, exclude_list).each do |input|
|
74
76
|
Dir["#{input}/Headers/*.h"].each do |header|
|
77
|
+
next if header.include?('-umbrella.h')
|
78
|
+
|
75
79
|
FileUtils.cp(header, output, 'preserve': true)
|
76
80
|
end
|
77
81
|
end
|
78
|
-
Dir["#{output}/*.h"].each
|
79
|
-
combine_reset(header, include_list)
|
80
|
-
end
|
82
|
+
Dir["#{output}/*.h"].each { |header| combine_reset(header, inputs) }
|
81
83
|
combine_base(output)
|
82
84
|
end
|
83
85
|
end
|
metadata
CHANGED
@@ -1,36 +1,36 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: pod-pipeline
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.5.
|
4
|
+
version: 0.5.11
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- 郑贤达
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2024-03-14 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: cocoapods-core
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- -
|
17
|
+
- - ">="
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 1.11.
|
19
|
+
version: 1.11.0
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
|
-
- -
|
24
|
+
- - ">="
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 1.11.
|
26
|
+
version: 1.11.0
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: cocoapods-trunk
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
31
|
- - ">="
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: 1.
|
33
|
+
version: 1.5.0
|
34
34
|
- - "<"
|
35
35
|
- !ruby/object:Gem::Version
|
36
36
|
version: '2.0'
|
@@ -40,7 +40,7 @@ dependencies:
|
|
40
40
|
requirements:
|
41
41
|
- - ">="
|
42
42
|
- !ruby/object:Gem::Version
|
43
|
-
version: 1.
|
43
|
+
version: 1.5.0
|
44
44
|
- - "<"
|
45
45
|
- !ruby/object:Gem::Version
|
46
46
|
version: '2.0'
|