Add initial support for color output in the build system

lib/naclports/source_package.py

Index: lib/naclports/source_package.py
diff --git a/lib/naclports/source_package.py b/lib/naclports/source_package.py
index 5dbbc31178ece9d206619e68fb5fecd6eafd23a0..76c0ebedd2e2202f36988a40ecf6073ef84b6d20 100644
--- a/lib/naclports/source_package.py
+++ b/lib/naclports/source_package.py
@@ -36,11 +36,13 @@ def RedirectStdoutStderr(filename):
   with open(filename, 'a') as stream:
     sys.stdout = stream
     sys.stderr = stream
+    util.CheckForColorSupport()

[binji, 2015/01/09 18:24:59]

hmm... maybe CheckForColorSupport should be renamed so it is clear that it is
checking sys.stdout. Otherwise this call doesn't make as much sense.

[Sam Clegg, 2015/01/09 22:14:54]

Done.

     try:
       yield
     finally:
       sys.stdout = sys.__stdout__
       sys.stderr = sys.__stdout__
+      util.CheckForColorSupport()
 
 
 def FormatTimeDelta(delta):
@@ -254,7 +256,7 @@ class SourcePackage(package.Package):
       self.Build(build_deps, force)
 
     if self.IsAnyVersionInstalled():
-      Log('Uninstalling existing %s' % self.InfoString())
+      self.LogStatus('Uninstalling existing')
       self.GetInstalledPackage().DoUninstall()
 
     binary_package.BinaryPackage(package_file).Install()
@@ -269,17 +271,13 @@ class SourcePackage(package.Package):
       self.InstallDeps(force)
 
     if not force and self.IsBuilt():
-      Log('Already built %s' % self.InfoString())
+      self.LogStatus('Already built')
       return
 
     log_root = os.path.join(paths.OUT_DIR, 'logs')
     util.Makedirs(log_root)
 
-    if util.verbose:
-      prefix = '*** '
-    else:
-      prefix = ''
-    Log('%sBuilding %s' % (prefix, self.InfoString()))
+    self.LogStatus('Building')
 
     if util.verbose:
       log_filename = None
@@ -303,7 +301,7 @@ class SourcePackage(package.Package):
           util.verbose = old_verbose
 
     duration = FormatTimeDelta(time.time() - start)
-    Log('Build complete %s [took %s]' % (self.InfoString(), duration))
+    util.LogHeading('Build complete', ' [took %s]' % duration)
 
   def RunBuildSh(self):
     build_port = os.path.join(paths.TOOLS_DIR, 'build_port.sh')
@@ -381,7 +379,7 @@ class SourcePackage(package.Package):
       raise Error("Upstream archive or patch has changed.\n" +
                   "Please remove existing checkout and try again: '%s'" % dest)
 
-    self.Banner('Extracting')
+    util.LogHeading('Extracting')
     util.Makedirs(paths.OUT_DIR)
     tmp_output_path = tempfile.mkdtemp(dir=paths.OUT_DIR)
     try:
@@ -410,11 +408,6 @@ class SourcePackage(package.Package):
   def Log(self, message):
     Log('%s: %s' % (message, self.InfoString()))
 
-  def Banner(self, message):
-    Log("#####################################################################")
-    self.Log(message)
-    Log("#####################################################################")
-
   def GetStampDir(self):
     return os.path.join(paths.STAMP_DIR, self.NAME)
 
@@ -435,7 +428,7 @@ class SourcePackage(package.Package):
       self.RunCmd(cmd)
       return
 
-    self.Banner('Patching')
+    util.LogHeading('Patching')
     Log('Init git repo: %s' % src_dir)
     try:
       InitGitRepo(src_dir)
@@ -571,7 +564,7 @@ class SourcePackage(package.Package):
       raise Error('Upstream archive or patch has changed.\n' +
                   "Please remove existing checkout and try again: '%s'" % dest)
 
-    self.Banner('Cloning')
+    util.LogHeading('Cloning')
     # Ensure local mirror is up-to-date
     git_mirror, git_commit = self.GitCloneToMirror()
     # Clone from the local mirror.