Accumulated SCons changes for Windows chrome build, round II:

Includes other recent additions, and doesn't fix everything,
but gets significant pieces back on track:
* New/additional library dependencies in various test executables
  (too many to be worth listing).
* Portability:  put library base names in $LIBS instead of explicitly
  listing .lib files.
* Have interactive_ui re-use various object files from test/ui
  instead of (re-)listing the .cc files.
* Add new files:
  chrome\browser\bookmarks\bookmark_drag_data.cc
  chrome\browser\bookmarks\bookmark_drag_utils.cc
  chrome\browser\bookmarks\bookmark_table_model.cc
  chrome\browser\browser_trial.cc
  chrome\browser\download\download_request_manager_unittest.cc
  chrome\browser\greasmonkey_master.cc
  chrome\browser\spellcheck_unittest.cc
  chrome\browser\views\find_bar_view.cc
  chrome\browser\views\find_bar_win.cc
  chrome\renderer\greasemonkey_slave.cc
* Remove old files:
  chrome\browser\find_in_page_controller.cc
  chrome\browser\find_in_page_view.cc
  chrome\renderer\spellcheck_unittest.cc
* Remove relative reference to ../../app/google_update_settings$OBJSUFFIX.
* Get rid of by-hand /IMPLIB and /MAP flags.
* Prefix / suffix portability in the jscre library.
* Rename $LIBXML_DIR/scons => $LIBXML_DIR/DerivedSources.
* Add $CHROME_DIR/app/resources to CPPPATH.
* Add icu38 directories to CPPPATH for building chrome/views files.
Review URL: http://codereview.chromium.org/8742

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4215 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 31 insertions, 21 deletions

diff --git a/chrome/test/automation/SConscript b/chrome/test/automation/SConscript
index 71a09c1..1b9d786 100644
--- a/chrome/test/automation/SConscript
+++ b/chrome/test/automation/SConscript
@@ -30,5 +30,5 @@ input_files = [
 lib = env.ChromeStaticLibrary('automation', input_files)
 
 i = env.Install('$TARGET_ROOT', lib)
-env.Alias('chrome', i)
+#env.Alias('chrome', i)
 
diff --git a/chrome/test/interactive_ui/SConscript b/chrome/test/interactive_ui/SConscript
index f788335..7b0fdda 100644
--- a/chrome/test/interactive_ui/SConscript
+++ b/chrome/test/interactive_ui/SConscript
@@ -33,13 +33,21 @@ env_test.Prepend(
         'browser_views',
         'bzip2',
         'common',
+        'debugger',
+        'glue',
         'googleurl',
         'gtest',
+        'hunspell',
         env_test['ICU_LIBS'],  # TODO(sgk):  '$ICU_LIBS' when scons is fixed
         'libpng',
         'modp_b64',
         'net',
+        'renderer',
         'skia',
+        'sqlite',
+        'views',
+        'v8',
+        'WebCore',
         'zlib',
     ],
 )
@@ -74,13 +82,14 @@ input_files = [
     '$CHROME_DIR/browser/views/bookmark_bar_view_test.cc',
     '$CHROME_DIR/browser/views/constrained_window_impl_interactive_uitest.cc',
     '$CHROME_DIR/browser/views/tabs/tab_dragging_test.cc',
+    '$CHROME_DIR/test/ui/npapi_test_helper$OBJSUFFIX',
     '$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/interactive_ui/npapi_interactive_test.cc',
     '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
+
     'view_event_test_base.cc',
-    '$CHROME_DIR/test/ui/npapi_test_helper$OBJSUFFIX',
-    '$CHROME_DIR/test/interactive_ui/npapi_interactive_test.cc',
 ]
 
 exe = env_test.ChromeTestProgram('interactive_ui_tests', input_files)
diff --git a/chrome/test/memory_test/SConscript b/chrome/test/memory_test/SConscript
index 75a595f..454a1b3 100644
--- a/chrome/test/memory_test/SConscript
+++ b/chrome/test/memory_test/SConscript
@@ -31,6 +31,7 @@ env_test.Prepend(
         'gtest',
         env_test['ICU_LIBS'],  # TODO(sgk):  '$ICU_LIBS' when scons is fixed
         'libpng',
+        'modp_b64',
         'net',
         'skia',
         'zlib',
diff --git a/chrome/test/reliability/SConscript b/chrome/test/reliability/SConscript
index 0922599..3504e61 100644
--- a/chrome/test/reliability/SConscript
+++ b/chrome/test/reliability/SConscript
@@ -22,22 +22,27 @@ env_test.Prepend(
         '$CHROME_SRC_DIR',
     ],
     LIBS = [
+        'automation',
+        'base',
+        'base_gfx',
+        'browser',
+        'browser_views',
+        'common',
         'googleurl',
-        'skia',
-        'libpng',
         'gtest',
-        'base_gfx',
         env_test['ICU_LIBS'],  # TODO(sgk):  '$ICU_LIBS' when scons is fixed
-        'common',
+        'libpng',
+        'modp_b64',
+        'net',
+        'skia',
         'zlib',
-        'browser',
-        'browser_views',
-        'base',
-        'automation',
-    ],
-)
 
-env_test.Prepend(
+        'comsupp',
+        'oleacc',
+        'psapi',
+        'rpcrt4',
+        'winmm',
+    ],
     LINKFLAGS = [
         '/INCREMENTAL',
         '/DEBUG',
@@ -53,13 +58,6 @@ env_test.Prepend(
         '/ignore:4199',
         '/nxcompat',
     ],
-    LIBS = [
-        'comsupp.lib',
-        'oleacc.lib',
-        'psapi.lib',
-        'rpcrt4.lib',
-        'winmm.lib',
-    ],
 )
 
 input_files = [
diff --git a/chrome/test/startup/SConscript b/chrome/test/startup/SConscript
index 9e95689..ab57d9c 100644
--- a/chrome/test/startup/SConscript
+++ b/chrome/test/startup/SConscript
@@ -32,6 +32,8 @@ env_test.Prepend(
         'browser_views',
         'base',
         'automation',
+        'modp_b64',
+        'net',
     ],
 )