summaryrefslogtreecommitdiffstats
path: root/chrome/tools
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/tools')
-rw-r--r--chrome/tools/crash_service/SConscript54
-rw-r--r--chrome/tools/crash_service/crash_service.scons51
-rw-r--r--chrome/tools/perf/flush_cache/SConscript46
-rw-r--r--chrome/tools/perf/flush_cache/flush_cache.scons44
-rw-r--r--chrome/tools/test/image_diff/image_diff.scons (renamed from chrome/tools/test/image_diff/SConscript)38
5 files changed, 110 insertions, 123 deletions
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/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)
generated by cgit v1.1 at 2025-01-22 23:00:00 +0000