if options.windows:
print('Building ninja using itself...')
- run([sys.executable, 'configure.py', '--with-ninja=%s' % binary] +
- conf_args)
+ run([sys.executable, 'configure.py'] + conf_args)
run(['./' + binary] + verbose)
# Copy the new executable over the bootstrap one.
to_print = FormatProgressStatus(progress_status_format_) + to_print;
printer_.Print(to_print,
- force_full_command ? LinePrinter::FULL : LinePrinter::SHORT);
+ force_full_command ? LinePrinter::FULL : LinePrinter::ELIDE);
}
Plan::Plan() : command_edges_(0), wanted_edges_(0) {}
#endif
}
- if (smart_terminal_ && type == SHORT) {
+ if (smart_terminal_ && type == ELIDE) {
#ifdef _WIN32
// Don't use the full width or console will move to next line.
size_t width = static_cast<size_t>(csbi.dwSize.X) - 1;
GetConsoleScreenBufferInfo(console_, &csbi);
COORD buf_size = { csbi.dwSize.X, 1 };
COORD zero_zero = { 0, 0 };
- SMALL_RECT target = { csbi.dwCursorPosition.X, csbi.dwCursorPosition.Y,
- (SHORT)(csbi.dwCursorPosition.X + csbi.dwSize.X - 1),
- csbi.dwCursorPosition.Y };
+ SMALL_RECT target = {
+ csbi.dwCursorPosition.X, csbi.dwCursorPosition.Y,
+ static_cast<SHORT>(csbi.dwCursorPosition.X + csbi.dwSize.X - 1),
+ csbi.dwCursorPosition.Y
+ };
CHAR_INFO* char_data = new CHAR_INFO[csbi.dwSize.X];
memset(char_data, 0, sizeof(CHAR_INFO) * csbi.dwSize.X);
for (int i = 0; i < csbi.dwSize.X; ++i) {
enum LineType {
FULL,
- SHORT
+ ELIDE
};
- /// Overprints the current line. If type is SHORT, elides to_print to fit on
+ /// Overprints the current line. If type is ELIDE, elides to_print to fit on
/// one line.
void Print(std::string to_print, LineType type);
/// Whether the caret is at the beginning of a blank line.
bool have_blank_line_;
+
+ void* console_;
};
#endif // NINJA_LINE_PRINTER_H_