diff options
author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-23 04:49:53 +0000 |
---|---|---|
committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-23 04:49:53 +0000 |
commit | 367a758fff63fe033045551915770969dd54e035 (patch) | |
tree | 4ed0bf1ba4c05df654afe519e833c2a54a935144 /chrome/chrome.gyp | |
parent | ea832f7c6f6760c95e1029196f34f355ff69b38e (diff) | |
download | chromium_src-367a758fff63fe033045551915770969dd54e035.zip chromium_src-367a758fff63fe033045551915770969dd54e035.tar.gz chromium_src-367a758fff63fe033045551915770969dd54e035.tar.bz2 |
Changing the grd files in chrome/webkit/app to be compiled to seprate
directories to prevent them from stomping each other when they have names that
are the same.
Also adding some dependencies on theme_resources, webkit_resources,
that were missing, but undetected due to everyone sharing the same output
directory.
BUG=22385
TEST=None
Review URL: http://codereview.chromium.org/208056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26904 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
-rw-r--r-- | chrome/chrome.gyp | 56 |
1 files changed, 33 insertions, 23 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 881fdff..71c8a01 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -37,10 +37,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'], 'browser_tests_sources': [ 'browser/browser_browsertest.cc', 'browser/browser_init_browsertest.cc', @@ -197,10 +198,10 @@ '<@(chrome_resources_inputs)', ], 'outputs': [ - '<(grit_out_dir)/grit/<(RULE_INPUT_ROOT).h', - '<(grit_out_dir)/<(RULE_INPUT_ROOT).pak', + '<(grit_out_dir)/<(RULE_INPUT_ROOT)/grit/<(RULE_INPUT_ROOT).h', + '<(grit_out_dir)/<(RULE_INPUT_ROOT)/<(RULE_INPUT_ROOT).pak', # TODO(bradnelson): move to something like this instead - #'<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(chrome_resources_grds))', + #'<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)/<(RULE_INPUT_ROOT)\' <(chrome_resources_grds))', # This currently cannot work because gyp only evaluates the # outputs once (rather than per case where the rule applies). # This means you end up with all the outputs from all the grd @@ -208,9 +209,9 @@ # 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)', + 'build', '-o', '<(grit_out_dir)/<(RULE_INPUT_ROOT)', '-D', '<(chrome_build)', '-E', '<(branded_env)', ], @@ -228,7 +229,9 @@ ], 'direct_dependent_settings': { 'include_dirs': [ - '<(grit_out_dir)', + '<(grit_out_dir)/browser_resources', + '<(grit_out_dir)/common_resources', + '<(grit_out_dir)/renderer_resources', ], }, 'conditions': [ @@ -284,16 +287,15 @@ '<@(chrome_strings_inputs)', ], 'outputs': [ - '<(grit_out_dir)/grit/<(RULE_INPUT_ROOT).h', + '<(grit_out_dir)/<(RULE_INPUT_ROOT)/grit/<(RULE_INPUT_ROOT).h', # TODO: remove this helper when we have loops in GYP - '>!@(<(apply_locales_cmd) \'<(grit_out_dir)/<(RULE_INPUT_ROOT)_ZZLOCALE.pak\' <(locales))', + '>!@(<(apply_locales_cmd) \'<(grit_out_dir)/<(RULE_INPUT_ROOT)/<(RULE_INPUT_ROOT)_ZZLOCALE.pak\' <(locales))', # TODO(bradnelson): move to something like this - #'<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(chrome_strings_grds))', + #'<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)/<(RULE_INPUT_ROOT)\' <(chrome_strings_grds))', # See comment in chrome_resources as to why. ], - 'action': ['python', '../tools/grit/grit.py', '-i', - '<(RULE_INPUT_PATH)', - 'build', '-o', '<(grit_out_dir)', + 'action': ['<@(grit_cmd)', '-i', '<(RULE_INPUT_PATH)', + 'build', '-o', '<(grit_out_dir)/<(RULE_INPUT_ROOT)', '-D', '<(chrome_build)'], 'conditions': [ ['chromeos==1', { @@ -312,7 +314,10 @@ ], 'direct_dependent_settings': { 'include_dirs': [ - '<(grit_out_dir)', + '<(grit_out_dir)/locale_settings', + '<(grit_out_dir)/chromium_strings', + '<(grit_out_dir)/generated_resources', + '<(grit_out_dir)/google_chrome_strings', ], }, }, @@ -321,9 +326,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', @@ -344,12 +346,12 @@ '<!@(<(grit_info_cmd) --inputs <(input_path))', ], 'outputs': [ - '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(input_path))', + '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)/theme_resources\' <(input_path))', ], 'action': [ - 'python', '<(grit_path)', + '<@(grit_cmd)', '-i', '<(input_path)', 'build', - '-o', '<(grit_out_dir)', + '-o', '<(grit_out_dir)/theme_resources', '-D', '<(chrome_build)' ], 'conditions': [ @@ -365,7 +367,7 @@ ], 'direct_dependent_settings': { 'include_dirs': [ - '<(grit_out_dir)', + '<(grit_out_dir)/theme_resources', ], }, 'conditions': [ @@ -2863,6 +2865,7 @@ '../third_party/npapi/npapi.gyp:npapi', '../webkit/webkit.gyp:glue', '../webkit/webkit.gyp:webkit', + '../webkit/webkit.gyp:webkit_resources', ], 'include_dirs': [ '..', @@ -3861,6 +3864,7 @@ 'chrome_strings', 'syncapi', 'test_support_ui', + 'theme_resources', '../base/base.gyp:base', '../net/net.gyp:net', '../build/temp_gyp/googleurl.gyp:googleurl', @@ -4010,6 +4014,7 @@ 'debugger', 'renderer', 'syncapi', + 'theme_resources', 'test_support_unit', 'utility', '../app/app.gyp:app_resources', @@ -4639,6 +4644,7 @@ 'debugger', 'test_support_common', 'test_support_ui', + 'theme_resources', '../base/base.gyp:base', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', @@ -5324,6 +5330,7 @@ 'debugger', 'test_support_common', 'test_support_ui', + 'theme_resources', 'syncapi', '../third_party/hunspell/hunspell.gyp:hunspell', '../net/net.gyp:net_resources', @@ -5522,6 +5529,7 @@ 'chrome_strings', 'debugger', 'test_support_common', + 'theme_resources', '../base/base.gyp:test_support_base', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', @@ -6098,6 +6106,7 @@ 'security_tests', # run time dependency 'test_support_common', 'test_support_ui', + 'theme_resources', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', '../third_party/libxml/libxml.gyp:libxml', @@ -6144,6 +6153,7 @@ 'chrome_strings', 'test_support_common', 'test_support_ui', + 'theme_resources', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', ], |