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

1 files changed, 21 insertions, 22 deletions

diff --git a/chrome/SConscript b/chrome/SConscript
index 49fe41c..4fb7297 100644
--- a/chrome/SConscript
+++ b/chrome/SConscript
@@ -122,6 +122,21 @@ env_dll.Append(
         'glue',
         'JavaScriptCore_pcre',
         'port',
+
+        'browser',
+        'browser_views',
+        'debugger',
+        'common',
+        'util',
+        'jscre',
+        'plugin',
+        'renderer',
+        'hunspell',
+        # TODO(sgk):  Windows doesn't use libevent, revisit when Linux gets here
+        #'libevent',
+        'sqlite',
+        'views',
+        'v8',
     ],
 )
 
@@ -170,7 +185,6 @@ if env_dll['PLATFORM'] == 'win32':
           '/nxcompat',
 
           '/PDB:${TARGETS[1]}',
-          '/IMPLIB:${TARGETS[2]}',
       ],
   )
 
@@ -182,23 +196,6 @@ if env_dll['PLATFORM'] == 'win32':
       '$V8_DIR/snapshot-empty$OBJSUFFIX',
   ])
 
-libs = [
-    'browser/browser.lib',
-    'browser/views/browser_views.lib',
-    'browser/debugger/debugger.lib',
-    'common/common.lib',
-    'installer/util/util.lib',
-    'libjscre.lib',
-    'plugin/plugin.lib',
-    'renderer/renderer.lib',
-    'third_party/hunspell/hunspell.lib',
-    # TODO(sgk):  libevent isn't used on Windows, revisit when Linux gets here
-    #'third_party/libevent/libevent.lib',
-    'third_party/sqlite/sqlite.lib',
-    'views/views.lib',
-    '$V8_DIR/v8.lib',
-]
-
 
 
 # TODO(sgk): make a pseudo-Builder for these
@@ -228,7 +225,7 @@ grit_files.extend(google_chrome)
 # TODO(port)
 if env_dll['PLATFORM'] == 'win32':
   dll_targets = env_dll.ChromeSharedLibrary('chrome.dll',
-                                            dll_resources + input_files + libs,
+                                            dll_resources + input_files,
                                             PDB='chrome_dll.pdb')
   install_targets.extend(dll_targets)
 
@@ -310,7 +307,7 @@ env_exe.Append(
         '/nxcompat',
 
         '/PDB:${TARGETS[1]}',
-        '/IMPLIB:${TARGETS[2]}',
+        #'/IMPLIB:${TARGETS[2]}',
     ],
 )
 
@@ -326,7 +323,8 @@ if env['PLATFORM'] == 'win32':
           'app/google_update_client.cc',
 
           'common/common.lib',
-          '$CHROME_DIR/chrome_dll.lib',
+          #'$CHROME_DIR/chrome_dll.lib',
+          'chrome.lib',
       ]
   )
 
@@ -445,7 +443,8 @@ env.SConscript(sconscript_files, exports=['env', 'env_res', 'env_test'])
 
 # TODO(port)
 if env['PLATFORM'] == 'win32':
-  env.InstallAs('libjscre.lib', '$WEBKIT_DIR/JavaScriptCore_pcre.lib')
+  env.InstallAs('$LIBS_DIR/${LIBPREFIX}jscre${LIBSUFFIX}',
+                '$WEBKIT_DIR/JavaScriptCore_pcre.lib')
 
 
 i = env.Install('$TARGET_ROOT', install_targets)