Initial cleanups en route to coalescing the get-it-built cut-and-paste from various SConscripts into readable and maintainable shape. To wit:

* Put the near-universal settings of /DCERT_CHAIN_PARA_HAS_EXTRA_FIELDS, /DWIN32_LEAN_AND_MEAN, /wd4503 and /wd4819 in the base construction environment.
* Sort various unsorted source file lists.
* Fix indentation and quoting for consistency in a couple SConscript files that escaped previous dragnets.
* Eliminate two left-over uses of Split() for input file lists.
* Give the devenv invocation to build v8_shell.exe the full path to the relevant .vcproj file.
* Add /nologo to the base LINKFLAGS setting.
* Remove various CPPPATH and other settings that have been hanging around commented out from the Visual Studio build (in case we needed them, which we evidently don't).
* Get rid of unnecessary env.File() and env.Dir() calls in various settings (esp. CPPPATH) and source file lists.
* Add copyright notice to an overlooked SConscript file.
* Clean up version.bat invocation.
TBR: bradnelson

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

23 files changed, 248 insertions, 433 deletions

diff --git a/chrome/SConscript b/chrome/SConscript
index 999d29a..de2da4f 100644
--- a/chrome/SConscript
+++ b/chrome/SConscript
@@ -42,9 +42,8 @@ install_targets = []
 

 env.Prepend(

     CPPPATH = [

-        Dir('app'),

-        #Dir('third_party/wtl/include'),

-        Dir('#/../chrome/third_party/wtl/include'),

+        'app',

+        '$CHROME_DIR/third_party/wtl/include',

     ],

 )

 

@@ -52,9 +51,7 @@ env.Prepend(
 env_res.Append(

     CPPPATH = [

         '.',

-        '#/../chrome/Debug/obj/chrome_dll',

         '#/..',

-        '#/../chrome/Debug/obj',

     ],

     RCFLAGS = [

         ['/l', '0x409'],

@@ -90,9 +87,6 @@ env_dll.Prepend(
     ],

     CPPDEFINES = [

         'U_STATIC_IMPLEMENTATION',

-        'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',

-        'WIN32_LEAN_AND_MEAN',

-

         'PNG_USER_CONFIG',

         'CHROME_PNG_WRITE_SUPPORT',

         'LIBXSLT_STATIC',

@@ -101,29 +95,20 @@ env_dll.Prepend(
     ],

     CCFLAGS = [

         '/TP',

-

         '/Wp64',

-

-        '/wd4503',

-        '/wd4819',

     ],

 )

 

 env_dll.Append(

     CPPPATH = [

-        #/I '../chrome/Debug/webkit'

-        #/I '../third_party/webkit/out'

-

-        Dir('#../chrome/app'),

-        #Dir('#../chrome/Debug/obj/generated_resources'),

-        Dir('#../chrome/Debug/obj/localized_strings'),

-        Dir('#../third_party/libpng'),

-        Dir('#../skia/include'),

-        Dir('#../skia/include/corecg'),

-        Dir('#../skia/platform'),

-        Dir('#../third_party/libxslt'),

-        Dir('#../third_party/libxml/include'),

-        Dir('#../breakpad/src'),

+        '$CHROME_DIR/app',

+        '$LIBPNG_DIR',

+        '$SKIA_DIR/include',

+        '$SKIA_DIR/include/corecg',

+        '$SKIA_DIR/platform',

+        '$LIBXSL_DIR',

+        '$LIBXML_DIR/include',

+        '$BREAKPAD_DIR/src',

     ],

     LIBS = [

         'DelayImp.lib',

@@ -148,46 +133,10 @@ env_dll.Append(
         'uuid.lib',

         'version.lib',

         'wininet.lib',

-        'wininet.lib',

         'winmm.lib',

         'winspool.lib',

         'ws2_32.lib',

         'wsock32.lib',

-

-        env.File('$BASE_DIR/base.lib'),

-        env.File('$BASE_DIR/gfx/base_gfx.lib'),

-        env.File('$BREAKPAD_DIR/breakpad_handler.lib'),

-        env.File('browser/browser.lib'),

-        env.File('browser/debugger/debugger.lib'),

-        env.File('common/common.lib'),

-        env.File('installer/util/util.lib'),

-        env.File('libjscre.lib'),

-        env.File('plugin/plugin.lib'),

-        env.File('renderer/renderer.lib'),

-        env.File('third_party/hunspell/hunspell.lib'),

-        env.File('third_party/sqlite/sqlite.lib'),

-        env.File('views/views.lib'),

-        env.File('$NET_DIR/net.lib'),

-        env.File('$SKIA_DIR/skia.lib'),

-        env.File('$BZIP2_DIR/bzip2.lib'),

-        env.File('$ICU38_DIR/icuuc.lib'),

-        env.File('$LIBJPEG_DIR/libjpeg.lib'),

-        env.File('$LIBPNG_DIR/libpng.lib'),

-        env.File('$LIBXML_DIR/libxml.lib'),

-        env.File('$LIBXSLT_DIR/libxslt.lib'),

-        env.File('$MODP_B64_DIR/modp_b64.lib'),

-        env.File('$ZLIB_DIR/zlib.lib'),

-        env.File('$V8_DIR/v8.lib'),

-        env.File('$V8_DIR/snapshot-empty.obj'),

-        env.File('$WEBKIT_DIR/activex_shim/activex_shim.lib'),

-        env.File('$WEBKIT_DIR/build/JavaScriptCore/WTF.lib'),

-        env.File('$WEBKIT_DIR/build/V8Bindings/V8Bindings.lib'),

-        env.File('$WEBKIT_DIR/build/WebCore/WebCore.lib'),

-        env.File('$WEBKIT_DIR/default_plugin/default_plugin.lib'),

-        env.File('$WEBKIT_DIR/glue/Glue.lib'),

-        env.File('$GOOGLEURL_DIR/googleurl.lib'),

-        env.File('$WEBKIT_DIR/JavaScriptCore_pcre.lib'),

-        env.File('$WEBKIT_DIR/Port.lib'),

     ],

     LINKFLAGS = [

         '/INCREMENTAL',

@@ -229,10 +178,48 @@ input_files = [
     'app/chrome_main.cc',

 ]

 

+

+libs = [

+    '$BASE_DIR/base.lib',

+    '$BASE_DIR/gfx/base_gfx.lib',

+    '$BREAKPAD_DIR/breakpad_handler.lib',

+    'browser/browser.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',

+    'third_party/sqlite/sqlite.lib',

+    'views/views.lib',

+    '$NET_DIR/net.lib',

+    '$SKIA_DIR/skia.lib',

+    '$BZIP2_DIR/bzip2.lib',

+    '$ICU38_DIR/icuuc.lib',

+    '$LIBJPEG_DIR/libjpeg.lib',

+    '$LIBPNG_DIR/libpng.lib',

+    '$LIBXML_DIR/libxml.lib',

+    '$LIBXSLT_DIR/libxslt.lib',

+    '$MODP_B64_DIR/modp_b64.lib',

+    '$ZLIB_DIR/zlib.lib',

+    '$V8_DIR/v8.lib',

+    '$V8_DIR/snapshot-empty.obj',

+    '$WEBKIT_DIR/activex_shim/activex_shim.lib',

+    '$WEBKIT_DIR/build/JavaScriptCore/WTF.lib',

+    '$WEBKIT_DIR/build/V8Bindings/V8Bindings.lib',

+    '$WEBKIT_DIR/build/WebCore/WebCore.lib',

+    '$WEBKIT_DIR/default_plugin/default_plugin.lib',

+    '$WEBKIT_DIR/glue/Glue.lib',

+    '$GOOGLEURL_DIR/googleurl.lib',

+    '$WEBKIT_DIR/JavaScriptCore_pcre.lib',

+    '$WEBKIT_DIR/Port.lib',

+]

+

 dll_targets = env_dll.SharedLibrary(['chrome',

                                      'chrome_dll.pdb',

                                      'chrome_dll.lib'],

-                                    dll_resources + input_files)

+                                    dll_resources + input_files + libs)

 

 install_targets.extend(dll_targets)

 

@@ -252,9 +239,9 @@ for g in [ g for g in generated if str(g).endswith('.rc') ]:
 

 

 env_version = env.Clone(

-    VERSION_BAT = File('#/../chrome/tools/build/win/version.bat'),

-    CHROMEDIR = Dir('#/../chrome'),

-    PWD = Dir('.'),

+    VERSION_BAT = env.File('$CHROME_DIR/tools/build/win/version.bat'),

+    CHROMEDIR = env.Dir('$CHROME_DIR'),

+    PWD = env.Dir('.'),

 )

 

 env_version['ENV']['PROGRAMFILES'] = os.environ['PROGRAMFILES']

@@ -266,16 +253,15 @@ env_version['ENV']['PATH'] = os.environ['PATH']
 chrome_exe_version_rc = env_version.Command(

     'chrome_exe_version.rc',

     ['app/chrome_exe_version.rc.version',

-    '$CHROMEDIR/VERSION',

-    '$CHROMEDIR/BRANDING'],

+     '$CHROME_DIR/VERSION',

+     '$CHROME_DIR/BRANDING'],

     '$VERSION_BAT $SOURCE $CHROMEDIR $PWD $TARGET')

 

 chrome_dll_version_rc = env_version.Command(

     'chrome_dll_version.rc',

-    [

-        'app/chrome_dll_version.rc.version',

-        '$CHROMEDIR/VERSION',

-       '$CHROMEDIR/BRANDING',

+    ['app/chrome_dll_version.rc.version',

+     '$CHROME_DIR/VERSION',

+     '$CHROME_DIR/BRANDING',

     ],

     '$VERSION_BAT $SOURCE $CHROMEDIR $PWD $TARGET')

 

@@ -296,11 +282,7 @@ env_exe = env.Clone()
 env_exe.Prepend(

     CPPPATH = [

         '..',

-        Dir('#../breakpad/src'),

-    ],

-    CPPDEFINES = [

-        'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',

-        'WIN32_LEAN_AND_MEAN',

+        '$BREAKPAD_DIR/src',

     ],

 )

 env_exe.Append(

@@ -342,13 +324,6 @@ env_exe.Append(
         'wininet.lib',

         'winspool.lib',

         'ws2_32.lib',

-

-        env.File('common/common.lib'),

-        env.File('$CHROME_DIR/chrome_dll.lib'),

-        env.File('$BREAKPAD_DIR/breakpad_handler.lib'),

-        env.File('$SANDBOX_DIR/src/sandbox.lib'),

-        env.File('$BASE_DIR/base.lib'),

-        env.File('$ICU38_DIR/icuuc.lib'),

     ],

 )

 

@@ -362,6 +337,13 @@ chrome_exe = env_exe.Program(
         'app/main.cc',

         'app/google_update_client.cc',

         'app/google_update_settings.cc',

+

+        'common/common.lib',

+        '$CHROME_DIR/chrome_dll.lib',

+        '$BREAKPAD_DIR/breakpad_handler.lib',

+        '$SANDBOX_DIR/src/sandbox.lib',

+        '$BASE_DIR/base.lib',

+        '$ICU38_DIR/icuuc.lib',

     ]

 )

 

@@ -396,8 +378,6 @@ env_snapshot.Prepend(
         '/wd4099',

         '/wd4355',

         '/wd4800',

-        '/wd4503',

-        '/wd4819',

     ],

 )

 

@@ -410,7 +390,7 @@ env_snapshot.Command('snapshot.cc', '#/../v8/bin/debug/mksnapshot.exe',
 

 env_flat = env.Clone(

     BROWSER_RESOURCES = Dir('browser_resources'),

-    HTML_INLINE = File('#/../chrome/tools/build/win/html_inline.py'),

+    HTML_INLINE = File('$CHROME_DIR/tools/build/win/html_inline.py'),

     FLATTEN_HTML_COM = '$PYTHON $HTML_INLINE $SOURCE $TARGET',

 )

 

diff --git a/chrome/SConscript.unit_tests b/chrome/SConscript.unit_tests
index 3d51b16..ce3b199 100644
--- a/chrome/SConscript.unit_tests
+++ b/chrome/SConscript.unit_tests
@@ -101,9 +101,6 @@ env_test.Prepend(
     ],

 )

 

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

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

-

 libs = [

     'snapshotv8.lib',

 

@@ -144,13 +141,6 @@ libs = [
     '$ZLIB_DIR/zlib.lib',

 ]

 

-#/Yu"precompiled_wtl.h"

-#/Fp"C:\src\trunk-vs\chrome\Debug\obj\unit_tests\precompiled_wtl.pch"

-#/Fo"C:\src\trunk-vs\chrome\Debug\obj\unit_tests\\"

-#/Fd"C:\src\trunk-vs\chrome\Debug\obj\unit_tests\vc80.pdb"

-#/FI

-#"precompiled_wtl.h"

-

 unit_test_files = [

     'browser/autocomplete/autocomplete_unittest.cc',

     'browser/autocomplete/history_contents_provider_unittest.cc',

diff --git a/chrome/app/theme/SConscript b/chrome/app/theme/SConscript
index 6cd619e..0f7664d 100644
--- a/chrome/app/theme/SConscript
+++ b/chrome/app/theme/SConscript
@@ -33,58 +33,56 @@ env = env.Clone()
 env_res = env_res.Clone()

 

 env_res.Append(

-  CPPPATH = [

-    ".",

-    "#/../chrome/Debug/obj/chrome_dll",

-    "#/..",

-    "#/../chrome/Debug/obj",

-  ],

-  RCFLAGS = [

-    ["/l", "0x409"],

-  ],

+    CPPPATH = [

+        '.',

+        '#/..',

+    ],

+    RCFLAGS = [

+        ['/l', '0x409'],

+    ],

 )

 

-res = env_res.RES("theme_resources.rc")

+res = env_res.RES('theme_resources.rc')

 

 

 

 env.Append(

-  LINKFLAGS = [

-    "/INCREMENTAL:NO",

-    '/DELAYLOAD:"dwmapi.dll',

-    '/DELAYLOAD:"uxtheme.dll',

+    LINKFLAGS = [

+        '/INCREMENTAL:NO',

+        '/DELAYLOAD:"dwmapi.dll"',

+        '/DELAYLOAD:"uxtheme.dll"',

 

-    "/NOENTRY",

-    '/BASE:"0x3CE00000"',

-    "/MACHINE:X86",

-    "/FIXED:No",

+        '/NOENTRY',

+        '/BASE:"0x3CE00000"',

+        '/MACHINE:X86',

+        '/FIXED:No',

 

-    "/safeseh",

-    "/dynamicbase",

-    "/ignore:4199",

-    "/nxcompat",

-  ],

-  LIBS = [

-    "wininet.lib",

-    "version.lib",

-    "msimg32.lib",

-    "ws2_32.lib",

-    "usp10.lib",

-    "psapi.lib",

-    "kernel32.lib",

-    "user32.lib",

-    "gdi32.lib",

-    "winspool.lib",

-    "comdlg32.lib",

-    "advapi32.lib",

-    "shell32.lib",

-    "ole32.lib",

-    "oleaut32.lib",

-    "uuid.lib",

-    "odbc32.lib",

-    "odbccp32.lib",

-    "DelayImp.lib",

-  ],

+        '/safeseh',

+        '/dynamicbase',

+        '/ignore:4199',

+        '/nxcompat',

+    ],

+    LIBS = [

+        'wininet.lib',

+        'version.lib',

+        'msimg32.lib',

+        'ws2_32.lib',

+        'usp10.lib',

+        'psapi.lib',

+        'kernel32.lib',

+        'user32.lib',

+        'gdi32.lib',

+        'winspool.lib',

+        'comdlg32.lib',

+        'advapi32.lib',

+        'shell32.lib',

+        'ole32.lib',

+        'oleaut32.lib',

+        'uuid.lib',

+        'odbc32.lib',

+        'odbccp32.lib',

+        'DelayImp.lib',

+    ],

 )

 

 themes_default = env.SharedLibrary("$CHROME_DIR/themes/default", res)

diff --git a/chrome/browser/SConscript b/chrome/browser/SConscript
index df7e536..ad48d53 100644
--- a/chrome/browser/SConscript
+++ b/chrome/browser/SConscript
@@ -32,27 +32,15 @@ Import('env')
 env = env.Clone()

 

 

-

-#/Yu"precompiled_wtl.h"

-#/Fp"C:\src\trunk\chrome\Debug\obj\browser\precompiled_wtl.pch"

-#/Fo"C:\src\trunk\chrome\Debug\obj\browser\\"

-#/Fd"C:\src\trunk\chrome\Debug\obj\browser\vc80.pdb"

-#/W3

-#/WX

-#/FI "precompiled_wtl.h"

-

 env.Prepend(

     CPPPATH = [

-        env.Dir('../app/resources'),

-        env.Dir('$OBJ_ROOT/google_update'),

-        env.Dir('#/tools/build/win'),

-        env.Dir('#/..'),

+        '$CHROME_DIR/app/resources',

+        #'$OBJ_ROOT/google_update',

+        '#/tools/build/win',

+        '#/..',

     ],

     CPPDEFINES = [

         'U_STATIC_IMPLEMENTATION',

-        'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',

-        'WIN32_LEAN_AND_MEAN',

-

         'USE_HUNSPELL',

         'HUNSPELL_CHROME_CLIENT',

         'LIBXML_STATIC',

@@ -61,39 +49,29 @@ env.Prepend(
     ],

     CCFLAGS = [

         '/TP',

-

-        '/Wp64',

-

-        '/wd4503',

-        '/wd4819',

     ],

 )

 

 env.Append(

     CPPPATH = [

         '$GTEST_DIR/include',

-        #/I "../chrome/Debug/webkit"

-        #/I "../third_party/webkit/out"

 

-        env.Dir("#../google_update"),

-        env.Dir("#../chrome/third_party/hunspell/src/hunspell"),

-        env.Dir("#../chrome/third_party/wtl/include"),

-        env.Dir("#../third_party/npapi"),

+        '$GOOGLE_UPDATE_DIR',

+        '$CHROME_DIR/third_party/hunspell/src/hunspell',

+        '$CHROME_DIR/third_party/wtl/include',

+        '$NPAPI_DIR',

         '$LIBXML_DIR/scons/include',

         '$LIBXML_DIR/include',

-        env.Dir("#../third_party/icu38/public/common"),

-        env.Dir("#../third_party/icu38/public/i18n"),

-

-        env.Dir("#../chrome/app"),

-

-        env.Dir("#../webkit/build/localized_strings"),

-

-        env.Dir("#../third_party/zlib"),

-        env.Dir("#../skia/include"),

-        env.Dir("#../skia/include/corecg"),

-        env.Dir("#../skia/platform"),

-        env.Dir("#../third_party/libpng"),

-        env.Dir("#../breakpad/src"),

+        '$ICU38_DIR/public/common',

+        '$ICU38_DIR/public/i18n',

+        '$CHROME_DIR/app',

+        '$WEBKIT_DIR/build/localized_strings',

+        '$ZLIB_DIR',

+        '$SKIA_DIR/include',

+        '$SKIA_DIR/include/corecg',

+        '$SKIA_DIR/platform',

+        '$LIBPNG_DIR',

+        '$BREAKPAD_DIR/src',

     ],

 )

 

@@ -400,5 +378,4 @@ input_files = [
 env.StaticLibrary('browser', input_files)

 

 

-

 SConscript('debugger/SConscript', exports=['env'])

diff --git a/chrome/browser/debugger/SConscript b/chrome/browser/debugger/SConscript
index 601c42c..3a7b92a 100644
--- a/chrome/browser/debugger/SConscript
+++ b/chrome/browser/debugger/SConscript
@@ -1,59 +1,76 @@
+# Copyright 2008, Google Inc.

+# All rights reserved.

+#

+# Redistribution and use in source and binary forms, with or without

+# modification, are permitted provided that the following conditions are

+# met:

+#

+#    * Redistributions of source code must retain the above copyright

+# notice, this list of conditions and the following disclaimer.

+#    * Redistributions in binary form must reproduce the above

+# copyright notice, this list of conditions and the following disclaimer

+# in the documentation and/or other materials provided with the

+# distribution.

+#    * Neither the name of Google Inc. nor the names of its

+# contributors may be used to endorse or promote products derived from

+# this software without specific prior written permission.

+#

+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+

 Import('env')

 

 env = env.Clone()

 

 

-

 env.Prepend(

     CPPPATH = [

-        Dir("#/.."),

+        '#/..',

     ],

     CPPDEFINES = [

-        "CERT_CHAIN_PARA_HAS_EXTRA_FIELDS",

-        "WIN32_LEAN_AND_MEAN",

-        "LIBXML_STATIC",

-        "U_STATIC_IMPLEMENTATION",

-        "PNG_USER_CONFIG",

-        "CHROME_PNG_WRITE_SUPPORT",

+        'LIBXML_STATIC',

+        'U_STATIC_IMPLEMENTATION',

+        'PNG_USER_CONFIG',

+        'CHROME_PNG_WRITE_SUPPORT',

     ],

     CCFLAGS = [

         '/TP',

-

-        #'/Wp64',

-

-        '/wd4503',

-        '/wd4819',

     ],

 )

 

 env.Append(

     CPPPATH = [

-        #"C:\src\trunk\chrome\Debug\webkit"

-        Dir("#/../chrome/third_party/webkit/out"),

-

-        Dir("#/../chrome/third_party/wtl/include"),

-        Dir("#/../third_party/npapi"),

-        Dir("#/../third_party/libxml/include"),

-        Dir("#/../third_party/icu38/public/common"),

-        Dir("#/../third_party/icu38/public/i18n"),

-        Dir("#/../chrome/app"),         #Dir("#/../chrome/generated_resources"),

-        #Dir("Debug/obj/localized_strings"),

-        Dir("#/../third_party/zlib"),

-        Dir("#/../skia/include"),

-        Dir("#/../skia/include/corecg"),

-        Dir("#/../skia/platform"),

-        Dir("#/../third_party/libpng"),

-        Dir("#/../breakpad/src"),

+        '$CHROME_DIR/third_party/wtl/include',

+        '$NPAPI_DIR',

+        '$LIBXML_DIR/include',

+        '$ICU38_DIR/public/common',

+        '$ICU38_DIR/public/i18n',

+        '$CHROME_DIR/app',

+        '$ZLIB_DIR',

+        '$SKIA_DIR/include',

+        '$SKIA_DIR/include/corecg',

+        '$SKIA_DIR/platform',

+        '$LIBPNG_DIR',

+        '$BREAKPAD_DIR/src',

     ],

 )

 

 input_files = [

-  "debugger_shell.cc",

-  "debugger_io_socket.cc",

-  "debugger_node.cc",

-  "debugger_view.cc",

-  "debugger_window.cc",

-  "debugger_wrapper.cc",

+    'debugger_shell.cc',

+    'debugger_io_socket.cc',

+    'debugger_node.cc',

+    'debugger_view.cc',

+    'debugger_window.cc',

+    'debugger_wrapper.cc',

 ]

 

 env.StaticLibrary('debugger', input_files)

diff --git a/chrome/common/SConscript b/chrome/common/SConscript
index b84a29b3..4b38f76 100644
--- a/chrome/common/SConscript
+++ b/chrome/common/SConscript
@@ -33,22 +33,15 @@ env = env.Clone()
 

 env.Prepend(

     CPPPATH = [

-        env.Dir('../app/resources'),

-        env.Dir('#/tools/build/win'),

-        env.Dir('#/..'),

+        '$CHROME_DIR/app/resources',

+        '#/tools/build/win',

+        '#/..',

     ],

     CPPDEFINES = [

         'U_STATIC_IMPLEMENTATION',

-        'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',

-        'WIN32_LEAN_AND_MEAN',

     ],

     CCFLAGS = [

         '/TP',

-

-        '/Wp64',

-

-        '/wd4503',

-        '/wd4819',

     ],

 )

 

@@ -67,7 +60,7 @@ env.Append(
         '$SKIA_DIR/platform',

         '$LIBPNG_DIR',

         '$ZLIB_DIR',

-        env.Dir('#../breakpad/src'),

+        '$BREAKPAD_DIR/src',

         '$LIBJPEG_DIR',

         '$ICU38_DIR/public/common',

         '$ICU38_DIR/public/i18n',

diff --git a/chrome/installer/mini_installer/SConscript b/chrome/installer/mini_installer/SConscript
index 37cc692..d75e02f 100644
--- a/chrome/installer/mini_installer/SConscript
+++ b/chrome/installer/mini_installer/SConscript
@@ -55,18 +55,8 @@ env.Prepend(
         '$GTEST_DIR',

         '#/..',

     ],

-    CPPDEFINES = [

-        'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',

-        'WIN32_LEAN_AND_MEAN',

-    ],

     CCFLAGS = [

         '/TP',

-

-        '/Wp64',

-

-        '/wd4503',

-        '/wd4819',

-

         '/GS-',         # because we link with /NODEFAULTLIB

     ],

     LINKFLAGS = [

@@ -145,84 +135,22 @@ env.Depends(packed, '$TARGET_ROOT/setup.exe')
 

 

 env_version = env.Clone(

-    VERSION_BAT = File('#/../chrome/tools/build/win/version.bat'),

-    CHROMEDIR = Dir('#/../chrome'),

-    PWD = Dir('.'),

+    VERSION_BAT = env.File('$CHROME_DIR/tools/build/win/version.bat'),

+    CHROMEDIR = env.Dir('$CHROME_DIR'),

+    PWD = env.Dir('.'),

 )

 

 env_version.Command('mini_installer_exe_version.rc',

                     ['mini_installer_exe_version.rc.version',

-                     '$CHROMEDIR/VERSION',

-                     '$CHROMEDIR/BRANDING'],

+                     '$CHROME_DIR/VERSION',

+                     '$CHROME_DIR/BRANDING'

+                    ],

                     "$VERSION_BAT $SOURCE $CHROMEDIR $PWD $TARGET")

 

 

-#/Od

-#/I

-#"C:\src\trunk-vs\chrome\..\testing\gtest\include"

-#/I

-#"C:\src\trunk-vs\chrome\..\testing\gtest"

-#/I

-#"C:\src\trunk-vs\chrome\.."

-#/I

-#"C:\src\trunk-vs\chrome\third_party\wtl\include"

-#/I

-#"C:\src\trunk-vs\chrome\..\third_party\platformsdk_vista_6_0\files\Include"

-#/I

-#"C:\src\trunk-vs\chrome\..\third_party\platformsdk_vista_6_0\files\VC\INCLUDE"

-#/I

-#"C:\Program

-#Files\Microsoft

-#Visual

-#Studio

-#8\\VC\atlmfc\include"

-#/D

-#"UNIT_TEST"

-#/D

-#"_DEBUG"

-#/D

-#"_WIN32_WINNT=0x0600"

-#/D

-#"WINVER=0x0600"

-#/D

-#"WIN32"

-#/D

-#"_WINDOWS"

-#/D

-#"_HAS_EXCEPTIONS=0"

-#/D

-#"NOMINMAX"

-#/D

-#"_CRT_RAND_S"

-#/D

-#"CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"

-#/D

-#"WIN32_LEAN_AND_MEAN"

-#/D

-#"_UNICODE"

-#/D

-#"UNICODE"

-#/FD

-#/RTC1

-#/MTd

-#/Gy

-#/GR-

-#/Fo"C:\src\trunk-vs\chrome\Debug\obj\installer_unittests\\"

-#/Fd"C:\src\trunk-vs\chrome\Debug\obj\installer_unittests\vc80.pdb"

-#/W3

-#/WX

-#/c

-#/Wp64

-#/Zi

-#/TP

-#/wd4503

-#/wd4819

-

 env_test.Prepend(

     CPPDEFINES = [

         'UNIT_TEST',

-        'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',

-        'WIN32_LEAN_AND_MEAN',

     ],

     CPPPATH = [

         '$GTEST_DIR/include',

diff --git a/chrome/installer/setup/SConscript b/chrome/installer/setup/SConscript
index b26790f..c7a3f9d 100644
--- a/chrome/installer/setup/SConscript
+++ b/chrome/installer/setup/SConscript
@@ -134,9 +134,9 @@ env.Alias('chrome', i)
 

 

 env_version = env.Clone(

-    VERSION_BAT = File('#/../chrome/tools/build/win/version.bat'),

-    CHROMEDIR = Dir('#/../chrome'),

-    PWD = Dir('.'),

+    VERSION_BAT = env.File('$CHROME_DIR/tools/build/win/version.bat'),

+    CHROMEDIR = env.Dir('$CHROME_DIR'),

+    PWD = env.Dir('.'),

 )

 

 import os

@@ -148,6 +148,7 @@ env_version['ENV']['PATH'] = os.environ['PATH']
 setup_exe_version_rc = env_version.Command(

     'setup_exe_version.rc',

     ['setup_exe_version.rc.version',

-    '$CHROMEDIR/VERSION',

-    '$CHROMEDIR/BRANDING'],

+     '$CHROME_DIR/VERSION',

+     '$CHROME_DIR/BRANDING'

+    ],

     '$VERSION_BAT $SOURCE $CHROMEDIR $PWD $TARGET')

diff --git a/chrome/installer/util/SConscript b/chrome/installer/util/SConscript
index 7a517cf..31c8d02 100644
--- a/chrome/installer/util/SConscript
+++ b/chrome/installer/util/SConscript
@@ -34,23 +34,21 @@ env = env.Clone()
 

 env.Prepend(

     CPPPATH = [

-        Dir("#/../third_party/lzma_sdk"),

-        Dir("../chrome/third_party/wtl/include"),

-        Dir("#/../third_party/npapi"),

-        Dir("#/../third_party/libxml/include"),

-        #/I "C:/src/trunk/chrome/Debug/obj/generated_resources"

-        #/I "C:/src/trunk/chrome/Debug/obj/localized_strings"

-        Dir("#/../skia/include"),

-        Dir("#/../skia/include/corecg"),

-        Dir("#/../skia/platform"),

-        Dir("#/../third_party/libpng"),

-        Dir("#/../third_party/zlib"),

-        Dir("#/../breakpad/src"),

-        Dir("#/../third_party/libjpeg"),

-        Dir("#/../third_party/icu38/public/common"),

-        Dir("#/../third_party/icu38/public/i18n"),

-        Dir("#/.."),

-        Dir("."),

+        '$LZMA_SDK_DIR',

+        '$CHROME_DIR/third_party/wtl/include',

+        '$NPAPI_DIR',

+        '$LIBXML_DIR/include',

+        '$SKIA_DIR/include',

+        '$SKIA_DIR/include/corecg',

+        '$SKIA_DIR/platform',

+        '$LIBPNG_DIR',

+        '$ZLIB_DIR',

+        '$BREAKPAD_DIR/src',

+        '$LIBJPEG_DIR',

+        '$ICU38_DIR/public/common',

+        '$ICU38_DIR/public/i18n',

+        '#/..',

+        '.',

     ],

     CPPDEFINES = [

         "_LZMA_IN_CB",

@@ -58,37 +56,30 @@ env.Prepend(
         "PNG_USER_CONFIG",

         "CHROME_PNG_WRITE_SUPPORT"

         "U_STATIC_IMPLEMENTATION",

-        "CERT_CHAIN_PARA_HAS_EXTRA_FIELDS",

-        "WIN32_LEAN_AND_MEAN",

     ],

     CCFLAGS = [

         '/TP',

-

-        '/Wp64',

-

-        '/wd4503',

-        '/wd4819',

     ],

 )

 

 input_files = [

-  "../../app/google_update_settings$OBJSUFFIX",

-  "copy_tree_work_item.cc",

-  "create_dir_work_item.cc",

-  "create_reg_key_work_item.cc",

-  "delete_tree_work_item.cc",

-  "google_update_constants.cc",

-  "helper.cc",

-  "install_util.cc",

-  "l10n_string_util.cc",

-  "logging_installer.cc",

-  "lzma_util.cc",

-  "set_reg_value_work_item.cc",

-  "shell_util.cc",

-  "util_constants.cc",

-  "version.cc",

-  "work_item.cc",

-  "work_item_list.cc",

+    '../../app/google_update_settings$OBJSUFFIX',

+    'copy_tree_work_item.cc',

+    'create_dir_work_item.cc',

+    'create_reg_key_work_item.cc',

+    'delete_tree_work_item.cc',

+    'google_update_constants.cc',

+    'helper.cc',

+    'install_util.cc',

+    'l10n_string_util.cc',

+    'logging_installer.cc',

+    'lzma_util.cc',

+    'set_reg_value_work_item.cc',

+    'shell_util.cc',

+    'util_constants.cc',

+    'version.cc',

+    'work_item.cc',

+    'work_item_list.cc',

 ]

 

 x = env.StaticLibrary('util', input_files)

diff --git a/chrome/plugin/SConscript b/chrome/plugin/SConscript
index 8dbb9ef..c53c37a 100644
--- a/chrome/plugin/SConscript
+++ b/chrome/plugin/SConscript
@@ -32,42 +32,32 @@ Import('env')
 env = env.Clone()

 

 

-

 env.Prepend(

     CPPPATH = [

-        Dir("#/../third_party/npapi"),

-        Dir("#/../chrome/tools/build/win"),

-        Dir("#/../skia/include"),

-        Dir("#/../skia/include/corecg"),

-        Dir("#/../skia/platform"),

-        Dir("#/.."),

-    ],

-    CPPDEFINES = [

-        "CERT_CHAIN_PARA_HAS_EXTRA_FIELDS",

-        "WIN32_LEAN_AND_MEAN",

+        '$NPAPI_DIR',

+        '$CHROME_DIR/tools/build/win',

+        '$SKIA_DIR/include',

+        '$SKIA_DIR/include/corecg',

+        '$SKIA_DIR/platform',

+        '#/..',

     ],

     CCFLAGS = [

         '/TP',

-

-        #'/Wp64',

-

-        '/wd4503',

-        '/wd4819',

     ],

 )

 

 input_files = [

-  "npobject_proxy.cc",

-  "webplugin_proxy.cc",

-  "webplugin_delegate_stub.cc",

-  "plugin_thread.cc",

-  "plugin_process.cc",

-  "plugin_main.cc",

-  "plugin_channel_base.cc",

-  "plugin_channel.cc",

-  "chrome_plugin_host.cc",

-  "npobject_util.cc",

-  "npobject_stub.cc",

+    'chrome_plugin_host.cc',

+    'npobject_proxy.cc',

+    'npobject_stub.cc',

+    'npobject_util.cc',

+    'plugin_channel.cc',

+    'plugin_channel_base.cc',

+    'plugin_main.cc',

+    'plugin_process.cc',

+    'plugin_thread.cc',

+    'webplugin_delegate_stub.cc',

+    'webplugin_proxy.cc',

 ]

 

 env.StaticLibrary('plugin', input_files)

diff --git a/chrome/renderer/SConscript b/chrome/renderer/SConscript
index e9b83a8..200dba7 100644
--- a/chrome/renderer/SConscript
+++ b/chrome/renderer/SConscript
@@ -32,33 +32,17 @@ Import('env')
 env = env.Clone()

 

 

-

-#/Yu"precompiled_wtl.h"

-#/Fp"C:\src\trunk\chrome\Debug\obj\browser\precompiled_wtl.pch"

-#/Fo"C:\src\trunk\chrome\Debug\obj\browser\\"

-#/Fd"C:\src\trunk\chrome\Debug\obj\browser\vc80.pdb"

-#/W3

-#/WX

-#/FI "precompiled_wtl.h"

-

 env.Prepend(

     CPPPATH = [

-        env.Dir('../app/resources'),

-        env.Dir('#/tools/build/win'),

-        env.Dir('#/..'),

+        '$CHROME_DIR/app/resources',

+        '#/tools/build/win',

+        '#/..',

     ],

     CPPDEFINES = [

         'U_STATIC_IMPLEMENTATION',

-        'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',

-        'WIN32_LEAN_AND_MEAN',

     ],

     CCFLAGS = [

         '/TP',

-

-        '/Wp64',

-

-        '/wd4503',

-        '/wd4819',

     ],

 )

 

@@ -67,8 +51,6 @@ env.Append(
         'third_party/wtl/include',

         '$ICU38_DIR/public/common',

         '$ICU38_DIR/public/i18n',

-        #Dir('#../chrome/Debug/obj/generated_resources'),

-        #Dir('#../chrome/Debug/obj/localized_strings'),

         '$NPAPI_DIR',

         '$SKIA_DIR/include',

         '$SKIA_DIR/include/corecg',

diff --git a/chrome/test/interactive_ui/SConscript b/chrome/test/interactive_ui/SConscript
index db4fddb..54d7fc3 100644
--- a/chrome/test/interactive_ui/SConscript
+++ b/chrome/test/interactive_ui/SConscript
@@ -38,8 +38,6 @@ env_test.Prepend(
         'UNIT_TEST',

         'LIBXSLT_STATIC',

         'LIBXML_STATIC',

-        'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',

-        'WIN32_LEAN_AND_MEAN',

     ],

     CPPPATH = [

         '$GTEST_DIR/include',

diff --git a/chrome/test/mini_installer_test/SConscript b/chrome/test/mini_installer_test/SConscript
index 6a474f0..8413c3f 100644
--- a/chrome/test/mini_installer_test/SConscript
+++ b/chrome/test/mini_installer_test/SConscript
@@ -36,8 +36,6 @@ env_test = env_test.Clone()
 env_test.Prepend(

     CPPDEFINES = [

         'UNIT_TEST',

-        'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',

-        'WIN32_LEAN_AND_MEAN',

     ],

     CPPPATH = [

         '$GTEST_DIR/include',

diff --git a/chrome/test/page_cycler/SConscript b/chrome/test/page_cycler/SConscript
index eb24fd4..59b1a8a 100644
--- a/chrome/test/page_cycler/SConscript
+++ b/chrome/test/page_cycler/SConscript
@@ -36,8 +36,6 @@ env_test.Prepend(
     CPPDEFINES = [

         'UI_TEST',

         'UNIT_TEST',

-        'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',

-        'WIN32_LEAN_AND_MEAN',

     ],

     CPPPATH = [

         '$GTEST_DIR/include',

diff --git a/chrome/test/plugin/SConscript b/chrome/test/plugin/SConscript
index 6ad1cdc..43a192b 100644
--- a/chrome/test/plugin/SConscript
+++ b/chrome/test/plugin/SConscript
@@ -38,8 +38,6 @@ env_test.Prepend(
         'UNIT_TEST',

         'LIBXSLT_STATIC',

         'LIBXML_STATIC',

-        'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',

-        'WIN32_LEAN_AND_MEAN',

     ],

     CPPPATH = [

         '$GTEST_DIR/include',

diff --git a/chrome/test/reliability/SConscript b/chrome/test/reliability/SConscript
index e0b0a32..22dde0e 100644
--- a/chrome/test/reliability/SConscript
+++ b/chrome/test/reliability/SConscript
@@ -37,8 +37,6 @@ env_test.Prepend(
         'RELIABILITY_TEST',     # seems to be unused

         'UI_TEST',

         'UNIT_TEST',

-        'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',

-        'WIN32_LEAN_AND_MEAN',

     ],

     CPPPATH = [

         '$GTEST_DIR/include',

diff --git a/chrome/test/selenium/SConscript b/chrome/test/selenium/SConscript
index eaa1b6e..b1473c1 100644
--- a/chrome/test/selenium/SConscript
+++ b/chrome/test/selenium/SConscript
@@ -35,8 +35,6 @@ env_test.Prepend(
     CPPDEFINES = [

         'UI_TEST',

         'UNIT_TEST',

-        'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',

-        'WIN32_LEAN_AND_MEAN',

     ],

     CPPPATH = [

         '$GTEST_DIR/include',

diff --git a/chrome/test/startup/SConscript b/chrome/test/startup/SConscript
index 4f48ee5..a0e13e0 100644
--- a/chrome/test/startup/SConscript
+++ b/chrome/test/startup/SConscript
@@ -35,8 +35,6 @@ env_test.Prepend(
     CPPDEFINES = [

         'UI_TEST',

         'UNIT_TEST',

-        'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',

-        'WIN32_LEAN_AND_MEAN',

     ],

     CPPPATH = [

         '$GTEST_DIR/include',

diff --git a/chrome/test/tab_switching/SConscript b/chrome/test/tab_switching/SConscript
index d825fa3..cd9c310 100644
--- a/chrome/test/tab_switching/SConscript
+++ b/chrome/test/tab_switching/SConscript
@@ -35,8 +35,6 @@ env_test.Prepend(
     CPPDEFINES = [

         'UI_TEST',

         'UNIT_TEST',

-        'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',

-        'WIN32_LEAN_AND_MEAN',

     ],

     CPPPATH = [

         '$GTEST_DIR/include',

diff --git a/chrome/third_party/hunspell/SConscript b/chrome/third_party/hunspell/SConscript
index 1a1a6f9..6f7b5d0 100644
--- a/chrome/third_party/hunspell/SConscript
+++ b/chrome/third_party/hunspell/SConscript
@@ -52,8 +52,6 @@ env.Append(
         '/TP',

 

         '/wd4800',

-        '/wd4503',

-        '/wd4819',

     ],

 )

 

diff --git a/chrome/third_party/sqlite/SConscript b/chrome/third_party/sqlite/SConscript
index 5e19aa2..c8c94c9 100644
--- a/chrome/third_party/sqlite/SConscript
+++ b/chrome/third_party/sqlite/SConscript
@@ -52,7 +52,6 @@ env.Append(
         'SQLITE_SECURE_DELETE',

         'THREADSAFE',

         ['_HAS_EXCEPTIONS', '0'],

-        'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',

     ],

 

     CCFLAGS = [

@@ -60,8 +59,6 @@ env.Append(
 

         '/wd4800',

         '/wd4244',

-        '/wd4503',

-        '/wd4819',

     ],

 )

 

diff --git a/chrome/tools/test/image_diff/SConscript b/chrome/tools/test/image_diff/SConscript
index 7a6b825..b9445d9 100644
--- a/chrome/tools/test/image_diff/SConscript
+++ b/chrome/tools/test/image_diff/SConscript
@@ -36,8 +36,6 @@ env_test.Prepend(
         'PNG_USER_CONFIG',

         'CHROME_PNG_WRITE_SUPPORT',

         '_DEBUG',

-        'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',

-        'WIN32_LEAN_AND_MEAN',

     ],

     CPPPATH = [

         '$ZLIB_DIR',

diff --git a/chrome/views/SConscript b/chrome/views/SConscript
index c47c0c5..a433eeb 100644
--- a/chrome/views/SConscript
+++ b/chrome/views/SConscript
@@ -32,23 +32,14 @@ Import('env')
 env = env.Clone()

 

 

-

 env.Prepend(

     CPPPATH = [

-        env.Dir("#/../chrome/tools/build/win"),

-        env.Dir("#/.."),

-    ],

-    CPPDEFINES = [

-        "CERT_CHAIN_PARA_HAS_EXTRA_FIELDS",

-        "WIN32_LEAN_AND_MEAN",

+        '$CHROME_DIR/tools/build/win',

+        '#/..',

     ],

     CCFLAGS = [

         '/TP',

-

         #'/Wp64',

-

-        '/wd4503',

-        '/wd4819',

     ],

 )