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

2 files changed, 71 insertions, 77 deletions

diff --git a/chrome/test/startup/SConscript b/chrome/test/startup/SConscript
deleted file mode 100644
index ab57d9c..0000000
--- a/chrome/test/startup/SConscript
+++ /dev/null
@@ -1,77 +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 = [
-        'UI_TEST',
-        'UNIT_TEST',
-    ],
-    CPPPATH = [
-        '$GTEST_DIR/include',
-        '$GTEST_DIR',
-        '$SKIA_DIR/include',
-        '$SKIA_DIR/include/corecg',
-        '$SKIA_DIR/platform',
-        '$CHROME_SRC_DIR',
-    ],
-    LIBS = [
-        'googleurl',
-        'skia',
-        'libpng',
-        'gtest',
-        'base_gfx',
-        env_test['ICU_LIBS'],  # TODO(sgk):  '$ICU_LIBS' when scons is fixed
-        'common',
-        'zlib',
-        'browser',
-        'browser_views',
-        'base',
-        'automation',
-        'modp_b64',
-        'net',
-    ],
-)
-
-env_test.Prepend(
-    LINKFLAGS = [
-        '/INCREMENTAL',
-        '/DEBUG',
-
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-
-        '/MACHINE:X86',
-        '/FIXED:No',
-
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-    ],
-    LIBS = [
-        'winmm.lib',
-        'rpcrt4.lib',
-        'oleacc.lib',
-        'comsupp.lib',
-    ],
-)
-
-input_files = [
-    '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
-    '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
-    '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
-    '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
-    'feature_startup_test.cc',
-    'startup_test.cc',
-]
-
-exe = env_test.ChromeTestProgram('startup_tests', input_files)
-i = env_test.Install('$TARGET_ROOT', exe)
-
-env_test.Alias('chrome', i)
-
diff --git a/chrome/test/startup/startup_tests.scons b/chrome/test/startup/startup_tests.scons
new file mode 100644
index 0000000..88be476
--- /dev/null
+++ b/chrome/test/startup/startup_tests.scons
@@ -0,0 +1,71 @@
+# 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',
+    '$CHROME_SRC_DIR/build/using_googleurl.scons',
+    '$GTEST_DIR/../using_gtest.scons',
+    '$ICU38_DIR/using_icu38.scons',
+    '$LIBPNG_DIR/using_libpng.scons',
+    '$MODP_B64_DIR/using_modp_b64.scons',
+    '$NET_DIR/using_net.scons',
+    '$SKIA_DIR/using_skia.scons',
+    '$ZLIB_DIR/using_zlib.scons',
+])
+
+env.Prepend(
+    CPPDEFINES = [
+        'UI_TEST',
+    ],
+    CPPPATH = [
+        '$CHROME_SRC_DIR',
+    ],
+    LIBS = [
+        'automation',
+        'browser',
+        'browser_views',
+        'common',
+    ],
+)
+
+if env['PLATFORM'] == 'win32':
+  env.Prepend(
+      LINKFLAGS = [
+          '/INCREMENTAL',
+          '/DEBUG',
+
+          '/DELAYLOAD:"dwmapi.dll"',
+          '/DELAYLOAD:"uxtheme.dll"',
+
+          '/MACHINE:X86',
+          '/FIXED:No',
+
+          '/safeseh',
+          '/dynamicbase',
+          '/ignore:4199',
+          '/nxcompat',
+      ],
+      LIBS = [
+          'comsupp',
+          'oleacc',
+          'rpcrt4',
+          'winmm',
+      ],
+  )
+
+input_files = [
+    '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX',
+    '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX',
+    '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
+    'feature_startup_test.cc',
+    'startup_test.cc',
+]
+
+env.ChromeTestProgram('startup_tests', input_files)