Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5664)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome.gyp

Issue 119075: Revert last checkin to fix resources in Release builds. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/browser.vcproj ('k') | chrome/test/browser/browser_tests_dll.vcproj » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 17467)
+++ chrome/chrome.gyp (working copy)
@@ -62,6 +62,7 @@
'target_name': 'chrome_resources',
'type': 'none',
'msvs_guid': 'B95AB527-F7DB-41E9-AD91-EB51EE0F56BE',
+ 'msvs_existing_vcproj': 'app/chrome_resources.vcproj',
'rules': [
{
'rule_name': 'grit',
@@ -84,11 +85,11 @@
'../tools/grit/grit.py',
],
'outputs': [
- '<(grit_out_dir)/grit/<(RULE_INPUT_ROOT).h',
- '<(grit_out_dir)/<(RULE_INPUT_ROOT).pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/grit/<(RULE_INPUT_ROOT).h',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/<(RULE_INPUT_ROOT).pak',
],
'action': ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)',
- 'build', '-o', '<(grit_out_dir)',
+ 'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/chrome',
'-D', '<(chrome_build)',
'-E', '<(branded_env)',
],
@@ -104,7 +105,7 @@
],
'direct_dependent_settings': {
'include_dirs': [
- '<(grit_out_dir)',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome',
],
},
'conditions': [
@@ -121,6 +122,7 @@
'target_name': 'chrome_strings',
'type': 'none',
'msvs_guid': 'D9DDAF60-663F-49CC-90DC-3D08CC3D1B28',
+ 'msvs_existing_vcproj': 'app/chrome_strings.vcproj',
'rules': [
{
'rule_name': 'grit',
@@ -141,14 +143,14 @@
'../tools/grit/grit.py',
],
'outputs': [
- '<(grit_out_dir)/grit/<(RULE_INPUT_ROOT).h',
- '<(grit_out_dir)/<(RULE_INPUT_ROOT)_da.pak',
- '<(grit_out_dir)/<(RULE_INPUT_ROOT)_en-US.pak',
- '<(grit_out_dir)/<(RULE_INPUT_ROOT)_he.pak',
- '<(grit_out_dir)/<(RULE_INPUT_ROOT)_zh-TW.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/grit/<(RULE_INPUT_ROOT).h',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/<(RULE_INPUT_ROOT)_da.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/<(RULE_INPUT_ROOT)_en-US.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/<(RULE_INPUT_ROOT)_he.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/<(RULE_INPUT_ROOT)_zh-TW.pak',
],
'action': ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)',
- 'build', '-o', '<(grit_out_dir)',
+ 'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/chrome',
'-D', '<(chrome_build)'],
'message': 'Generating resources from <(RULE_INPUT_PATH)',
},
@@ -162,7 +164,7 @@
],
'direct_dependent_settings': {
'include_dirs': [
- '<(grit_out_dir)',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome',
],
},
'conditions': [
@@ -211,7 +213,7 @@
],
'direct_dependent_settings': {
'include_dirs': [
- '<(grit_out_dir)',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome',
],
},
'conditions': [
@@ -1554,7 +1556,7 @@
'tools/build/win/precompiled_wtl.cc',
# This file is generated by GRIT.
- '<(grit_out_dir)/grit/theme_resources_map.cc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/grit/theme_resources_map.cc',
],
'conditions': [
['javascript_engine=="v8"', {
@@ -2416,10 +2418,10 @@
'action_name': 'repack_chrome',
'variables': {
'pak_inputs': [
- '<(grit_out_dir)/browser_resources.pak',
- '<(grit_out_dir)/debugger_resources.pak',
- '<(grit_out_dir)/common_resources.pak',
- '<(grit_out_dir)/renderer_resources.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/debugger_resources.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
],
@@ -2439,7 +2441,7 @@
'variables': {
'pak_inputs': [
'<(SHARED_INTERMEDIATE_DIR)/app/app_resources.pak',
- '<(grit_out_dir)/theme_resources.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.pak',
],
},
'inputs': [
@@ -2465,18 +2467,18 @@
'action_name': 'repack_locale_da',
'variables': {
'pak_inputs': [
- '<(grit_out_dir)/generated_resources_da.pak',
- '<(grit_out_dir)/locale_settings_da.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_da.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/locale_settings_da.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_da.pak',
],
'conditions': [
['branding=="Chrome"', {
'pak_inputs': [
- '<(grit_out_dir)/google_chrome_strings_da.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/google_chrome_strings_da.pak',
]
}, { # else: branding!="Chrome"
'pak_inputs': [
- '<(grit_out_dir)/chromium_strings_da.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/chromium_strings_da.pak',
]
}],
],
@@ -2509,18 +2511,18 @@
'action_name': 'repack_locale_en_us',
'variables': {
'pak_inputs': [
- '<(grit_out_dir)/generated_resources_en-US.pak',
- '<(grit_out_dir)/locale_settings_en-US.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_en-US.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/locale_settings_en-US.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
],
'conditions': [
['branding=="Chrome"', {
'pak_inputs': [
- '<(grit_out_dir)/google_chrome_strings_en-US.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/google_chrome_strings_en-US.pak',
]
}, { # else: branding!="Chrome"
'pak_inputs': [
- '<(grit_out_dir)/chromium_strings_en-US.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/chromium_strings_en-US.pak',
]
}],
],
@@ -2549,18 +2551,18 @@
'action_name': 'repack_locale_he',
'variables': {
'pak_inputs': [
- '<(grit_out_dir)/generated_resources_he.pak',
- '<(grit_out_dir)/locale_settings_he.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_he.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/locale_settings_he.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_he.pak',
],
'conditions': [
['branding=="Chrome"', {
'pak_inputs': [
- '<(grit_out_dir)/google_chrome_strings_he.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/google_chrome_strings_he.pak',
]
}, { # else: branding!="Chrome"
'pak_inputs': [
- '<(grit_out_dir)/chromium_strings_he.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/chromium_strings_he.pak',
]
}],
],
@@ -2588,18 +2590,18 @@
'action_name': 'repack_locale_zh_tw',
'variables': {
'pak_inputs': [
- '<(grit_out_dir)/generated_resources_zh-TW.pak',
- '<(grit_out_dir)/locale_settings_zh-TW.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_zh-TW.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/locale_settings_zh-TW.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_zh-TW.pak',
],
'conditions': [
['branding=="Chrome"', {
'pak_inputs': [
- '<(grit_out_dir)/google_chrome_strings_zh-TW.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/google_chrome_strings_zh-TW.pak',
]
}, { # else: branding!="Chrome"
'pak_inputs': [
- '<(grit_out_dir)/chromium_strings_zh-TW.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/chromium_strings_zh-TW.pak',
]
}],
],
@@ -3660,7 +3662,7 @@
'VERSION': '../chrome/VERSION',
'template_input_path': 'app/chrome_dll_version.rc.version',
'template_output_path':
- '<(grit_out_dir)/chrome_dll_version.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_dll_version.rc',
},
'conditions': [
[ 'branding == "Chrome"', {
@@ -3684,7 +3686,7 @@
# Use a non-existant output so this action always runs and
# generates version information, e.g. to capture revision
# changes, which aren't captured by file dependencies.
- '<(grit_out_dir)/chrome_dll_version.bogus',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_dll_version.bogus',
# And this is the real output, so that the build system knows
# what action generates it.
« no previous file with comments | « chrome/browser/browser.vcproj ('k') | chrome/test/browser/browser_tests_dll.vcproj » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698