[NaCl SDK] Make build_projects quiet by default.

native_client_sdk/src/build_tools/buildbot_common.py

Index: native_client_sdk/src/build_tools/buildbot_common.py
diff --git a/native_client_sdk/src/build_tools/buildbot_common.py b/native_client_sdk/src/build_tools/buildbot_common.py
index dd10870dcb0d7201fd00a6a960b854b59f1f7cbb..92b21d66d01b2198d4e9ee2d009d5f901870a243 100644
--- a/native_client_sdk/src/build_tools/buildbot_common.py
+++ b/native_client_sdk/src/build_tools/buildbot_common.py
@@ -48,6 +48,11 @@ def ErrorExit(msg):
   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
@@ -93,11 +98,11 @@ def GetWindowsEnvironment():
 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
@@ -109,7 +114,7 @@ def Run(args, cwd=None, env=None, shell=False):
   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:
@@ -123,46 +128,46 @@ def Run(args, cwd=None, env=None, shell=False):
   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])
 
 
@@ -197,5 +202,5 @@ def Archive(filename, bucket_path, cwd=None, step_link=True):
   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()