Pulling in hammer changes.

site_scons/site_tools/component_targets.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 95 matching lines @@
 
 #------------------------------------------------------------------------------
 
 
 def AddTargetGroup(name, description):
   """Adds a target group, used for printing help.
 
   Args:
     name: Name of target group.  This should be the name of an alias which
         points to other aliases for the specific targets.
-    description: Description of the target group.
+    description: Description of the target group.  Should read properly when
+        appended to 'The following ' - for example, 'programs can be built'.
   """
 
   # Warn if the target group already exists with a different description
   if (name in __target_groups
       and __target_groups[name].description != description):
     print ('Warning: Changing description of target group "%s" from "%s" to '
            '"%s"' % (name, __target_groups[name].description, description))
     __target_groups[name].description = description
   else:
     __target_groups[name] = TargetGroup(name, description)
@@ skipping 13 matching lines @@
 
 def GetTargetModes():
   """Gets the dict of target modes.
 
   Returns:
     The dict of target modes, indexed by mode name.
 
   This dict is not fully populated until after BuildEnvironments() has been
   called.
   """
+  # TODO(rspangler): Better to rename this to # GetTargetBuildEnvironments()?
+  # That's a more description name.
   return __target_modes
 
 
 def GetTargets():
   """Gets the dict of targets.
 
   Returns:
     The dict of targets, indexed by target name.
 
   This dict is not fully populated until after BuildEnvironments() has been
@@ skipping 30 matching lines @@
     if mode not in target.mode_properties:
       target.mode_properties[mode] = {}
     add_to_dict = target.mode_properties[mode]
 
   # Add values
   for k, v in kwargs.items():
     add_to_dict[k] = self.subst(str(v))
 
 
 def AddTargetHelp():
-  """Adds help for the targets, groups, and modes."""
+  """Adds SCons help for the targets, groups, and modes.
+
+  This is called automatically by BuildEnvironments()."""
   help_text = ''
 
   for group in GetTargetGroups().values():
     items = group.GetTargetNames()
     items.sort()
     if items:
       help_text += '\nThe following %s:' % group.description
       colwidth = max(map(len, items)) + 2
       cols = 77 / colwidth
       if cols < 1:
@@ skipping 44 matching lines @@
   __builtin__.AddTargetHelp = AddTargetHelp
   __builtin__.GetTargetGroups = GetTargetGroups
   __builtin__.GetTargetModes = GetTargetModes
   __builtin__.GetTargets = GetTargets
 
   env.AddMethod(SetTargetDescription)
   env.AddMethod(SetTargetProperty)
 
   # Defer per-mode setup
   env.Defer(AddTargetMode)