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

1 files changed, 52 insertions, 35 deletions

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)