From d4d698655127ee516a4ee1cbcfb1b497a6f873b4 Mon Sep 17 00:00:00 2001 From: Refael Ackermann Date: Thu, 30 Mar 2017 00:01:11 -0400 Subject: [PATCH] build: fix path voodoo in icu-generic.gyp 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 Reviewed-By: Fedor Indutny Reviewed-By: Steven R Loomis --- tools/icu/icu-generic.gyp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/icu/icu-generic.gyp b/tools/icu/icu-generic.gyp index cf615717e8089a..b3231acd4a76fe 100644 --- a/tools/icu/icu-generic.gyp +++ b/tools/icu/icu-generic.gyp @@ -228,6 +228,7 @@ 'actions': [ { 'action_name': 'icudata', + 'msvs_quote_cmd': 0, 'inputs': [ '<(icu_data_in)' ], 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/icudt<(icu_ver_major)<(icu_endianness)_dat.obj' ], 'action': [ '<(PRODUCT_DIR)/genccode', @@ -247,11 +248,12 @@ { # trim down ICU 'action_name': 'icutrim', + 'msvs_quote_cmd': 0, 'inputs': [ '<(icu_data_in)', 'icu_small.json' ], 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/icutmp/icudt<(icu_ver_major)<(icu_endianness).dat' ], 'action': [ 'python', 'icutrim.py', - '-P', '../../<(CONFIGURATION_NAME)', + '-P', '<(PRODUCT_DIR)/.', # '.' suffix is a workaround against GYP assumptions :( '-D', '<(icu_data_in)', '--delete-tmp', '-T', '<(SHARED_INTERMEDIATE_DIR)/icutmp', @@ -263,9 +265,10 @@ { # build final .dat -> .obj 'action_name': 'genccode', + 'msvs_quote_cmd': 0, 'inputs': [ '<(SHARED_INTERMEDIATE_DIR)/icutmp/icudt<(icu_ver_major)<(icu_endianness).dat' ], 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/icudt<(icu_ver_major)<(icu_endianness)_dat.obj' ], - 'action': [ '../../<(CONFIGURATION_NAME)/genccode', + 'action': [ '<(PRODUCT_DIR)/genccode', '-o', '-d', '<(SHARED_INTERMEDIATE_DIR)/', '-n', 'icudata',