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, 32 insertions, 41 deletions

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)