Pulling in hammer changes.

site_scons/site_tools/component_setup.py

 #!/usr/bin/python2.4
 # 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.
@@ skipping 52 matching lines @@
   # Need to force the target and source to be lists of nodes
   return SCons.Node.FS.LinkFunc([env.Entry(target)], [env.Entry(source)], env)
 
 
 def PreEvaluateVariables(env):
   """Deferred function to pre-evaluate SCons varables for each build mode.
 
   Args:
     env: Environment for the current build mode.
   """
-  # Convert directory variables to strings
+  # Convert directory variables to strings.  Must use .abspath not str(), since
+  # otherwise $OBJ_ROOT is converted to a relative path, which evaluates
+  # improperly in SConscripts not in $MAIN_DIR.
   for var in env.SubstList2('$PRE_EVALUATE_DIRS'):
-    env[var] = str(env.Dir('$' + var))
+    env[var] = env.Dir('$' + var).abspath
 
 
 #------------------------------------------------------------------------------
 
 
 def generate(env):
   # NOTE: SCons requires the use of this name, which fails gpylint.
   """SCons entry point for this tool."""
 
   # Use MD5 to tell when files differ, if the timestamps differ.  This is
@@ skipping 102 matching lines @@
   # Build all by default
   # TODO(rspangler): This would be more nicely done by creating an 'all'
   # alias and mapping that to $DESTINATION_ROOT (or the accumulation of all
   # $TARGET_ROOT's for the environments which apply to the current host
   # platform).  Ideally, that would be done in site_init.py and not here.  But
   # since we can't do that, just set the default to be DESTINATION_ROOT here.
   # Note that this currently forces projects which want to override the
   # default to do so after including the component_setup tool.
   env.Default('$DESTINATION_ROOT')
 
+  # Use brief command line strings if necessary
+  SCons.Script.Help("""\
+  --verbose                   Print verbose output while building, including
+                              the full command lines for all commands.
+  --brief                     Print brief output while building (the default).
+                              This and --verbose are opposites.  Use --silent
+                              to turn off all output.
+""")
+  SCons.Script.AddOption(
+      '--brief',
+      dest='brief_comstr',
+      default=True,
+      action='store_true',
+      help='brief command line output')
+  SCons.Script.AddOption(
+      '--verbose',
+      dest='brief_comstr',
+      default=True,
+      action='store_false',
+      help='verbose command line output')
+  if env.GetOption('brief_comstr'):
+    env.SetDefault(
+        ARCOMSTR='________Creating library $TARGET',
+        ASCOMSTR='________Assembling $TARGET',
+        CCCOMSTR='________Compiling $TARGET',
+        CONCAT_SOURCE_COMSTR='________ConcatSource $TARGET',
+        CXXCOMSTR='________Compiling $TARGET',
+        LDMODULECOMSTR='________Building loadable module $TARGET',
+        LINKCOMSTR='________Linking $TARGET',
+        MANIFEST_COMSTR='________Updating manifest for $TARGET',
+        MIDLCOMSTR='________Compiling IDL $TARGET',
+        PCHCOMSTR='________Precompiling $TARGET',
+        RANLIBCOMSTR='________Indexing $TARGET',
+        RCCOMSTR='________Compiling resource $TARGET',
+        SHCCCOMSTR='________Compiling $TARGET',
+        SHCXXCOMSTR='________Compiling $TARGET',
+        SHLINKCOMSTR='________Linking $TARGET',
+        SHMANIFEST_COMSTR='________Updating manifest for $TARGET',
+    )
+
   # Add other default tools from our toolkit
   # TODO(rspangler): Currently this needs to be before SOURCE_ROOT in case a
   # tool needs to redefine it.  Need a better way to handle order-dependency
   # in tool setup.
   for t in component_setup_tools:
     env.Tool(t)
 
   # The following environment replacements use env.Dir() to force immediate
   # evaluation/substitution of SCons variables.  They can't be part of the
   # preceding env.Replace() since they they may rely indirectly on variables
@@ skipping 11 matching lines @@
   # have a common location for tools outside of the current clientspec.  Need
   # to check if it's defined already, so it can be set prior to this tool
   # being included.
   tool_root = env.get('TOOL_ROOT', '$SOURCE_ROOT')
   env['TOOL_ROOT'] = env.Dir(tool_root).abspath
 
   # Defer pre-evaluating some environment variables, but do before building
   # SConscripts.
   env.Defer(PreEvaluateVariables)
   env.Defer('BuildEnvironmentSConscripts', after=PreEvaluateVariables)