diff options
author | Klaus Aehlig <aehlig@google.com> | 2018-08-06 02:18:41 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-08-06 02:20:24 -0700 |
commit | 9be5a485f5ee0ab2c83fed9030f6d6c211305d01 (patch) | |
tree | 0c69cef39c8dd4f53437637f721fc4515380cf8d /src/main/java/com/google | |
parent | 80eb1935e9d8de5a566c36015f5457f8dca13a65 (diff) |
Console output: switch to file line ending
As nobody uses bazel on a traditional teletyper terminal, we
can as well use the line ending of native files instead of
terminal/network line endings. While the console output is not
meant to be handled by anything but a terminal, this still seems
to be done.
Change-Id: Ied745eeedaec70572ef4b3a3c716a0cf57dfdfd1
PiperOrigin-RevId: 207511649
Diffstat (limited to 'src/main/java/com/google')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java | 4 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/util/io/LineCountingAnsiTerminalWriter.java | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java b/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java index 8285284711..f68b3853d2 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java @@ -866,9 +866,9 @@ public class ExperimentalEventHandler implements EventHandler { numLinesProgressBar = 0; } + /** Terminate the line in the way appropriate for the operating system. */ private void crlf() throws IOException { - terminal.cr(); - terminal.writeString("\n"); + terminal.writeString(System.lineSeparator()); } private synchronized void addProgressBar() throws IOException { diff --git a/src/main/java/com/google/devtools/build/lib/util/io/LineCountingAnsiTerminalWriter.java b/src/main/java/com/google/devtools/build/lib/util/io/LineCountingAnsiTerminalWriter.java index ff3d8c4e98..862472a9d0 100644 --- a/src/main/java/com/google/devtools/build/lib/util/io/LineCountingAnsiTerminalWriter.java +++ b/src/main/java/com/google/devtools/build/lib/util/io/LineCountingAnsiTerminalWriter.java @@ -37,8 +37,7 @@ public class LineCountingAnsiTerminalWriter implements AnsiTerminalWriter { @Override public AnsiTerminalWriter newline() throws IOException { - terminal.cr(); - terminal.writeString("\n"); + terminal.writeString(System.lineSeparator()); lineCount++; return this; } |