Commit 9d87da03 authored by evan@chromium.org's avatar evan@chromium.org

Move chrome_version_info target into chrome_common.

The source files live in chrome/common, and they're there because
we need to get at version infomation all over the product (not
just from the exe, like the gyp files are currently written).

This refactoring is necessary for a follow-up change.

TEST=compiles

Review URL: http://codereview.chromium.org/3113026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57084 0039d316-1c4b-4281-b951-d872f2087c98
parent e1fcf148
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
'chrome_extra_resources', 'chrome_extra_resources',
'chrome_resources', 'chrome_resources',
'chrome_strings', 'chrome_strings',
'chrome_version_info',
'component_extensions', 'component_extensions',
'installer_util', 'installer_util',
'platform_locale_settings', 'platform_locale_settings',
......
...@@ -121,6 +121,68 @@ ...@@ -121,6 +121,68 @@
], ],
}, },
'targets': [ 'targets': [
{
'target_name': 'chrome_version_info',
'type': '<(library)',
'sources': [
'common/chrome_version_info.cc',
'common/chrome_version_info.h',
],
'include_dirs': [
'<(DEPTH)',
],
'conditions': [
[ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)',
],
'actions': [
{
'action_name': 'posix_version',
'variables': {
'lastchange_path':
'<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
'version_py_path': 'tools/build/version.py',
'version_path': 'VERSION',
'template_input_path': 'common/chrome_version_info_posix.h.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/common/chrome_version_info_posix.h',
],
'action': [
'python',
'<(version_py_path)',
'-f', '<(version_path)',
'-f', '<(branding_path)',
'-f', '<(lastchange_path)',
'<(template_input_path)',
'<@(_outputs)',
],
'message': 'Generating version information',
},
],
}],
]
},
{ {
'target_name': 'common', 'target_name': 'common',
'type': '<(library)', 'type': '<(library)',
...@@ -143,6 +205,7 @@ ...@@ -143,6 +205,7 @@
'chrome_strings', 'chrome_strings',
'common_constants', 'common_constants',
'common_net', 'common_net',
'chrome_version_info',
'default_plugin/default_plugin.gyp:default_plugin', 'default_plugin/default_plugin.gyp:default_plugin',
'theme_resources', 'theme_resources',
'../app/app.gyp:app_base', '../app/app.gyp:app_base',
......
...@@ -469,68 +469,6 @@ ...@@ -469,68 +469,6 @@
}], }],
], ],
}, },
{
'target_name': 'chrome_version_info',
'type': '<(library)',
'sources': [
'common/chrome_version_info.cc',
'common/chrome_version_info.h',
],
'include_dirs': [
'<(DEPTH)',
],
'conditions': [
[ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)',
],
'actions': [
{
'action_name': 'posix_version',
'variables': {
'lastchange_path':
'<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
'version_py_path': 'tools/build/version.py',
'version_path': 'VERSION',
'template_input_path': 'common/chrome_version_info_posix.h.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/common/chrome_version_info_posix.h',
],
'action': [
'python',
'<(version_py_path)',
'-f', '<(version_path)',
'-f', '<(branding_path)',
'-f', '<(lastchange_path)',
'<(template_input_path)',
'<@(_outputs)',
],
'message': 'Generating version information',
},
],
}],
]
}
], ],
'conditions': [ 'conditions': [
['OS=="win"', { ['OS=="win"', {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment