diff options
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gyp | 1 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 35 |
2 files changed, 21 insertions, 15 deletions
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index 2c14cf1..cc497eb 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -38,7 +38,6 @@ '../../webkit.gyp:database', '../../webkit.gyp:glue', '../../webkit.gyp:webkit', - '../../webkit.gyp:webkit_resources', '../../webkit.gyp:inspector_resources', ], 'msvs_guid': '77C32787-1B96-CB84-B905-7F170629F0AC', diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index a1692de..8122d20 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -8,10 +8,7 @@ ], 'variables': { # TODO: remove this helper when we have loops in GYP - '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', + 'apply_locales_cmd': ['python', '../chrome/tools/build/apply_locales.py',], # We can't turn on warnings on Windows and Linux until we upstream the # WebKit API. @@ -246,6 +243,10 @@ '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', @@ -253,19 +254,20 @@ 'input_path': 'glue/webkit_resources.grd', }, 'inputs': [ - '<!@(<(grit_info_cmd) --inputs <(input_path))', + '<(input_path)', ], 'outputs': [ - '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)/webkit_resources\' <(input_path))', + '<(grit_out_dir)/grit/webkit_resources.h', + '<(grit_out_dir)/webkit_resources.pak', + '<(grit_out_dir)/webkit_resources.rc', ], - 'action': ['<@(grit_cmd)', '-i', '<(input_path)', 'build', - '-o', '<(grit_out_dir)/webkit_resources'], + 'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '-o', '<(grit_out_dir)'], 'message': 'Generating resources from <(input_path)', }, ], 'direct_dependent_settings': { 'include_dirs': [ - '<(grit_out_dir)/webkit_resources', + '<(SHARED_INTERMEDIATE_DIR)/webkit', ], }, 'conditions': [ @@ -278,6 +280,10 @@ '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', @@ -285,19 +291,20 @@ 'input_path': 'glue/webkit_strings.grd', }, 'inputs': [ - '<!@(<(grit_info_cmd) --inputs <(input_path))', + '<(input_path)', ], 'outputs': [ - '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)/webkit_strings\' <(input_path))', + '<(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))', ], - 'action': ['<@(grit_cmd)', '-i', '<(input_path)', 'build', - '-o', '<(grit_out_dir)/webkit_strings'], + 'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '-o', '<(grit_out_dir)'], 'message': 'Generating resources from <(input_path)', }, ], 'direct_dependent_settings': { 'include_dirs': [ - '<(grit_out_dir)/webkit_strings', + '<(SHARED_INTERMEDIATE_DIR)/webkit', ], }, 'conditions': [ |