diff options
| -rw-r--r-- | base/base.gyp | 107 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 1 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 1 |
3 files changed, 61 insertions, 48 deletions
diff --git a/base/base.gyp b/base/base.gyp index 8aa8a3a..94d2cfb 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -130,7 +130,6 @@ 'file_util_win.cc', 'file_version_info.cc', 'file_version_info.h', - 'file_version_info_linux.cc', 'file_version_info_mac.mm', 'fix_wp64.h', 'float_util.h', @@ -369,53 +368,6 @@ ], 'conditions': [ [ 'OS == "linux"', { - 'actions': [ - { - 'action_name': 'linux_version', - 'variables': { - 'lastchange_path': - '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', - 'version_py_path': '../chrome/tools/build/version.py', - 'version_path': '../chrome/VERSION', - 'template_input_path': 'file_version_info_linux.h.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)', - '<(lastchange_path)', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/base/file_version_info_linux.h', - ], - 'action': [ - 'python', - '<(version_py_path)', - '-f', '<(version_path)', - '-f', '<(branding_path)', - '-f', '<(lastchange_path)', - '<(template_input_path)', - '<@(_outputs)', - ], - 'message': 'Generating version information', - }, - ], - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)', - ], 'sources/': [ ['exclude', '_(mac|win|chromeos)\\.cc$'], ['exclude', '\\.mm?$' ] ], 'sources!': [ @@ -788,5 +740,64 @@ }, ], }], + [ 'OS == "linux"', { + 'targets': [ + { + 'target_name': 'linux_versioninfo', + 'type': '<(library)', + 'sources': [ + 'file_version_info_linux.cc', + ], + 'include_dirs': [ + '..', + '<(SHARED_INTERMEDIATE_DIR)', + ], + 'actions': [ + { + 'action_name': 'linux_version', + 'variables': { + 'lastchange_path': + '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', + 'version_py_path': '../chrome/tools/build/version.py', + 'version_path': '../chrome/VERSION', + 'template_input_path': 'file_version_info_linux.h.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)', + '<(lastchange_path)', + ], + 'outputs': [ + '<(SHARED_INTERMEDIATE_DIR)/base/file_version_info_linux.h', + ], + 'action': [ + 'python', + '<(version_py_path)', + '-f', '<(version_path)', + '-f', '<(branding_path)', + '-f', '<(lastchange_path)', + '<(template_input_path)', + '<@(_outputs)', + ], + 'message': 'Generating version information', + }, + ], + }, + ], + }], ], } diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 286c8ce..e75d2d2 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1908,6 +1908,7 @@ # '../build/linux/system.gyp:gnome-keyring', '../build/linux/system.gyp:gtk', '../build/linux/system.gyp:nss', + '../base/base.gyp:linux_versioninfo', ], 'sources!': [ 'browser/views/extensions/extension_shelf.cc', diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index a05fc59..d8a2b6a 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -1440,6 +1440,7 @@ ['OS=="linux"', { 'dependencies': [ '../build/linux/system.gyp:gtk', + '../base/base.gyp:linux_versioninfo', ], 'export_dependent_settings': [ # Users of webcursor.h need the GTK include path. |