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

Unified Diff: chrome/chrome.gyp

Issue 5259007: Undo removal of chrome_dll_version from r67457. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge to head Created 10 years, 1 month 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/app/chrome_dll_version.rc.version ('k') | chrome/chrome_dll.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index ae48340d083a16037adff6822156b7d91dec22e6..71fb193f2b8848c569a5fd15fe4a04915f873948 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1678,6 +1678,59 @@
],
},
{
+ 'target_name': 'chrome_dll_version',
+ 'type': 'none',
+ #'msvs_guid': '414D4D24-5D65-498B-A33F-3A29AD3CDEDC',
+ 'dependencies': [
+ '../build/util/build_util.gyp:lastchange',
+ ],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version',
+ ],
+ },
+ 'actions': [
+ {
+ 'action_name': 'version',
+ 'variables': {
+ 'lastchange_path':
+ '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
+ 'template_input_path': 'app/chrome_dll_version.rc.version',
+ },
+ 'conditions': [
+ [ 'branding == "Chrome"', {
+ 'variables': {
+ 'branding_path': 'app/theme/google_chrome/BRANDING',
+ },
+ }, { # else branding!="Chrome"
+ 'variables': {
+ 'branding_path': 'app/theme/chromium/BRANDING',
+ },
+ }],
+ ],
+ 'inputs': [
+ '<(template_input_path)',
+ '<(version_path)',
+ '<(branding_path)',
+ '<(lastchange_path)',
+ ],
+ 'outputs': [
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
+ ],
+ 'action': [
+ 'python',
+ '<(version_py_path)',
+ '-f', '<(version_path)',
+ '-f', '<(branding_path)',
+ '-f', '<(lastchange_path)',
+ '<(template_input_path)',
+ '<@(_outputs)',
+ ],
+ 'message': 'Generating version information in <(_outputs)'
+ },
+ ],
+ },
+ {
'target_name': 'chrome_version_header',
'type': 'none',
'hard_dependency': 1,
« no previous file with comments | « chrome/app/chrome_dll_version.rc.version ('k') | chrome/chrome_dll.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698