1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: fix path voodoo in icu-generic.gyp

Browse Source 
Intention was to get to `PRODUCT_DIR` so no need to do path voodoo
Also added `'msvs_quote_cmd': 0` and more precise quoting

PR-URL: https://github.com/nodejs/node/pull/11217
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: Steven R Loomis <srloomis@us.ibm.com>
This commit is contained in:
Refael Ackermann 2017-03-30 00:01:11 -04:00 committed by Gibson Fahnestock
parent 23498f259d
commit e139dae157
No known key found for this signature in database
GPG Key ID: B01FBB92821C587A
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/icu/icu-generic.gyp
View File

@ -228,6 +228,7 @@
'actions': [ 'actions': [
{ {
'action_name': 'icudata', 'action_name': 'icudata',
'msvs_quote_cmd': 0,
'inputs': [ '<(icu_data_in)' ], 'inputs': [ '<(icu_data_in)' ],
'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/icudt<(icu_ver_major)<(icu_endianness)_dat.obj' ], 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/icudt<(icu_ver_major)<(icu_endianness)_dat.obj' ],
'action': [ '<(PRODUCT_DIR)/genccode', 'action': [ '<(PRODUCT_DIR)/genccode',
@ -247,11 +248,12 @@
{ {
# trim down ICU # trim down ICU
'action_name': 'icutrim', 'action_name': 'icutrim',
'msvs_quote_cmd': 0,
'inputs': [ '<(icu_data_in)', 'icu_small.json' ], 'inputs': [ '<(icu_data_in)', 'icu_small.json' ],
'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/icutmp/icudt<(icu_ver_major)<(icu_endianness).dat' ], 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/icutmp/icudt<(icu_ver_major)<(icu_endianness).dat' ],
'action': [ 'python', 'action': [ 'python',
'icutrim.py', 'icutrim.py',
'-P', '../../<(CONFIGURATION_NAME)', '-P', '<(PRODUCT_DIR)/.', # '.' suffix is a workaround against GYP assumptions :(
'-D', '<(icu_data_in)', '-D', '<(icu_data_in)',
'--delete-tmp', '--delete-tmp',
'-T', '<(SHARED_INTERMEDIATE_DIR)/icutmp', '-T', '<(SHARED_INTERMEDIATE_DIR)/icutmp',
@ -263,9 +265,10 @@
{ {
# build final .dat -> .obj # build final .dat -> .obj
'action_name': 'genccode', 'action_name': 'genccode',
'msvs_quote_cmd': 0,
'inputs': [ '<(SHARED_INTERMEDIATE_DIR)/icutmp/icudt<(icu_ver_major)<(icu_endianness).dat' ], 'inputs': [ '<(SHARED_INTERMEDIATE_DIR)/icutmp/icudt<(icu_ver_major)<(icu_endianness).dat' ],
'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/icudt<(icu_ver_major)<(icu_endianness)_dat.obj' ], 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/icudt<(icu_ver_major)<(icu_endianness)_dat.obj' ],
'action': [ '../../<(CONFIGURATION_NAME)/genccode', 'action': [ '<(PRODUCT_DIR)/genccode',
'-o', '-o',
'-d', '<(SHARED_INTERMEDIATE_DIR)/', '-d', '<(SHARED_INTERMEDIATE_DIR)/',
'-n', 'icudata', '-n', 'icudata',