summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_frame.gyp
diff options
context:
space:
mode:
authormad@google.com <mad@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-07 20:41:38 +0000
committermad@google.com <mad@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-07 20:41:38 +0000
commit4d91cbc7507d85971368202326bcb58531374a8d (patch)
tree27e562b041ec74fa21b2a479ab7f358bdb68c984 /chrome_frame/chrome_frame.gyp
parent4ae3d4e71fcd94412d9957a0be05a3479e332b8d (diff)
downloadchromium_src-4d91cbc7507d85971368202326bcb58531374a8d.zip
chromium_src-4d91cbc7507d85971368202326bcb58531374a8d.tar.gz
chromium_src-4d91cbc7507d85971368202326bcb58531374a8d.tar.bz2
Committing for jeffbailey.
Excerpt from: http://codereview.chromium.org/1991004/show ---------------- Put version information into header file for easy consumption by RC files. RC files can use an #include to pull in this header, rather than being each dynamically generated. BUG=none TEST=none ---------------- Review URL: http://codereview.chromium.org/2020003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46736 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame.gyp')
-rw-r--r--chrome_frame/chrome_frame.gyp48
1 files changed, 2 insertions, 46 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index 091352d..b3cafe3 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -753,6 +753,7 @@
'chrome_launcher',
'xulrunner_sdk',
'../chrome/chrome.gyp:chrome_version_info',
+ '../chrome/chrome.gyp:chrome_version_header',
'../chrome/chrome.gyp:common',
'../chrome/chrome.gyp:utility',
'../build/temp_gyp/googleurl.gyp:googleurl',
@@ -769,7 +770,7 @@
# figure out something more gyp-ish.
'resources/tlb_resource.rc',
'chrome_tab.rgs',
- 'chrome_tab_version.rc.version',
+ 'chrome_tab_version.rc',
'resource.h',
],
'include_dirs': [
@@ -817,51 +818,6 @@
},
}],
],
- 'rules': [
- # Borrowed from chrome.gyp:chrome_dll_version, branding references
- # removed
- {
- 'rule_name': 'version',
- 'extension': 'version',
- 'variables': {
- 'version_py': '../chrome/tools/build/version.py',
- 'version_path': '../chrome/VERSION',
- 'lastchange_path':
- '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
- 'template_input_path': 'chrome_tab_version.rc.version',
- },
- 'conditions': [
- [ 'branding == "Chrome"', {
- 'variables': {
- 'branding_path': '../chrome/app/theme/google_chrome/BRANDING',
- },
- }, { # else branding!="Chrome"
- 'variables': {
- 'branding_path': '../chrome/app/theme/chromium/BRANDING',
- },
- }],
- ],
- 'inputs': [
- '<(template_input_path)',
- '<(version_path)',
- '<(branding_path)',
- ],
- 'outputs': [
- '<(INTERMEDIATE_DIR)/chrome_tab_version.rc',
- ],
- 'action': [
- 'python',
- '<(version_py)',
- '-f', '<(version_path)',
- '-f', '<(branding_path)',
- '-f', '<(lastchange_path)',
- '<(template_input_path)',
- '<@(_outputs)',
- ],
- 'process_outputs_as_sources': 1,
- 'message': 'Generating version information in <(_outputs)'
- },
- ],
},
],
}