From da6654b0465478b0549e593c1efb45bd44756965 Mon Sep 17 00:00:00 2001 From: "sgk@google.com" Date: Fri, 14 Nov 2008 17:16:46 +0000 Subject: 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 --- chrome/tools/crash_service/SConscript | 54 ---------------------- chrome/tools/crash_service/crash_service.scons | 51 +++++++++++++++++++++ chrome/tools/perf/flush_cache/SConscript | 46 ------------------- chrome/tools/perf/flush_cache/flush_cache.scons | 44 ++++++++++++++++++ chrome/tools/test/image_diff/SConscript | 60 ------------------------- chrome/tools/test/image_diff/image_diff.scons | 52 +++++++++++++++++++++ 6 files changed, 147 insertions(+), 160 deletions(-) delete mode 100644 chrome/tools/crash_service/SConscript create mode 100644 chrome/tools/crash_service/crash_service.scons delete mode 100644 chrome/tools/perf/flush_cache/SConscript create mode 100644 chrome/tools/perf/flush_cache/flush_cache.scons delete mode 100644 chrome/tools/test/image_diff/SConscript create mode 100644 chrome/tools/test/image_diff/image_diff.scons (limited to 'chrome/tools') diff --git a/chrome/tools/crash_service/SConscript b/chrome/tools/crash_service/SConscript deleted file mode 100644 index fc4cc4e..0000000 --- a/chrome/tools/crash_service/SConscript +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -Import('env') - -env = env.Clone() - -env.Prepend( - CPPPATH = [ - '$BREAKPAD_DIR/src', - '$CHROME_SRC_DIR', - ], - LIBS = [ - 'base', - 'base_gfx', - 'breakpad_handler', - 'breakpad_sender', - 'common', - env['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed - 'skia', - 'zlib', - ], -) - -env.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/DEBUG', - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - - ], -) - -input_files = [ - 'main.cc', - 'crash_service.cc', -] - -exe = env.ChromeProgram('crash_service', input_files) - -i = env.Install('$TARGET_ROOT', exe) -Alias('chrome', i) - diff --git a/chrome/tools/crash_service/crash_service.scons b/chrome/tools/crash_service/crash_service.scons new file mode 100644 index 0000000..db59307 --- /dev/null +++ b/chrome/tools/crash_service/crash_service.scons @@ -0,0 +1,51 @@ +# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +Import('env') + +env = env.Clone() + +env.ApplySConscript([ + '$BASE_DIR/using_base.scons', + '$BASE_DIR/gfx/using_base_gfx.scons', + '$BREAKPAD_DIR/using_breakpad.scons', + '$ICU38_DIR/using_icu38.scons', + '$SKIA_DIR/using_skia.scons', + '$ZLIB_DIR/using_zlib.scons', +]) + +if env['PLATFORM'] == 'win32': + env.Prepend( + CPPPATH = [ + '$CHROME_SRC_DIR', + ], + LIBS = [ + 'breakpad_handler', + 'breakpad_sender', + 'common', + ], + LINKFLAGS = [ + '/INCREMENTAL', + + '/DELAYLOAD:"dwmapi.dll"', + '/DELAYLOAD:"uxtheme.dll"', + + '/DEBUG', + '/MACHINE:X86', + '/FIXED:No', + + '/safeseh', + '/dynamicbase', + '/ignore:4199', + '/nxcompat', + ], + ) + +input_files = [ + 'main.cc', + 'crash_service.cc', +] + +env.ChromeProgram('crash_service', input_files) + diff --git a/chrome/tools/perf/flush_cache/SConscript b/chrome/tools/perf/flush_cache/SConscript deleted file mode 100644 index a33cb3c..0000000 --- a/chrome/tools/perf/flush_cache/SConscript +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -Import('env_test') - -env_test = env_test.Clone() - -env_test.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - LIBS = [ - env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed - 'base', - ], -) - -env_test.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], -) - -input_files = [ - '$CHROME_DIR/test/test_file_util$OBJSUFFIX', - 'flush_cache.cc', -] - -exe = env_test.ChromeTestProgram('flush_cache', input_files) -i = env_test.Install('$TARGET_ROOT', exe) - -env_test.Alias('chrome', i) - diff --git a/chrome/tools/perf/flush_cache/flush_cache.scons b/chrome/tools/perf/flush_cache/flush_cache.scons new file mode 100644 index 0000000..5e3786d --- /dev/null +++ b/chrome/tools/perf/flush_cache/flush_cache.scons @@ -0,0 +1,44 @@ +# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +Import('env') + +env = env.Clone() + +env.ApplySConscript([ + '$BASE_DIR/using_base.scons', + '$ICU38_DIR/using_icu38.scons', +]) + +env.Prepend( + CPPPATH = [ + '$CHROME_SRC_DIR', + ], +) + +if env['PLATFORM'] == 'win32': + env.Prepend( + LINKFLAGS = [ + '/INCREMENTAL', + '/DEBUG', + + '/DELAYLOAD:"dwmapi.dll"', + '/DELAYLOAD:"uxtheme.dll"', + + '/MACHINE:X86', + '/FIXED:No', + + '/safeseh', + '/dynamicbase', + '/ignore:4199', + '/nxcompat', + ], + ) + +input_files = [ + '$CHROME_DIR/test/test_file_util$OBJSUFFIX', + 'flush_cache.cc', +] + +env.ChromeTestProgram('flush_cache', input_files) diff --git a/chrome/tools/test/image_diff/SConscript b/chrome/tools/test/image_diff/SConscript deleted file mode 100644 index b1cccf5..0000000 --- a/chrome/tools/test/image_diff/SConscript +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -Import('env_test') - -env_test = env_test.Clone() - -env_test.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( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/SUBSYSTEM:CONSOLE', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - ) - -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) - diff --git a/chrome/tools/test/image_diff/image_diff.scons b/chrome/tools/test/image_diff/image_diff.scons new file mode 100644 index 0000000..b4d4a9e --- /dev/null +++ b/chrome/tools/test/image_diff/image_diff.scons @@ -0,0 +1,52 @@ +# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +Import('env') + +env = env.Clone() + +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 = [ + '_DEBUG', + ], + CPPPATH = [ + '$CHROME_SRC_DIR', + ], +) + +if env['PLATFORM'] == 'win32': + env.Prepend( + LINKFLAGS = [ + '/INCREMENTAL', + '/DEBUG', + + '/DELAYLOAD:"dwmapi.dll"', + '/DELAYLOAD:"uxtheme.dll"', + + '/SUBSYSTEM:CONSOLE', + + '/MACHINE:X86', + '/FIXED:No', + + '/safeseh', + '/dynamicbase', + '/ignore:4199', + '/nxcompat', + ], + ) + +input_files = [ + 'image_diff.cc', +] + +env.ChromeTestProgram('image_diff', input_files) -- cgit v1.1