[NaCl SDK] Make build_projects quiet by default.

BUG=none
R=sbc@chromium.org

Review URL: https://codereview.chromium.org/275523003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269952 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 39 insertions, 23 deletions

diff --git a/native_client_sdk/src/build_tools/build_projects.py b/native_client_sdk/src/build_tools/build_projects.py
index ab3752c..fc8ad59 100755
--- a/native_client_sdk/src/build_tools/build_projects.py
+++ b/native_client_sdk/src/build_tools/build_projects.py
@@ -40,11 +40,16 @@ VALID_TOOLCHAINS = [
 ]
 
 # Global verbosity setting.
-# If set to try (normally via a command line arg) then build_projects will
+# If set to True (normally via a command line arg) then build_projects will
 # add V=1 to all calls to 'make'
 verbose = False
 
 
+def Trace(msg):
+  if verbose:
+    sys.stderr.write(str(msg) + '\n')
+
+
 def CopyFilesFromTo(filelist, srcdir, dstdir):
   for filename in filelist:
     srcpath = os.path.join(srcdir, filename)
@@ -229,7 +234,6 @@ def BuildProjectsBranch(pepperdir, branch, deps, clean, config, args=None):
 
 def BuildProjects(pepperdir, project_tree, deps=True,
                   clean=False, config='Debug'):
-
   # Make sure we build libraries (which live in 'src') before
   # any of the examples.
   build_first = [p for p in project_tree if p != 'src']
@@ -245,7 +249,8 @@ def main(argv):
       help='Clobber project directories before copying new files',
       action='store_true', default=False)
   parser.add_option('-b', '--build',
-      help='Build the projects.', action='store_true')
+      help='Build the projects. Otherwise the projects are only copied.',
+      action='store_true')
   parser.add_option('--config',
       help='Choose configuration to build (Debug or Release).  Builds both '
            'by default')
@@ -272,6 +277,12 @@ def main(argv):
 
   options, args = parser.parse_args(argv[1:])
 
+  global verbose
+  if options.verbose:
+    verbose = True
+
+  buildbot_common.verbose = verbose
+
   if 'NACL_SDK_ROOT' in os.environ:
     # We don't want the currently configured NACL_SDK_ROOT to have any effect
     # on the build.
@@ -292,37 +303,35 @@ def main(argv):
   if 'host' in options.toolchain:
     options.toolchain.remove('host')
     options.toolchain.append(getos.GetPlatform())
-    print 'Adding platform: ' + getos.GetPlatform()
+    Trace('Adding platform: ' + getos.GetPlatform())
 
   ValidateToolchains(options.toolchain)
 
   filters = {}
   if options.toolchain:
     filters['TOOLS'] = options.toolchain
-    print 'Filter by toolchain: ' + str(options.toolchain)
+    Trace('Filter by toolchain: ' + str(options.toolchain))
   if not options.experimental:
     filters['EXPERIMENTAL'] = False
   if options.dest:
     filters['DEST'] = options.dest
-    print 'Filter by type: ' + str(options.dest)
+    Trace('Filter by type: ' + str(options.dest))
   if args:
     filters['NAME'] = args
-    print 'Filter by name: ' + str(args)
+    Trace('Filter by name: ' + str(args))
 
   try:
     project_tree = parse_dsc.LoadProjectTree(SDK_SRC_DIR, include=filters)
   except parse_dsc.ValidationError as e:
     buildbot_common.ErrorExit(str(e))
-  parse_dsc.PrintProjectTree(project_tree)
+
+  if verbose:
+    parse_dsc.PrintProjectTree(project_tree)
 
   UpdateHelpers(pepperdir, clobber=options.clobber)
   UpdateProjects(pepperdir, project_tree, options.toolchain,
                  clobber=options.clobber)
 
-  if options.verbose:
-    global verbose
-    verbose = True
-
   if options.build:
     if options.config:
       configs = [options.config]
