diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-05 19:48:25 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-05 19:48:25 +0000 |
| commit | 2516153bbd24a2d630fe04176c8d3190744e6246 (patch) | |
| tree | ca3c928b9266d80a19aaab8c57cd5a5cc4c1b049 /base | |
| parent | 89ac46c97e6a3b2f2726bd11d52824d27ee26a24 (diff) | |
| download | chromium_src-2516153bbd24a2d630fe04176c8d3190744e6246.zip chromium_src-2516153bbd24a2d630fe04176c8d3190744e6246.tar.gz chromium_src-2516153bbd24a2d630fe04176c8d3190744e6246.tar.bz2 | |
Make better (and more efficient) use of Hammer functionality
in base, net and sandbox:
* Remove by-hand Install() and Alias() calls.
* Set $COMPONENT_PROGRAM_GROUPS and $COMPONENT_TEST_PROGRAM_GROUPS
(with in each foo\foo.scons file) so executables get added
automatically to the appropriate Alias.
* Set $TESTS_DIR and $STAGING_DIR so executables get linked
directly in their final resting place ($TARGET_ROOT).
Review URL: http://codereview.chromium.org/9188
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4805 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/base.scons | 6 | ||||
| -rw-r--r-- | base/base_lib.scons | 3 | ||||
| -rw-r--r-- | base/base_unittests.scons | 7 |
3 files changed, 8 insertions, 8 deletions
diff --git a/base/base.scons b/base/base.scons index 66bfc83..bd0d193 100644 --- a/base/base.scons +++ b/base/base.scons @@ -8,6 +8,12 @@ Master configuration for building base components (including base_gfx). Import('env') +# Arrange for Hammer to add all programs to the 'base' Alias. +env.Append( + COMPONENT_PROGRAM_GROUPS = ['base'], + COMPONENT_TEST_PROGRAM_GROUPS = ['base'], +) + sconscript_files = [ 'base_lib.scons', 'base_unittests.scons', diff --git a/base/base_lib.scons b/base/base_lib.scons index 70572c2..89d0d6e 100644 --- a/base/base_lib.scons +++ b/base/base_lib.scons @@ -192,5 +192,4 @@ if env['PLATFORM'] == 'posix': 'worker_pool.cc', ]) -base_lib = env.ChromeStaticLibrary('base', input_files) -env.Alias('base', base_lib) +env.ChromeStaticLibrary('base', input_files) diff --git a/base/base_unittests.scons b/base/base_unittests.scons index a57240e..aedad49 100644 --- a/base/base_unittests.scons +++ b/base/base_unittests.scons @@ -172,12 +172,7 @@ if env['PLATFORM'] == 'darwin': 'platform_test_mac.mm', ]) -base_unittests = env.ChromeTestProgram('base_unittests', input_files) - -# Install up a level to allow unit test path assumptions to be valid. -installed_base_unittests = env.Install('$TARGET_ROOT', base_unittests) - -env.Alias('base', installed_base_unittests) +env.ChromeTestProgram('base_unittests', input_files) # TODO(sgk) should this be moved into base.lib like everything else? This will # require updating a bunch of other SConscripts which link directly against |