Update build.py to handle tweaked Xcode output in newer versions of Xcode.

dart/tools/build.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 #
 
 import optparse
 import os
 import re
@@ skipping 180 matching lines @@
       'prebuilt', toolchain_dir, 'bin')
   CheckDirExists(android_toolchain, 'Android toolchain')
 
   return android_toolchain
 
 
 def Execute(args):
   process = subprocess.Popen(args)
   process.wait()
   if process.returncode != 0:
-    raise Exception(args[0] + " failed")  
+    raise Exception(args[0] + " failed")
 
 
 def CurrentDirectoryBaseName():
   """Returns the name of the current directory"""
   return os.path.relpath(os.curdir, start=os.pardir)
 
 
 def FilterEmptyXcodebuildSections(process):
   """
   Filter output from xcodebuild so empty sections are less verbose.
 
   The output from xcodebuild looks like this:
 
 Build settings from command line:
     SYMROOT = .../xcodebuild
 
-=== BUILD AGGREGATE TARGET samples OF PROJECT dart WITH CONFIGURATION ...
+=== BUILD TARGET samples OF PROJECT dart WITH CONFIGURATION ...
+
 Check dependencies
 
+=== BUILD AGGREGATE TARGET upload_sdk OF PROJECT dart WITH CONFIGURATION ...
 
-=== BUILD AGGREGATE TARGET upload_sdk OF PROJECT dart WITH CONFIGURATION ...
 Check dependencies
 
 PhaseScriptExecution "Action \"upload_sdk_py\"" xcodebuild/dart.build/...
     cd ...
     /bin/sh -c .../xcodebuild/dart.build/ReleaseIA32/upload_sdk.build/...
 
 
 ** BUILD SUCCEEDED **
 
   """
 
   def is_empty_chunk(chunk):
-    empty_chunk = ['Check dependencies', '', '']
+    empty_chunk = ['', 'Check dependencies', '']
     return not chunk or (len(chunk) == 4 and chunk[1:] == empty_chunk)
 
   def unbuffered(callable):
     # Use iter to disable buffering in for-in.
     return iter(callable, '')
 
   section = None
   chunk = []
   # Is stdout a terminal which supports colors?
   is_fancy_tty = False
   clr_eol = None
   if sys.stdout.isatty():
     term = os.getenv('TERM', 'dumb')
     # The capability "clr_eol" means clear the line from cursor to end
     # of line.  See man pages for tput and terminfo.
     try:
       with open('/dev/null', 'a') as dev_null:
         clr_eol = subprocess.check_output(['tput', '-T' + term, 'el'],
                                           stderr=dev_null)
       if clr_eol:
         is_fancy_tty = True
     except subprocess.CalledProcessError:
       is_fancy_tty = False
     except AttributeError:
       is_fancy_tty = False
-  pattern = re.compile(r'=== BUILD .* TARGET (.*) OF PROJECT (.*) WITH ' +
+  pattern = re.compile(r'=== BUILD.* TARGET (.*) OF PROJECT (.*) WITH ' +
                        r'CONFIGURATION (.*) ===')
   has_interesting_info = False
   for line in unbuffered(process.stdout.readline):
     line = line.rstrip()
     if line.startswith('=== BUILD ') or line.startswith('** BUILD '):
       has_interesting_info = False
       section = line
       if is_fancy_tty:
         match = re.match(pattern, section)
         if match:
           section = '%s/%s/%s' % (
             match.group(3), match.group(2), match.group(1))
         # Truncate to avoid extending beyond 80 columns.
         section = section[:80]
         # If stdout is a terminal, emit "progress" information.  The
         # progress information is the first line of the current chunk.
         # After printing the line, move the cursor back to the
         # beginning of the line.  This has two effects: First, if the
         # chunk isn't empty, the first line will be overwritten
         # (avoiding duplication).  Second, the next segment line will
         # overwrite it too avoid long scrollback.  clr_eol ensures
         # that there is no trailing garbage when a shorter line
         # overwrites a longer line.
         print '%s%s\r' % (clr_eol, section),
       chunk = []
     if not section or has_interesting_info:
       print line
     else:
       length = len(chunk)
-      if length == 1 and line != 'Check dependencies':
+      if length == 2 and line != 'Check dependencies':
         has_interesting_info = True
-      elif (length == 2 or length == 3) and line:
+      elif (length == 1 or length == 3) and line:
         has_interesting_info = True
       if has_interesting_info:
         print '\n'.join(chunk)
         chunk = []
       else:
         chunk.append(line)
   if not is_empty_chunk(chunk):
     print '\n'.join(chunk)
 
 
@@ skipping 101 matching lines @@
           process.wait()
           if process.returncode != 0:
             print "BUILD FAILED"
             return 1
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(Main())