diff --git a/native_client_sdk/src/build_tools/buildbot_common.py b/native_client_sdk/src/build_tools/buildbot_common.py
index dd10870..1095169 100644
--- a/native_client_sdk/src/build_tools/buildbot_common.py
+++ b/native_client_sdk/src/build_tools/buildbot_common.py
@@ -16,6 +16,10 @@ sys.path.append(os.path.join(SDK_SRC_DIR, 'tools'))
 import oshelpers
 import getos
 
+
+verbose = True
+
+
 def IsSDKBuilder():
   """Returns True if this script is running on an SDK builder.
 
@@ -48,6 +52,11 @@ def ErrorExit(msg):
   sys.exit(1)
 
 
+def Trace(msg):
+  if verbose:
+    sys.stderr.write(str(msg) + '\n')
+
+
 def GetWindowsEnvironment():
   sys.path.append(os.path.join(NACL_DIR, 'buildbot'))
   import buildbot_standard
@@ -93,8 +102,7 @@ def GetWindowsEnvironment():
 def BuildStep(name):
   """Annotate a buildbot build step."""
   sys.stdout.flush()
-  print '\n@@@BUILD_STEP %s@@@' % name
-  sys.stdout.flush()
+  sys.stderr.write('\n@@@BUILD_STEP %s@@@\n' % name)
 
 
 def Run(args, cwd=None, env=None, shell=False):
@@ -109,7 +117,7 @@ def Run(args, cwd=None, env=None, shell=False):
   if not env and getos.GetPlatform() == 'win':
     env = GetWindowsEnvironment()
 
-  print 'Running: ' + ' '.join(args)
+  Trace('Running: ' + ' '.join(args))
   sys.stdout.flush()
   sys.stderr.flush()
   try:
@@ -128,14 +136,14 @@ def CopyDir(src, dst, excludes=('.svn', '*/.svn')):
   args = ['-r', src, dst]
   for exc in excludes:
     args.append('--exclude=' + exc)
-  print 'cp -r %s %s' % (src, dst)
+  Trace('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)
+  Trace('cp %s %s' % (src, dst))
   if os.path.abspath(src) == os.path.abspath(dst):
     ErrorExit('ERROR: Copying file onto itself: ' + src)
   args = [src, dst]
@@ -144,25 +152,25 @@ def CopyFile(src, dst):
 
 def RemoveDir(dst):
   """Remove the provided path."""
-  print 'rm -fr ' + dst
+  Trace('rm -fr ' + dst)
   oshelpers.Remove(['-fr', dst])
 
 
 def MakeDir(dst):
   """Create the path including all parent directories as needed."""
-  print 'mkdir -p ' + dst
+  Trace('mkdir -p ' + dst)
   oshelpers.Mkdir(['-p', dst])
 
 
 def Move(src, dst):
   """Move the path src to dst."""
-  print 'mv -f %s %s' % (src, dst)
+  Trace('mv -f %s %s' % (src, dst))
   oshelpers.Move(['-f', src, dst])
 
 
 def RemoveFile(dst):
   """Remove the provided file."""
-  print 'rm ' + dst
+  Trace('rm ' + dst)
   oshelpers.Remove(['-f', dst])
 
 
@@ -197,5 +205,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
     sys.stdout.flush()
+    sys.stderr.write('@@@STEP_LINK@download@%s@@@\n' % url)
diff --git a/native_client_sdk/src/build_tools/generate_index.py b/native_client_sdk/src/build_tools/generate_index.py
index 2aed35c..4061165 100644
--- a/native_client_sdk/src/build_tools/generate_index.py
+++ b/native_client_sdk/src/build_tools/generate_index.py
@@ -23,7 +23,6 @@ class LandingPage(object):
       items = self.section_map[section_name]
       items = sorted(items, cmp=CmpByName)
       sec_map[section_name] = items
-      print 'Add section ' + section_name
 
     template_dict = { 'section_map': sec_map }
     return easy_template.RunTemplateString(template, template_dict)