diff options
Diffstat (limited to 'webkit/webkit.gyp')
| -rw-r--r-- | webkit/webkit.gyp | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 8122d20..a1692de 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -8,7 +8,10 @@ ], 'variables': { # TODO: remove this helper when we have loops in GYP - 'apply_locales_cmd': ['python', '../chrome/tools/build/apply_locales.py',], + 'apply_locales_cmd': ['python', '../chrome/tools/build/apply_locales.py'], + 'grit_info_cmd': ['python', '../tools/grit/grit_info.py'], + 'grit_cmd': ['python', '../tools/grit/grit.py'], + 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', # We can't turn on warnings on Windows and Linux until we upstream the # WebKit API. @@ -243,10 +246,6 @@ 'target_name': 'webkit_resources', 'type': 'none', 'msvs_guid': '0B469837-3D46-484A-AFB3-C5A6C68730B9', - 'variables': { - 'grit_path': '../tools/grit/grit.py', - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', - }, 'actions': [ { 'action_name': 'webkit_resources', @@ -254,20 +253,19 @@ 'input_path': 'glue/webkit_resources.grd', }, 'inputs': [ - '<(input_path)', + '<!@(<(grit_info_cmd) --inputs <(input_path))', ], 'outputs': [ - '<(grit_out_dir)/grit/webkit_resources.h', - '<(grit_out_dir)/webkit_resources.pak', - '<(grit_out_dir)/webkit_resources.rc', + '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)/webkit_resources\' <(input_path))', ], - 'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '-o', '<(grit_out_dir)'], + 'action': ['<@(grit_cmd)', '-i', '<(input_path)', 'build', + '-o', '<(grit_out_dir)/webkit_resources'], 'message': 'Generating resources from <(input_path)', }, ], 'direct_dependent_settings': { 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/webkit', + '<(grit_out_dir)/webkit_resources', ], }, 'conditions': [ @@ -280,10 +278,6 @@ 'target_name': 'webkit_strings', 'type': 'none', 'msvs_guid': '60B43839-95E6-4526-A661-209F16335E0E', - 'variables': { - 'grit_path': '../tools/grit/grit.py', - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', - }, 'actions': [ { 'action_name': 'webkit_strings', @@ -291,20 +285,19 @@ 'input_path': 'glue/webkit_strings.grd', }, 'inputs': [ - '<(input_path)', + '<!@(<(grit_info_cmd) --inputs <(input_path))', ], 'outputs': [ - '<(grit_out_dir)/grit/webkit_strings.h', - # TODO: remove this helper when we have loops in GYP - '>!@(<(apply_locales_cmd) \'<(grit_out_dir)/webkit_strings_ZZLOCALE.pak\' <(locales))', + '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)/webkit_strings\' <(input_path))', ], - 'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '-o', '<(grit_out_dir)'], + 'action': ['<@(grit_cmd)', '-i', '<(input_path)', 'build', + '-o', '<(grit_out_dir)/webkit_strings'], 'message': 'Generating resources from <(input_path)', }, ], 'direct_dependent_settings': { 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/webkit', + '<(grit_out_dir)/webkit_strings', ], }, 'conditions': [ |