summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-12 19:24:15 +0000
committersgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-12 19:24:15 +0000
commit5f15b43bc935cf478dbc0bcb14c5c7a5f7e62a58 (patch)
treefc99df2a4322be60f30bfd46b77a6133855b8dec
parent7f40fc5b4f5696348daa96b2104eaab93931eb72 (diff)
downloadchromium_src-5f15b43bc935cf478dbc0bcb14c5c7a5f7e62a58.zip
chromium_src-5f15b43bc935cf478dbc0bcb14c5c7a5f7e62a58.tar.gz
chromium_src-5f15b43bc935cf478dbc0bcb14c5c7a5f7e62a58.tar.bz2
Add resources necessary for building chrome.exe via gyp-generated files.
BUG=none TEST=none Review URL: http://codereview.chromium.org/126063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18305 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/chrome.gyp50
1 files changed, 50 insertions, 0 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 30f4a6a..758379f 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -2516,6 +2516,13 @@
'worker',
'app/locales/locales.gyp:*',
],
+ 'sources': [
+ 'app/chrome_exe.rc',
+ 'app/chrome_exe_version.rc.version',
+ ],
+ 'include_dirs': [
+ '<(SHARED_INTERMEDIATE_DIR)/app',
+ ],
'msvs_settings': {
'VCLinkerTool': {
'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib',
@@ -2523,6 +2530,49 @@
'SubSystem': '2',
},
},
+ 'actions': [
+ {
+ 'action_name': 'version',
+ 'variables': {
+ 'lastchange_path':
+ '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
+ 'version_py': 'tools/build/version.py',
+ 'version_path': 'VERSION',
+ 'template_input_path': 'app/chrome_exe_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)/app/chrome_exe_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)'
+ },
+ ],
},{ # 'OS!="win"
'dependencies': [
# On Linux and Mac, link the dependencies (libraries)