SCons build:

* Add base\object{,_watcher}.cc.
* Add chrome\browser\bookmark_{codec,storage}.cc.
* Add chrome\views\frame\browser_window_factory.cc.
* Split of app\main.cc into app\chrome_{dll,exe}_main.cc, with added CPPDEFINES for {BROWSER,RENDERER,PLUGIN}_DLL.
* Move $CSCRIPT, $PLATFORMSDK* and $VISUAL_STUDIO variables to the win32-specific construction environment.
* Remove unnecessary comments.
TBR: bradnelson

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

6 files changed, 16 insertions, 18 deletions

diff --git a/base/SConscript b/base/SConscript
index c9087dc..635e7b1 100644
--- a/base/SConscript
+++ b/base/SConscript
@@ -78,6 +78,7 @@ input_files = [
     'memory_debug.cc',

     'message_loop.cc',

     'non_thread_safe.cc',

+    'object_watcher.cc',

     'path_service.cc',

     'pe_image.cc',

     'pickle.cc',

@@ -234,6 +235,7 @@ test_files = [
     'json_writer_unittest.cc',

     'linked_ptr_unittest.cc',

     'message_loop_unittest.cc',

+    'object_watcher_unittest.cc',

     'path_service_unittest.cc',

     'pe_image_unittest.cc',

     'pickle_unittest.cc',

diff --git a/build/SConscript.main b/build/SConscript.main
index 484d820..92f93f6 100644
--- a/build/SConscript.main
+++ b/build/SConscript.main
@@ -53,12 +53,6 @@ env = Environment(
     TARGET_ROOT = '#/$BUILD_TYPE',
     OBJ_ROOT = '$TARGET_ROOT',
 
-    CSCRIPT = 'c:\\Windows\\System32\\cscript',
-
-    PLATFORMSDK_VISTA_REL = '../third_party/platformsdk_vista_6_0',
-    PLATFORMSDK_VISTA = '#/$PLATFORMSDK_VISTA_REL',
-    VISUAL_STUDIO = '/Program Files/Microsoft Visual Studio 8',
-
     BASE_DIR              = '#/$BUILD_TYPE/base',
     BREAKPAD_DIR          = '#/$BUILD_TYPE/breakpad',
     CHROME_DIR            = '#/$BUILD_TYPE/chrome',
@@ -110,6 +104,12 @@ if env['PLATFORM'] == 'win32':
   msvs_env = Environment(tools=['msvc', 'mslink', 'msvs'])['ENV']
 
   env.Replace(
+    CSCRIPT = 'c:\\Windows\\System32\\cscript',
+
+    PLATFORMSDK_VISTA_REL = '../third_party/platformsdk_vista_6_0',
+    PLATFORMSDK_VISTA = '#/$PLATFORMSDK_VISTA_REL',
+    VISUAL_STUDIO = '/Program Files/Microsoft Visual Studio 8',
+
     CYGWIN_DIR = Dir('#../third_party/cygwin'),
     CYGWIN_BIN_DIR = '$CYGWIN_DIR/bin',
 
diff --git a/chrome/SConscript b/chrome/SConscript
index 52b4a17..fb1663c 100644
--- a/chrome/SConscript
+++ b/chrome/SConscript
@@ -35,8 +35,6 @@ env_res = env.Clone()
 env_test = env.Clone()

 env = env.Clone()

 

-

-

 install_targets = []

 

 

@@ -94,6 +92,9 @@ env_dll.Prepend(
         'LIBXSLT_STATIC',

         'LIBXML_STATIC',

         '_WINDLL',

+        'BROWSER_DLL',

+        'RENDERER_DLL',

+        'PLUGIN_DLL',

     ],

     CCFLAGS = [

         '/TP',

@@ -177,7 +178,7 @@ env_dll.Append(
 )

 

 input_files = [

-    'app/chrome_main.cc',

+    'app/chrome_dll_main.cc',

 ]

 

 

@@ -352,7 +353,7 @@ chrome_exe = env_exe.Program(
     [

         env_res.RES('app/chrome_exe.rc'),

         'app/breakpad.cc',

-        'app/main.cc',

+        'app/chrome_exe_main.cc',

         'app/google_update_client.cc',

         'app/google_update_settings.cc',

 

@@ -385,8 +386,6 @@ env_snapshot.Prepend(
     CPPPATH = [

         '$V8_DIR/src',

         '$V8_DIR/src/pcre/jscre',

-        #"C:\src\trunk-vs\chrome\\third_party\webkit\src\JavaScriptCore\os-win32"

-        #"C:\src\trunk-vs\chrome\Debug\obj\snapshotv8\DerivedSources"

         '..',

     ],

     CPPDEFINES = [

diff --git a/chrome/browser/SConscript b/chrome/browser/SConscript
index 1596210..63560ed 100644
--- a/chrome/browser/SConscript
+++ b/chrome/browser/SConscript
@@ -98,6 +98,8 @@ input_files = [
     'back_forward_menu_model.cc',

     'base_history_model.cc',

     'bookmark_bar_model.cc',

+    'bookmark_codec.cc',

+    'bookmark_storage.cc',

     'bookmark_drag_data.cc',

     'browser.cc',

     'browser_about_handler.cc',

@@ -323,6 +325,7 @@ input_files = [
     'views/frame/aero_glass_frame.cc',

     'views/frame/aero_glass_non_client_view.cc',

     'views/frame/browser_view.cc',

+    'views/frame/browser_window_factory.cc',

     'views/frame/opaque_frame.cc',

     'views/frame/opaque_non_client_view.cc',

     'views/go_button.cc',

diff --git a/chrome/test/chrome_plugin/SConscript b/chrome/test/chrome_plugin/SConscript
index af55a6d..134c868 100644
--- a/chrome/test/chrome_plugin/SConscript
+++ b/chrome/test/chrome_plugin/SConscript
@@ -78,9 +78,6 @@ env.Prepend(
     ],

 )

 

-#/MANIFESTFILE:"C:\src\trunk-vs\chrome\Debug\obj\test_chrome_plugin\test_chrome_plugin.dll.intermediate.manifest"

-#/PDB:"c:\src\trunk-vs\chrome\Debug\test_chrome_plugin.pdb"

-

 input_files = [

     'test_chrome_plugin.cc',

     'test_chrome_plugin.def',

diff --git a/chrome/test/security_tests/SConscript b/chrome/test/security_tests/SConscript
index 39300c8..d903295 100644
--- a/chrome/test/security_tests/SConscript
+++ b/chrome/test/security_tests/SConscript
@@ -76,9 +76,6 @@ env.Prepend(
     ],

 )

 

-#/MANIFESTFILE:"C:\src\trunk-vs\chrome\Debug\obj\test_chrome_plugin\test_chrome_plugin.dll.intermediate.manifest"

-#/PDB:"c:\src\trunk-vs\chrome\Debug\test_chrome_plugin.pdb"

-

 input_files = [

     'ipc_security_tests.cc',

     'security_tests.cc',