Parameterize the "Hammer" subdirectory name in which we build as...

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
 
 
+if sys.platform == 'win32':
+  console = 'con'
+else:
+  console = '/dev/tty'
 p = ARGUMENTS.get('PROGRESS')
 if p == 'spinner':
-  Progress(['/\r', '|\r', '\\\r', '-\r'], interval=5, file=open('con', 'w'))
+  Progress(['/\r', '|\r', '\\\r', '-\r'], interval=5, file=open(console, 'w'))
 elif p == 'name':
-  Progress('$TARGET\r', overwrite=True, file=open('con', 'w'))
+  Progress('$TARGET\r', overwrite=True, file=open(console, 'w'))
 
 
 default_warnings = ['no-missing-sconscript', 'no-no-parallel-support']
 default_warnings = ['no-no-parallel-support']
 SetOption('warn', default_warnings + GetOption('warn'))
 
 
 # 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.
 #
+# BUILD_TARGET_DIR
+#    Specifies the target subdirectory name in which we'll
+#    build everything.  This is intended to mimic the Visual
+#    Visual Studio "Debug\" and "Release\" subdirectories.
+#    The default value is "Hammer."
+#
+#
 # 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(
+    ('BUILD_TARGET_DIR', '', 'Hammer'),
     ('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_SRC_DIR = '$MAIN_DIR/..',
-    DESTINATION_ROOT = '$MAIN_DIR/Hammer',
+    DESTINATION_ROOT = '$MAIN_DIR/$BUILD_TARGET_DIR',
 
     # 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.
     LIBS_DIR              = '$COMPONENT_LIBRARY_DIR',
 
@@ skipping 503 matching lines @@
     FRAMEWORKS = [
         'AppKit',
         'ApplicationServices',
         'Foundation',
     ],
 
     ICU_LIBS = ['icui18n', 'icuuc', 'icudata'],
 )
 
 
-# Add --clobber (for the buildbot).
-# NOTE: seems to be crucial to do this before any builders are invoked.
-AddOption('--clobber', action='store_true', dest='clobber', default=False,
-          help='Delete build directory before building.')
-if GetOption('clobber'):
-  shutil.rmtree(root_env.Dir('$DESTINATION_ROOT').abspath, True)
-  # sconsign file gets put here at the moment.
-  shutil.rmtree(root_env.Dir('$MAIN_DIR/scons-out').abspath, True)
-
-
-
 # -------------------------------------------------------------------------
 
 
 # Overlay things from a layer below.
 for env in environment_list:
   env.Dir('$OBJ_ROOT').addRepository(env.Dir('$CHROME_SRC_DIR'))
   env.Dir('$OBJ_ROOT/googleurl').addRepository(env.Dir('$CHROME_SRC_DIR/build'))
 
   # We pre-resolve some common targets.  We end up spending lots of time
   # resolving these over and over again.
@@ skipping 100 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'),
 )
 
 # -------------------------------------------------------------------------