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

3 files changed, 44 insertions, 124 deletions

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)