[NaCl SDK] Make build_projects quiet by default.

native_client_sdk/src/build_tools/buildbot_common.py

 # Copyright (c) 2012 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.
 
 """Common utilities for all buildbot scripts that specifically don't rely
 on having a full chromium checkout.
 """
 
 import os
 import subprocess
@@ skipping 30 matching lines @@
   See IsSDKBuilder above for trybot/buildbot names."""
   return '_nacl_sdk' in os.getenv('BUILDBOT_BUILDERNAME', '')
 
 
 def ErrorExit(msg):
   """Write and error to stderr, then exit with 1 signaling failure."""
   sys.stderr.write(str(msg) + '\n')
   sys.exit(1)
 
 
+def Trace(verbose, msg):
+  if verbose:
+    sys.stderr.write(str(msg) + '\n')
+
+
 def GetWindowsEnvironment():
   sys.path.append(os.path.join(NACL_DIR, 'buildbot'))
   import buildbot_standard
 
   # buildbot_standard.SetupWindowsEnvironment expects a "context" object. We'll
   # fake enough of that here to work.
   class FakeContext(object):
     def __init__(self):
       self.env = os.environ
 
@@ skipping 25 matching lines @@
   # It looks like this:
   # KEY1=VALUE1\r\n
   # KEY2=VALUE2\r\n
   # ...
   return dict(line.split('=') for line in stdout.split('\r\n')[:-1])
 
 
 def BuildStep(name):
   """Annotate a buildbot build step."""
   sys.stdout.flush()
-  print '\n@@@BUILD_STEP %s@@@' % name
+  print >> sys.stderr, '\n@@@BUILD_STEP %s@@@' % name
   sys.stdout.flush()
 
 
-def Run(args, cwd=None, env=None, shell=False):
+def Run(args, cwd=None, env=None, shell=False, verbose=True):

[Sam Clegg, 2014/05/07 23:25:23]

What about having a buildbot_common.verbose variable that we can set just once
at startup rather than having to pass the state around?

[binji, 2014/05/07 23:51:16]

Done.

   """Start a process with the provided arguments.
 
   Starts a process in the provided directory given the provided arguments. If
   shell is not False, the process is launched via the shell to provide shell
   interpretation of the arguments.  Shell behavior can differ between platforms
   so this should be avoided when not using platform dependent shell scripts."""
 
   # We need to modify the environment to build host on Windows.
   if not env and getos.GetPlatform() == 'win':
     env = GetWindowsEnvironment()
 
-  print 'Running: ' + ' '.join(args)
+  Trace(verbose, 'Running: ' + ' '.join(args))
   sys.stdout.flush()
   sys.stderr.flush()
   try:
     subprocess.check_call(args, cwd=cwd, env=env, shell=shell)
   except subprocess.CalledProcessError as e:
     sys.stdout.flush()
     sys.stderr.flush()
     ErrorExit('buildbot_common: %s' % e)
 
   sys.stdout.flush()
   sys.stderr.flush()
 
 
-def CopyDir(src, dst, excludes=('.svn', '*/.svn')):
+def CopyDir(src, dst, excludes=('.svn', '*/.svn'), verbose=True):
   """Recursively copy a directory using."""
   args = ['-r', src, dst]
   for exc in excludes:
     args.append('--exclude=' + exc)
-  print 'cp -r %s %s' % (src, dst)
+  Trace(verbose, 'cp -r %s %s' % (src, dst))
   if os.path.abspath(src) == os.path.abspath(dst):
     ErrorExit('ERROR: Copying directory onto itself: ' + src)
   oshelpers.Copy(args)
 
 
-def CopyFile(src, dst):
-  print 'cp %s %s' % (src, dst)
+def CopyFile(src, dst, verbose=True):
+  Trace(verbose, 'cp %s %s' % (src, dst))
   if os.path.abspath(src) == os.path.abspath(dst):
     ErrorExit('ERROR: Copying file onto itself: ' + src)
   args = [src, dst]
   oshelpers.Copy(args)
 
 
-def RemoveDir(dst):
+def RemoveDir(dst, verbose=True):
   """Remove the provided path."""
-  print 'rm -fr ' + dst
+  Trace(verbose, 'rm -fr ' + dst)
   oshelpers.Remove(['-fr', dst])
 
 
-def MakeDir(dst):
+def MakeDir(dst, verbose=True):
   """Create the path including all parent directories as needed."""
-  print 'mkdir -p ' + dst
+  Trace(verbose, 'mkdir -p ' + dst)
   oshelpers.Mkdir(['-p', dst])
 
 
-def Move(src, dst):
+def Move(src, dst, verbose=True):
   """Move the path src to dst."""
-  print 'mv -f %s %s' % (src, dst)
+  Trace(verbose, 'mv -f %s %s' % (src, dst))
   oshelpers.Move(['-f', src, dst])
 
 
-def RemoveFile(dst):
+def RemoveFile(dst, verbose=True):
   """Remove the provided file."""
-  print 'rm ' + dst
+  Trace(verbose, 'rm ' + dst)
   oshelpers.Remove(['-f', dst])
 
 
 BOT_GSUTIL = '/b/build/scripts/slave/gsutil'
 # On Windows, the current working directory may be on a different drive than
 # gsutil.
 WIN_BOT_GSUTIL = 'E:' + BOT_GSUTIL
 LOCAL_GSUTIL = 'gsutil'
 
 
@@ skipping 14 matching lines @@
   # Since GetGsutil() might just return 'gsutil' and expect it to be looked
   # up in the PATH, we must pass shell=True on windows.
   # Without shell=True the windows implementation of subprocess.call will not
   # search the PATH for the executable: http://bugs.python.org/issue8557
   shell = getos.GetPlatform() == 'win'
 
   cmd = [GetGsutil(), 'cp', '-a', 'public-read', filename, full_dst]
   Run(cmd, shell=shell, cwd=cwd)
   url = 'https://storage.googleapis.com/%s/%s' % (bucket_path, filename)
   if step_link:
-    print '@@@STEP_LINK@download@%s@@@' % url
+    print >> sys.stderr, '@@@STEP_LINK@download@%s@@@' % url

[Sam Clegg, 2014/05/07 23:25:23]

I don't like the >> syntax.

How about sys.stderr.write()?

[binji, 2014/05/07 23:51:16]

Done.

     sys.stdout.flush()