diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-20 20:33:37 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-20 20:33:37 +0000 |
| commit | e3d71ec17455b85384493160c15a1bf165351972 (patch) | |
| tree | 5d28d4c912595f2f26b9bd23d9285788b50399a7 /build/SConscript.main | |
| parent | 9acfaf8fa554e165456fea0695222ac3b23aeca5 (diff) | |
| download | chromium_src-e3d71ec17455b85384493160c15a1bf165351972.zip chromium_src-e3d71ec17455b85384493160c15a1bf165351972.tar.gz chromium_src-e3d71ec17455b85384493160c15a1bf165351972.tar.bz2 | |
Modules Linux fixes:
Construct the $THIRD_PARTY_DIR and $WEBKIT_DIR variables consistently
with other $*_DIR variables.
Don't execute test scripts from the VariantDir by default; everything
isn't installed in the proper place yet.
Use the 'build_component' variable from the submodule SConstruct
files to restrict how much we build by default (e.g. don't try to
build all of webkit if you're only working in base or net).
Review URL: http://codereview.chromium.org/7524
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3626 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/SConscript.main')
| -rw-r--r-- | build/SConscript.main | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/build/SConscript.main b/build/SConscript.main index 809ed280..6a7da71 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -74,9 +74,9 @@ base_env.Replace( SDCH_DIR = '$ROOT_DIR/sdch', SKIA_DIR = '$ROOT_DIR/skia', TESTING_DIR = '$ROOT_DIR/testing', - THIRD_PARTY_DIR = '$OBJ_ROOT/third_party', + THIRD_PARTY_DIR = '$ROOT_DIR/third_party', V8_DIR = '$ROOT_DIR/v8', - WEBKIT_DIR = '$OBJ_ROOT/webkit', + WEBKIT_DIR = '$ROOT_DIR/webkit', GTEST_DIR = '$TESTING_DIR/gtest', @@ -535,9 +535,16 @@ VERBOSE=1 Display full command lines #----------------------------------------------------------------------- -# Build all programs and libraries by default. -Default([base_env.Alias('all_programs'), - base_env.Alias('all_libraries')]) +# By default, the Hammer modules execute the tests to capture test +# output, but do it from a location that doesn't (yet) work for us. +# Replace the Hammer defaults with Chromium's. +Default(None) +Import('build_component') +Default(Alias(build_component)) + +# TODO: Get to the point of using Hammer's aliases. +#Default([base_env.Alias('all_programs'), +# base_env.Alias('all_libraries')]) # Create a list of all variants that are buildable. environment_list = [ |