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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_tests.gypi

Issue 7390037: Generating separate version resources for: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 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
« chrome/app/chrome_exe_version.rc.version ('K') | « chrome/chrome_exe.gypi ('k') | chrome_frame/chrome_frame.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
===================================================================
--- chrome/chrome_tests.gypi (revision 92932)
+++ chrome/chrome_tests.gypi (working copy)
@@ -565,7 +565,7 @@
'../third_party/wtl/include',
],
'dependencies': [
- 'chrome.gyp:chrome_dll_version',
+ 'chrome.gyp:chrome_version_resources',
'chrome.gyp:installer_util_strings',
'../sandbox/sandbox.gyp:sandbox',
'../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
@@ -597,7 +597,7 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
@@ -2210,7 +2210,7 @@
}],
['OS=="win"', {
'dependencies': [
- 'chrome_dll_version',
+ 'chrome_version_resources',
'installer_util_strings',
'../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
'../third_party/isimpledom/isimpledom.gyp:isimpledom',
@@ -2237,7 +2237,7 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
@@ -2348,7 +2348,7 @@
'app/chrome_command_ids.h',
'app/chrome_dll.rc',
'app/chrome_dll_resource.h',
- 'app/chrome_dll_version.rc.version',
+ 'app/chrome_version.rc.version',
'browser/accessibility/renderer_accessibility_browsertest.cc',
'browser/autocomplete/autocomplete_browsertest.cc',
'browser/autofill/form_structure_browsertest.cc',
@@ -2659,7 +2659,7 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
@@ -2671,7 +2671,7 @@
'<(DEPTH)/third_party/wtl/include',
],
'dependencies': [
- 'chrome_dll_version',
+ 'chrome_version_resources',
'installer_util_strings',
'../sandbox/sandbox.gyp:sandbox',
],
@@ -2696,7 +2696,7 @@
'app/chrome_command_ids.h',
'app/chrome_dll.rc',
'app/chrome_dll_resource.h',
- 'app/chrome_dll_version.rc.version',
+ 'app/chrome_version.rc.version',
'browser/extensions/extension_rlz_apitest.cc',
# http://crbug.com/15101 These tests fail on Linux and Mac.
'browser/renderer_host/web_cache_manager_browsertest.cc',
@@ -2834,7 +2834,7 @@
}],
['OS=="win"', {
'dependencies': [
- 'chrome_dll_version',
+ 'chrome_version_resources',
'installer_util_strings',
'../sandbox/sandbox.gyp:sandbox',
],
@@ -2845,7 +2845,7 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
@@ -3432,7 +3432,7 @@
'app/chrome_command_ids.h',
'app/chrome_dll.rc',
'app/chrome_dll_resource.h',
- 'app/chrome_dll_version.rc.version',
+ 'app/chrome_version.rc.version',
'browser/password_manager/password_form_data.cc',
'browser/sessions/session_backend.cc',
'browser/sync/glue/session_model_associator.cc',
@@ -3525,14 +3525,14 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
],
'include_dirs': [
'<(DEPTH)/third_party/wtl/include',
],
'dependencies': [
- 'chrome_dll_version',
+ 'chrome_version_resources',
'installer_util_strings',
'../sandbox/sandbox.gyp:sandbox',
],
@@ -3555,7 +3555,7 @@
}, { # else: OS != "win"
'sources!': [
'app/chrome_dll.rc',
- 'app/chrome_dll_version.rc.version',
+ 'app/chrome_version.rc.version',
'test/data/resource.rc',
],
}],
@@ -3628,7 +3628,7 @@
'conditions': [
['OS=="win"', {
'dependencies': [
- 'chrome_dll_version',
+ 'chrome_version_resources',
'installer_util_strings',
'../sandbox/sandbox.gyp:sandbox',
],
@@ -3638,14 +3638,14 @@
'sources': [
'app/chrome_dll.rc',
'app/chrome_dll_resource.h',
- 'app/chrome_dll_version.rc.version',
+ 'app/chrome_version.rc.version',
'<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
« chrome/app/chrome_exe_version.rc.version ('K') | « chrome/chrome_exe.gypi ('k') | chrome_frame/chrome_frame.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698