diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 17:16:46 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 17:16:46 +0000 |
| commit | da6654b0465478b0549e593c1efb45bd44756965 (patch) | |
| tree | 487788278214089228f23098346c1d02b5acfec4 /chrome/tools/test/image_diff | |
| parent | 1fbb43878f7f68c1770a12847ecd46c0f1413b3e (diff) | |
| download | chromium_src-da6654b0465478b0549e593c1efb45bd44756965.zip chromium_src-da6654b0465478b0549e593c1efb45bd44756965.tar.gz chromium_src-da6654b0465478b0549e593c1efb45bd44756965.tar.bz2 | |
Next round of SCons changes:
* Add 'gdm_fp' to the $LIBS setting in base\using_base.scons
(to be removed when that library moves into base\third_party).
* Have the grit Scanner search the Repository() copy of the source
file (necessary now that $TARGET_ROOT has changed).
* Change all the SConscript files underneath chrome\test and
chrome\tools to *.scons files, including updating their
contents with the current patterns.
* Add dependencies of the local_settings_*.res files on
the corresponding google_chrome_string_*.rc files, so they
get generated properly.
* Add generation of the chrome_exe.res resource file.
* Comment out some unnecessary .lib settings in the base
construction environment.
Review URL: http://codereview.chromium.org/10745
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5480 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools/test/image_diff')
| -rw-r--r-- | chrome/tools/test/image_diff/image_diff.scons (renamed from chrome/tools/test/image_diff/SConscript) | 38 |
1 files changed, 15 insertions, 23 deletions
diff --git a/chrome/tools/test/image_diff/SConscript b/chrome/tools/test/image_diff/image_diff.scons index b1cccf5..b4d4a9e 100644 --- a/chrome/tools/test/image_diff/SConscript +++ b/chrome/tools/test/image_diff/image_diff.scons @@ -2,34 +2,30 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -Import('env_test') +Import('env') -env_test = env_test.Clone() +env = env.Clone() -env_test.Prepend( +env.ApplySConscript([ + '$BASE_DIR/using_base.scons', + '$BASE_DIR/gfx/using_base_gfx.scons', + '$ICU38_DIR/using_icu38.scons', + '$LIBPNG_DIR/using_libpng.scons', + '$SKIA_DIR/using_skia.scons', + '$ZLIB_DIR/using_zlib.scons', +]) + +env.Prepend( CPPDEFINES = [ - 'PNG_USER_CONFIG', - 'CHROME_PNG_WRITE_SUPPORT', '_DEBUG', ], CPPPATH = [ - '$ZLIB_DIR', - '$LIBPNG_DIR', '$CHROME_SRC_DIR', ], - LIBS = [ - 'dmg_fp', - 'skia', - 'libpng', - 'base_gfx', - env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed - env_test['ZLIB_LIB'], - 'base', - ], ) -if env_test['PLATFORM'] == 'win32': - env_test.Prepend( +if env['PLATFORM'] == 'win32': + env.Prepend( LINKFLAGS = [ '/INCREMENTAL', '/DEBUG', @@ -53,8 +49,4 @@ input_files = [ 'image_diff.cc', ] -exe = env_test.ChromeTestProgram('image_diff', input_files) -i = env_test.Install('$TARGET_ROOT', exe) - -env_test.Alias('chrome', i) - +env.ChromeTestProgram('image_diff', input_files) |