diff options
| author | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-24 21:19:55 +0000 |
|---|---|---|
| committer | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-24 21:19:55 +0000 |
| commit | 7d5d73f6f3eec734eee27486f7121585d72774d7 (patch) | |
| tree | 78a0e702723a164d023c927d47064192455d5c09 /base | |
| parent | 26d3857c6d85fc760ecf61276b5ffd6c61199a14 (diff) | |
| download | chromium_src-7d5d73f6f3eec734eee27486f7121585d72774d7.zip chromium_src-7d5d73f6f3eec734eee27486f7121585d72774d7.tar.gz chromium_src-7d5d73f6f3eec734eee27486f7121585d72774d7.tar.bz2 | |
SHARED_INTERMEDIATE_DIR is a better place for generated headers.
Also, use chrome path calculated relative to version.sh, since the passed-in
path isn't correct on the buildbot.
Review URL: http://codereview.chromium.org/42574
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12401 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/base.gyp | 7 | ||||
| -rw-r--r-- | base/base.scons | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/base/base.gyp b/base/base.gyp index 2c185d3..73b9d9c 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -326,7 +326,7 @@ 'variables': { 'template_input_path': 'file_version_info_linux.h.version', 'template_output_path': - '<(INTERMEDIATE_DIR)/base/file_version_info_linux.h', + '<(SHARED_INTERMEDIATE_DIR)/base/file_version_info_linux.h', }, 'inputs': [ '<(template_input_path)', @@ -344,17 +344,16 @@ # 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. - '<(INTERMEDIATE_DIR)/base/file_version_info_linux.bogus', + '<(SHARED_INTERMEDIATE_DIR)/base/file_version_info_linux.bogus', ], 'action': [ '../chrome/tools/build/linux/version.sh', '<(template_input_path)', '<(template_output_path)', - '../chrome' ], }, ], 'include_dirs': [ - '<(INTERMEDIATE_DIR)', + '<(SHARED_INTERMEDIATE_DIR)', ], 'sources/': [ ['exclude', '_(mac|win)\\.cc$'], ['exclude', '\\.mm?$' ] ], diff --git a/base/base.scons b/base/base.scons index 09f5948..e7d72a3 100644 --- a/base/base.scons +++ b/base/base.scons @@ -408,8 +408,7 @@ if env.Bit('linux'): 'file_version_info_linux.h.version', ('../chrome/tools/build/linux/version.sh' ' ${SOURCE}' - ' ${TARGET}' - ' ../chrome')) + ' ${TARGET}')) env.AlwaysBuild(linux_version) # Always generate version information, e.g. to capture revision changes, which # aren't captured by file dependencies. |