diff options
author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-04 21:43:06 +0000 |
---|---|---|
committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-04 21:43:06 +0000 |
commit | 9b72d9a51a5e32f2600c27a65b6598745714c2be (patch) | |
tree | 47583ec8e6ef572e7d4c6e241c7f8ae26664598e /base/base.gyp | |
parent | e8718df676051d62167ab8d6c6cf71901df56b60 (diff) | |
download | chromium_src-9b72d9a51a5e32f2600c27a65b6598745714c2be.zip chromium_src-9b72d9a51a5e32f2600c27a65b6598745714c2be.tar.gz chromium_src-9b72d9a51a5e32f2600c27a65b6598745714c2be.tar.bz2 |
Only update files from .version templates when a file change
indicates it's necessary (now that fetching the last change
info is in a separate target executed every build) by
getting rid of the never-built .bogus files in the rules.
Update chrome/installer/installer.gyp with the new patterns.
Make the use of the *_path variable names more consistent.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/119181
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17668 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
-rw-r--r-- | base/base.gyp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/base/base.gyp b/base/base.gyp index b73415a..44fee70 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -367,8 +367,6 @@ 'version_py_path': '../chrome/tools/build/version.py', 'version_path': '../chrome/VERSION', 'template_input_path': 'file_version_info_linux.h.version', - 'template_output_path': - '<(SHARED_INTERMEDIATE_DIR)/base/file_version_info_linux.h', }, 'conditions': [ [ 'branding == "Chrome"', { @@ -390,14 +388,7 @@ '<(lastchange_path)', ], 'outputs': [ - # Use a non-existant output so this action always runs and - # generates version information, e.g. to capture revision - # changes, which aren't captured by file dependencies. - '<(SHARED_INTERMEDIATE_DIR)/base/file_version_info_linux.always', - - # And this is the real output, so that the build system knows - # what action generates it. - '<(template_output_path)', + '<(SHARED_INTERMEDIATE_DIR)/base/file_version_info_linux.h', ], 'action': [ 'python', @@ -406,7 +397,7 @@ '-f', '<(branding_path)', '-f', '<(lastchange_path)', '<(template_input_path)', - '<(template_output_path)', + '<@(_outputs)', ], 'message': 'Generating version information', }, |