Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / tools / gn / standard_out.cc

diff --git a/src/tools/gn/standard_out.cc b/src/tools/gn/standard_out.cc
index 4e652f0..ba9a23a 100644 (file)
--- a/src/tools/gn/standard_out.cc
+++ b/src/tools/gn/standard_out.cc
@@ -6,6 +6,7 @@
 
 #include <vector>
 
+#include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_split.h"
 #include "build/build_config.h"
@@ -21,6 +22,9 @@ namespace {
 
 bool initialized = false;
 
+static const char kSwitchColor[] = "color";
+static const char kSwitchNoColor[] = "nocolor";
+
 #if defined(OS_WIN)
 HANDLE hstdout;
 WORD default_attributes;
@@ -32,13 +36,25 @@ void EnsureInitialized() {
     return;
   initialized = true;
 
+  const base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess();
+  if (cmdline->HasSwitch(kSwitchNoColor)) {
+    // Force color off.
+    is_console = false;
+    return;
+  }
+
 #if defined(OS_WIN)
+  // On Windows, we can't force the color on. If the output handle isn't a
+  // console, there's nothing we can do about it.
   hstdout = ::GetStdHandle(STD_OUTPUT_HANDLE);
   CONSOLE_SCREEN_BUFFER_INFO info;
   is_console = !!::GetConsoleScreenBufferInfo(hstdout, &info);
   default_attributes = info.wAttributes;
 #else
-  is_console = isatty(fileno(stdout));
+  if (cmdline->HasSwitch(kSwitchColor))
+    is_console = true;
+  else
+    is_console = isatty(fileno(stdout));
 #endif
 }
 
@@ -115,7 +131,7 @@ void OutputString(const std::string& output, TextDecoration dec) {
 
   WriteToStdOut(output.data());
 
-  if (dec != DECORATION_NONE)
+  if (is_console && dec != DECORATION_NONE)
     WriteToStdOut("\e[0m");
 }