From 2516153bbd24a2d630fe04176c8d3190744e6246 Mon Sep 17 00:00:00 2001 From: "sgk@google.com" Date: Wed, 5 Nov 2008 19:48:25 +0000 Subject: 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 --- build/SConscript.main | 13 +++++++++++++ build/googleurl.scons | 2 -- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'build') diff --git a/build/SConscript.main b/build/SConscript.main index 5618396..49cd36a 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -28,12 +28,25 @@ else: root_env = Environment( tools = ['component_setup'], + CHROME_SRC_DIR = '$MAIN_DIR/..', DESTINATION_ROOT = '$MAIN_DIR/Hammer', TARGET_ROOT = '$DESTINATION_ROOT', + # Where ComponentTestProgram() will build test executables. + TESTS_DIR = '$TARGET_ROOT', + + # Where ComponentProgram() will build program executables. + STAGING_DIR = '$TARGET_ROOT', + + # Where ComponentLibrary() will build libraries. LIBS_DIR = '$COMPONENT_LIBRARY_DIR', + # TODO(hammer): when Hammer supports this... + # Have Hammer prefix all Library aliases with lib_ (to avoid + # collisions with the component names themselves). + #COMPONENT_LIBRARY_ALIAS = 'lib_$LIBNAME', + # Disable running of tests thru scons for now. COMPONENT_TEST_CMDLINE = '', diff --git a/build/googleurl.scons b/build/googleurl.scons index fffb4fd..6151fde 100644 --- a/build/googleurl.scons +++ b/build/googleurl.scons @@ -14,5 +14,3 @@ sconscript_files = [ ] SConscript(sconscript_files, exports=['env']) - -env.Alias('base', '.') -- cgit v1.1