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

Unified Diff: chrome_frame/chrome_frame.gyp

Issue 2020003: Committing for jeffbailey.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 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/version.h.in ('k') | chrome_frame/chrome_tab_version.rc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/chrome_frame.gyp
===================================================================
--- chrome_frame/chrome_frame.gyp (revision 46685)
+++ chrome_frame/chrome_frame.gyp (working copy)
@@ -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)'
- },
- ],
},
],
}
« no previous file with comments | « chrome/version.h.in ('k') | chrome_frame/chrome_tab_version.rc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698