From da6654b0465478b0549e593c1efb45bd44756965 Mon Sep 17 00:00:00 2001
From: "sgk@google.com" <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
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/test/image_diff/SConscript       | 60 ---------------------------
 chrome/tools/test/image_diff/image_diff.scons | 52 +++++++++++++++++++++++
 2 files changed, 52 insertions(+), 60 deletions(-)
 delete mode 100644 chrome/tools/test/image_diff/SConscript
 create mode 100644 chrome/tools/test/image_diff/image_diff.scons

(limited to 'chrome/tools/test/image_diff')

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