summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergey Nenakhov <nenakhov.sergey@gmail.com>2011-04-23 21:19:16 (GMT)
committerEvan Martin <martine@danga.com>2011-04-23 21:19:16 (GMT)
commitad78e41b85a936e5d2aa3630db3f4815af257254 (patch)
tree814048eeb0b645d432978bf8f03c500801b07024
parent04ef600a46b1d0fe3a22ff17dafe9fd2fc0efb7f (diff)
downloadNinja-ad78e41b85a936e5d2aa3630db3f4815af257254.zip
Ninja-ad78e41b85a936e5d2aa3630db3f4815af257254.tar.gz
Ninja-ad78e41b85a936e5d2aa3630db3f4815af257254.tar.bz2
[windows] disable smart terminal support
-rw-r--r--src/build.cc12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/build.cc b/src/build.cc
index ba7f1be..98e0bfd 100644
--- a/src/build.cc
+++ b/src/build.cc
@@ -15,9 +15,11 @@
#include "build.h"
#include <stdio.h>
+#ifndef WIN32
#include <sys/ioctl.h>
#include <sys/time.h>
#include <sys/termios.h>
+#endif
#include "build_log.h"
#include "graph.h"
@@ -47,8 +49,12 @@ struct BuildStatus {
BuildStatus::BuildStatus()
: last_update_(time(NULL)), finished_edges_(0), total_edges_(0),
verbosity_(BuildConfig::NORMAL) {
+#ifndef WIN32
const char* term = getenv("TERM");
smart_terminal_ = isatty(1) && term && string(term) != "dumb";
+#else
+ smart_terminal_ = false;
+#endif
}
void BuildStatus::PlanHasTotalEdges(int total) {
@@ -104,7 +110,7 @@ void BuildStatus::PrintStatus(Edge* edge) {
string to_print = edge->GetDescription();
if (to_print.empty() || verbosity_ == BuildConfig::VERBOSE)
to_print = edge->EvaluateCommand();
-
+#ifndef WIN32
if (smart_terminal_) {
// Limit output to width of the terminal if provided so we don't cause
// line-wrapping.
@@ -121,7 +127,9 @@ void BuildStatus::PrintStatus(Edge* edge) {
printf("\r[%d/%d] %s\e[K", finished_edges_, total_edges_,
to_print.c_str());
fflush(stdout);
- } else {
+ } else
+#endif
+ {
printf("%s\n", to_print.c_str());
}
}