diff options
| -rw-r--r-- | base/SConscript | 7 | ||||
| -rw-r--r-- | build/SConscript.main | 17 |
2 files changed, 18 insertions, 6 deletions
diff --git a/base/SConscript b/base/SConscript index 82d652e..1248f71 100644 --- a/base/SConscript +++ b/base/SConscript @@ -340,7 +340,12 @@ base_unittests = env_tests.ChromeTestProgram('base_unittests', test_files) # Temporarily put things where the buildbot expects them. installed_base_unittests = env.Replicate('$MAIN_DIR/Hammer', base_unittests) -env.Requires(installed_base_unittests, '$MAIN_DIR/Hammer/icudt38.dll') +if env['PLATFORM'] == 'win32': + icu_data = '$OBJ_ROOT/icudt38.dll' +else: + icu_data = '$OBJ_ROOT/icudt38l.dat' +icu_data = env.Replicate('$MAIN_DIR/Hammer', icu_data) +env.Requires(installed_base_unittests, icu_data) sconscript_dirs = [ 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 = [ |