Fixes and enhancements...

build/SConscript.main

 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 import shutil
 import sys
 
 
 p = ARGUMENTS.get('PROGRESS')
 if p == 'spinner':
   Progress(['/\r', '|\r', '\\\r', '-\r'], interval=5, file=open('con', 'w'))
 elif p == 'name':
   Progress('$TARGET\r', overwrite=True, file=open('con', 'w'))
 
 
 default_warnings = ['no-missing-sconscript', 'no-no-parallel-support']
 default_warnings = ['no-no-parallel-support']
 SetOption('warn', default_warnings + GetOption('warn'))
 
 
-chrome_build_type = ARGUMENTS.get('CHROME_BUILD_TYPE')
-if chrome_build_type is None:
-  chrome_build_type = os.environ.get('CHROME_BUILD_TYPE', ''),
-
-chromium_build = ARGUMENTS.get('CHROMIUM_BUILD')
-if chromium_build is None:
-  chromium_build = os.environ.get('CHROMIUM_BUILD', ''),
+# Variables for controlling the build.
+#
+# The following variables can be set either on the command line
+# or in the external environment when executing SCons, with the
+# command line overriding any environment setting.
+#
+# CHROME_BUILD_TYPE
+#    When set, applies settings from the file
+#    build\internal\release_impl${CHROME_BUILD_TYPE}.scons
+#    to be applied to the construction environment.
+#
+# CHROMIUM_BUILD
+#    When set, applies settings from the file
+#    build\internal\chromium_build${CHROMIUM_BUILD}.scons
+#    to be applied to the construction environment.
+#
+# INCREMENTAL
+#    Controls whether or not libraries and executable programs are
+#    linked incrementally.  When set to any True value (1, T, y, True),
+#    uses the /INCREMENTAL flag to the Microsoft linker.  An
+#    explicit False value (0, f, N, false) uses the /INCREMENTAL:NO.
+#    When not set, the default is to link debug (developer) builds
+#    incrementally, but release builds use full links.
+#
+clvars = Variables('scons.opts', ARGUMENTS)
+clvars.AddVariables(
+    ('CHROME_BUILD_TYPE', '', os.environ.get('CHROME_BUILD_TYPE', '')),
+    ('CHROMIUM_BUILD', '', os.environ.get('CHROMIUM_BUILD', '')),
+    BoolVariable('INCREMENTAL', '', os.environ.get('INCREMENTAL')),
+)
 
 
 root_env = Environment(
     tools = ['component_setup',
              'chromium_builders',
              'chromium_load_component'],
+    variables = clvars,
 
     # Requested list of system (shared) libraries, from the comma separated
     # SYSTEM_LIBS command-line argument
     req_system_libs = [],
     # All supported system libraries, for the help message
     all_system_libs = [],
 
-    CHROME_BUILD_TYPE = chrome_build_type,
-    CHROMIUM_BUILD = chromium_build,
-
     CHROME_SRC_DIR = '$MAIN_DIR/..',
     DESTINATION_ROOT = '$MAIN_DIR/Hammer',
 
     # Where ComponentTestProgram() will build test executables.
     TESTS_DIR = '$DESTINATION_ROOT',
 
     # Where ComponentProgram() will build program executables.
     STAGING_DIR = '$DESTINATION_ROOT',
 
     # Where ComponentLibrary() will build libraries.
@@ skipping 152 matching lines @@
 # *_OPTIMIZED constructionv variables that add magic values to
 # CCFLAGS.  We override the normal variables (CPPDEFINES, CCFLAGS,
 # LINKFLAGS, ARFLAGS) below, but get rid of the special Hammer ones
 # here, until Hammer can be made a little nicer about htis.
 
 del windows_env['CCFLAGS_DEBUG']
 del windows_env['LINKFLAGS_DEBUG']
 del windows_env['CCFLAGS_OPTIMIZED']
 
 windows_env['PDB'] = '${TARGET.base}.pdb'
+windows_env['MSVC_BATCH'] = True
 
 # TODO(bradnelson): this should not need to be gated on host platform.
 if root_env['PLATFORM'] in ['win32', 'cygwin']:
   msvs_env = Environment(tools=['msvc', 'mslink', 'msvs'])['ENV']
   msvs_drive = msvs_env['PATH'][0]
 else:
   msvs_env = {'PATH': '', 'INCLUDE': '', 'LIB': ''}
   msvs_drive = 'C'
 
 # Use the absolute path for MSVC because it might not be on the same drive
@@ skipping 270 matching lines @@
 mac_env.Replace(
     # Reproduce XCode's behavior of using gcc even to link C++,
     # and distinguishing it the -x c++ option.
     CC = 'gcc-4.2',
     CXX = 'g++-4.2',
     LINK = '$CXX',
 )
 
 mac_env.FilterOut(
     BUILD_SCONSCRIPTS = [
+        '$BREAKPAD_DIR/SConscript',
+        '$BSDIFF_DIR/bsdiff.scons',
         '$BSPATCH_DIR/bspatch.scons',
-        '$BSDIFF_DIR/bsdiff.scons',
-        '$LIBJPEG_DIR/SConscript',
-        '$LIBXML_DIR/SConscript',
-        '$LIBXSLT_DIR/SConscript',
-        '$BREAKPAD_DIR/SConscript',
-        '$CHROME_DIR/SConscript',
+        '$CHROME_DIR/chrome.scons',
         '$GEARS_DIR/SConscript',
         '$GOOGLE_UPDATE_DIR/SConscript',
+        '$LIBJPEG_DIR/libjpeg.scons',
+        '$LIBXML_DIR/libxml.scons',
+        '$LIBXSLT_DIR/libxslt.scons',
         '$RLZ_DIR/SConscript',
         '$SANDBOX_DIR/sandbox.scons',
+        '$WEBKIT_DIR/SConscript',
         'build/SConscript.v8',
-        '$WEBKIT_DIR/SConscript',
     ],
 )
 
 if not root_env.WantSystemLib('libevent'):
   mac_env.Append(
     BUILD_SCONSCRIPTS = [
         '$LIBEVENT_DIR/libevent.scons',
     ],
   )
 mac_env.Append(
@@ skipping 160 matching lines @@
         'all_libraries',
         'all_languages',
         'all_programs',
         'all_test_programs',
     ], projects = [p],
     COMPONENT_VS_PROJECT_SCRIPT_PATH=(
         'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'),
 )
 
 # -------------------------------------------------------------------------