diff options
| -rwxr-xr-x | chrome/chrome.gyp | 21 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 28 |
2 files changed, 21 insertions, 28 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 963bfbb..b0a1a76 100755 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -54,10 +54,11 @@ 'common/common_resources.grd', 'renderer/renderer_resources.grd', ], - 'grit_info_cmd': ['python', '../tools/grit/grit_info.py',], - 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py',], + 'grit_info_cmd': ['python', '../tools/grit/grit_info.py'], + 'grit_cmd': ['python', '../tools/grit/grit.py'], + 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'], # TODO: remove this helper when we have loops in GYP - 'apply_locales_cmd': ['python', 'tools/build/apply_locales.py',], + 'apply_locales_cmd': ['python', 'tools/build/apply_locales.py'], 'conditions': [ ['OS=="win"', { 'nacl_defines': [ @@ -174,7 +175,7 @@ # One alternative would be to turn this into several actions, # but that would be rather verbose. ], - 'action': ['python', '../tools/grit/grit.py', '-i', + 'action': ['<@(grit_cmd)', '-i', '<(RULE_INPUT_PATH)', 'build', '-o', '<(grit_out_dir)', '-D', '<(chrome_build)', @@ -260,7 +261,7 @@ #'<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(chrome_strings_grds))', # See comment in chrome_resources as to why. ], - 'action': ['python', '../tools/grit/grit.py', '-i', + 'action': ['<@(grit_cmd)', '-i', '<(RULE_INPUT_PATH)', 'build', '-o', '<(grit_out_dir)', '-D', '<(chrome_build)'], @@ -290,9 +291,6 @@ 'target_name': 'theme_resources', 'type': 'none', 'msvs_guid' : 'A158FB0A-25E4-6523-6B5A-4BB294B73D31', - 'variables': { - 'grit_path': '../tools/grit/grit.py', - }, 'actions': [ { 'action_name': 'theme_resources', @@ -316,7 +314,7 @@ '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(input_path))', ], 'action': [ - 'python', '<(grit_path)', + '<@(grit_cmd)', '-i', '<(input_path)', 'build', '-o', '<(grit_out_dir)', '-D', '<(chrome_build)' @@ -348,9 +346,6 @@ # can't use chrome_strings rules above. 'target_name': 'platform_locale_settings', 'type': 'none', - 'variables': { - 'grit_path': '../tools/grit/grit.py', - }, 'actions': [ { 'action_name': 'platform_locale_settings', @@ -374,7 +369,7 @@ '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(input_path))', ], 'action': [ - 'python', '<(grit_path)', + '<@(grit_cmd)', '-i', '<(input_path)', 'build', '-o', '<(grit_out_dir)', '-D', '<(chrome_build)' diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index c2b004b..15f7fac 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -9,9 +9,6 @@ '../third_party/WebKit/WebCore/WebCore.gypi', ], 'variables': { - # TODO: remove this helper when we have loops in GYP - '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. 'conditions': [ @@ -35,6 +32,9 @@ ], 'debug_devtools%': 0, + + 'grit_info_cmd': ['python', '../tools/grit/grit_info.py'], + 'grit_cmd': ['python', '../tools/grit/grit.py'], }, 'targets': [ { @@ -56,7 +56,6 @@ 'type': 'none', 'msvs_guid': '0B469837-3D46-484A-AFB3-C5A6C68730B9', 'variables': { - 'grit_path': '../tools/grit/grit.py', 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', }, 'actions': [ @@ -66,14 +65,14 @@ '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)\' <(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)'], 'message': 'Generating resources from <(input_path)', }, ], @@ -93,7 +92,6 @@ 'type': 'none', 'msvs_guid': '60B43839-95E6-4526-A661-209F16335E0E', 'variables': { - 'grit_path': '../tools/grit/grit.py', 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', }, 'actions': [ @@ -103,14 +101,14 @@ '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)\' <(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)'], 'message': 'Generating resources from <(input_path)', }, ], |