1.1 --- a/ambuild2/util.py	Sun Oct 20 15:52:24 2013 -0700
     1.2 +++ b/ambuild2/util.py	Sun Oct 20 18:42:27 2013 -0700
     1.3 @@ -149,8 +149,6 @@
     1.4    stdout, stderr = p.communicate()
     1.5    out = stdout.decode('utf8')
     1.6    err = stderr.decode('utf8')
     1.7 -
     1.8 -  out = (' '.join([i for i in argv])) + '\n' + out
     1.9    return p, out, err
    1.10  
    1.11  def typeof(x):
    1.12 @@ -224,9 +222,7 @@
    1.13  if hasattr(os, 'symlink'):
    1.14    def symlink(target, link):
    1.15      os.symlink(target, link)
    1.16 -    stdout = 'ln -s "{0}" "{1}"'.format(target, link)
    1.17 -    stderr = ''
    1.18 -    return 0, stdout, stderr
    1.19 +    return 0, '', ''
    1.20  elif IsWindows():
    1.21    def symlink(target, link):
    1.22      argv = [
    1.23 @@ -236,3 +232,37 @@
    1.24      ]
    1.25      p, out, err = Execute(argv, shell=True)
    1.26      return p.returncode, out, err
    1.27 +
    1.28 +if IsUnixy():
    1.29 +  ConsoleGreen = '\033[92m'
    1.30 +  ConsoleRed = '\033[91m'
    1.31 +  ConsoleNormal = '\033[0m'
    1.32 +  ConsoleBlue = '\033[94m'
    1.33 +  ConsoleHeader = '\033[95m'
    1.34 +else:
    1.35 +  ConsoleGreen = ''
    1.36 +  ConsoleRed = ''
    1.37 +  ConsoleNormal = ''
    1.38 +  ConsoleBlue = ''
    1.39 +  ConsoleHeader = ''
    1.40 +
    1.41 +def IsColor(text):
    1.42 +  return text.startswith('\033[')
    1.43 +
    1.44 +sConsoleColorsEnabled = True
    1.45 +def DisableConsoleColors():
    1.46 +  global sConsoleColorsEnabled
    1.47 +  sConsoleColorsEnabled = False
    1.48 +
    1.49 +def con_print(fp, args):
    1.50 +  for arg in args:
    1.51 +    if not sConsoleColorsEnabled and IsColor(arg):
    1.52 +      continue
    1.53 +    fp.write(arg)
    1.54 +  fp.write('\n')
    1.55 +
    1.56 +def con_out(*args):
    1.57 +  con_print(sys.stdout, args)
    1.58 +
    1.59 +def con_err(*args):
    1.60 +  con_print(sys.stderr, args)