diff options
| author | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-18 06:04:24 +0000 |
|---|---|---|
| committer | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-18 06:04:24 +0000 |
| commit | 69a613f3a95c188524ac8e590fb45396b047c9ee (patch) | |
| tree | 007131a97049053a3e2967fa2c1695c8c0583b1a /base | |
| parent | 989b6e8061bff363e43f13f5aa9bacef6b321603 (diff) | |
| download | chromium_src-69a613f3a95c188524ac8e590fb45396b047c9ee.zip chromium_src-69a613f3a95c188524ac8e590fb45396b047c9ee.tar.gz chromium_src-69a613f3a95c188524ac8e590fb45396b047c9ee.tar.bz2 | |
Adding in new hammer patterns. Restored from rollback change 3578.
Review URL: http://codereview.chromium.org/7656
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3597 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/SConscript | 11 | ||||
| -rw-r--r-- | base/gfx/SConscript | 13 |
2 files changed, 13 insertions, 11 deletions
diff --git a/base/SConscript b/base/SConscript index 2d7e8a7..ef462d9 100644 --- a/base/SConscript +++ b/base/SConscript @@ -11,7 +11,7 @@ env.Prepend( CPPPATH = [ '$ICU38_DIR/public/common', '$ICU38_DIR/public/i18n', - '..', + '$ROOT_DIR', ], CPPDEFINES = [ 'U_STATIC_IMPLEMENTATION', @@ -191,7 +191,7 @@ env_tests.Prepend( '$LIBPNG_DIR', '$ICU38_DIR/public/common', '$ICU38_DIR/public/i18n', - '..', + '$ROOT_DIR', ], CPPDEFINES = [ 'UNIT_TEST', @@ -304,7 +304,7 @@ test_files = [ if env['PLATFORM'] == 'win32': # These tests aren't really Windows-specific, they're just here until # we have the port versions working. - env_tests.ChromeTestProgram('debug_message', ['debug_message.cc']) + env_tests.ChromeProgram('debug_message', ['debug_message.cc']) test_files.extend([ 'directory_watcher_unittest.cc', @@ -336,8 +336,9 @@ if env['PLATFORM'] == 'darwin': base_unittests = env_tests.ChromeTestProgram('base_unittests', test_files) -# Install up a level to allow unit test path assumptions to be valid. -installed_base_unittests = env.Install('$TARGET_ROOT', base_unittests) +# 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') sconscript_dirs = [ diff --git a/base/gfx/SConscript b/base/gfx/SConscript index c862193..57d1b54 100644 --- a/base/gfx/SConscript +++ b/base/gfx/SConscript @@ -6,10 +6,12 @@ Import('env') env = env.Clone() -# Remove an inherited relative path that doesn't make sense anymore. This -# makes sure we don't pull in the wrong version of time.h when building on -# linux. -env['CPPPATH'].remove('..') +# This path causing linux to grab the wrong time.h +env.FilterOut( + CPPPATH = [ + '$MAIN_DIR/..', + ], +) env.Prepend( CPPPATH = [ @@ -20,7 +22,6 @@ env.Prepend( '$LIBPNG_DIR', '$ICU38_DIR/public/common', '$ICU38_DIR/public/i18n', - '../..', ], CPPDEFINES = [ 'PNG_USER_CONFIG', @@ -62,6 +63,7 @@ if env['PLATFORM'] == 'win32': if env['PLATFORM'] == 'win32': input_files.extend([ + 'gdi_util.cc', 'bitmap_platform_device_win.cc', 'platform_canvas_win.cc', 'platform_device_win.cc', @@ -74,4 +76,3 @@ elif env['PLATFORM'] == 'posix': ]) env.ChromeStaticLibrary('base_gfx', input_files) - |