Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit b59064c

Browse files
livecodeianlivecodeian
committed
[[ ICUData ]] Make sure we use host tools to build minimal icudata
1 parent 9856562 commit b59064c

File tree

4 files changed

+53
-84
lines changed

4 files changed

+53
-84
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,10 @@ sdks/
116116

117117
# Ignore prebuilts #
118118
###################
119+
prebuilt/bin
119120
prebuilt/include
120121
prebuilt/lib
122+
prebuilt/share
121123
prebuilt/build
122124
prebuilt/packaged
123125
prebuilt/fetched

‎libfoundation/libfoundation.gyp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
'dependencies':
4040
[
4141
'../prebuilt/libicu.gyp:libicu',
42-
'../prebuilt/libicu.gyp:encode_minimal_icu_data#host',
42+
'../prebuilt/libicu.gyp:encode_minimal_icu_data',
4343
'../thirdparty/libffi/libffi.gyp:libffi',
4444
'../thirdparty/libz/libz.gyp:libz',
4545
],

‎prebuilt/libicu.gyp‎

Lines changed: 50 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,47 @@
22
'includes':
33
[
44
'../common.gypi',
5-
'prebuilt-common.gypi',
65
],
76

7+
'target_defaults':
8+
{
9+
'conditions':
10+
[
11+
[
12+
'host_os == "mac"',
13+
{
14+
'variables':
15+
{
16+
'prebuilt_icu_bin_dir': 'bin/mac',
17+
'prebuilt_icu_share_dir': 'share',
18+
},
19+
},
20+
],
21+
[
22+
'host_os == "linux"',
23+
{
24+
'variables':
25+
{
26+
# Gyp doesn't seem to handle non-absolute paths here properly...
27+
'prebuilt_icu_bin_dir': 'bin/linux/>(toolset_arch)',
28+
'prebuilt_icu_share_dir': 'share',
29+
},
30+
},
31+
],
32+
[
33+
'host_os == "win"',
34+
{
35+
'variables':
36+
{
37+
# Hack required due to GYP failure / refusal to treat this as a path
38+
'prebuilt_icu_bin_dir': '$(SolutionDir)../../prebuilt/unpacked/icu/<(uniform_arch)-win32-$(PlatformToolset)_static_$(ConfigurationName)/bin',
39+
'prebuilt_icu_share_dir': 'unpacked/icu/<(uniform_arch)-win32-$(PlatformToolset)_static_$(ConfigurationName)/share',
40+
},
41+
},
42+
],
43+
],
44+
},
45+
846
'targets':
947
[
1048
{
@@ -189,11 +227,11 @@
189227
'target_name': 'minimal_icu_data',
190228
'type': 'none',
191229

192-
'toolsets': ['host'],
230+
'toolsets': ['host', 'target'],
193231

194232
'dependencies':
195233
[
196-
'libicu',
234+
'fetch.gyp:fetch#host',
197235
],
198236

199237
'actions':
@@ -206,7 +244,7 @@
206244
],
207245
'outputs':
208246
[
209-
'<(SHARED_INTERMEDIATE_DIR)/data/icudata-full-list.txt',
247+
'<(INTERMEDIATE_DIR)/data/icudata-full-list.txt',
210248
],
211249
'action':
212250
[
@@ -215,36 +253,36 @@
215253
'>(prebuilt_icu_share_dir)/icudt58l.dat',
216254
'--auto_toc_prefix',
217255
'--outlist',
218-
'<(SHARED_INTERMEDIATE_DIR)/data/icudata-full-list.txt',
256+
'<(INTERMEDIATE_DIR)/data/icudata-full-list.txt',
219257
],
220258
},
221259

222260
{
223261
'action_name': 'gen_icu_data_remove_list',
224262
'inputs':
225263
[
226-
'>(SHARED_INTERMEDIATE_DIR)/data/icudata-full-list.txt',
264+
'<(INTERMEDIATE_DIR)/data/icudata-full-list.txt',
227265
'rsrc/icudata-minimal-list.txt',
228266
],
229267
'outputs':
230268
[
231-
'>(SHARED_INTERMEDIATE_DIR)/data/icudata-remove-list.txt',
269+
'<(INTERMEDIATE_DIR)/data/icudata-remove-list.txt',
232270
],
233271
'action':
234272
[
235273
'python',
236274
'../util/remove_matching.py',
237-
'>(SHARED_INTERMEDIATE_DIR)/data/icudata-full-list.txt',
275+
'<(INTERMEDIATE_DIR)/data/icudata-full-list.txt',
238276
'rsrc/icudata-minimal-list.txt',
239-
'>(SHARED_INTERMEDIATE_DIR)/data/icudata-remove-list.txt',
277+
'<(INTERMEDIATE_DIR)/data/icudata-remove-list.txt',
240278
],
241279
},
242280

243281
{
244282
'action_name': 'minimal_icu_data',
245283
'inputs':
246284
[
247-
'>(SHARED_INTERMEDIATE_DIR)/data/icudata-remove-list.txt',
285+
'<(INTERMEDIATE_DIR)/data/icudata-remove-list.txt',
248286
],
249287
'outputs':
250288
[
@@ -255,7 +293,7 @@
255293
[
256294
'>(prebuilt_icu_bin_dir)/icupkg',
257295
'--remove',
258-
'>(SHARED_INTERMEDIATE_DIR)/data/icudata-remove-list.txt',
296+
'<(INTERMEDIATE_DIR)/data/icudata-remove-list.txt',
259297
'--auto_toc_prefix',
260298
'>(prebuilt_icu_share_dir)/icudt58l.dat',
261299
'<(SHARED_INTERMEDIATE_DIR)/data/icudata-minimal.dat',
@@ -268,7 +306,7 @@
268306
'target_name': 'encode_minimal_icu_data',
269307
'type': 'none',
270308

271-
'toolsets': ['host'],
309+
'toolsets': ['host', 'target'],
272310

273311
'dependencies':
274312
[

‎prebuilt/prebuilt-common.gypi‎

Lines changed: 0 additions & 71 deletions
This file was deleted.

0 commit comments

Comments
 (0)