diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2016-04-28 14:35:29 (GMT) |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2016-04-28 14:35:29 (GMT) |
| commit | 17a7d941fcb77b9e936dbc71d9a53ee4c96c3502 (patch) | |
| tree | 0fc7aa5e61bb4782cb323e666eb5c9ae8caa753e | |
| parent | ddaf63fe1b41dfd58c646b05fd16dbe374a81ef3 (diff) | |
| parent | 6c2c2eecbfd2e4ddeeacb0129944618a6ce3dc4f (diff) | |
| download | Ninja-17a7d941fcb77b9e936dbc71d9a53ee4c96c3502.zip Ninja-17a7d941fcb77b9e936dbc71d9a53ee4c96c3502.tar.gz Ninja-17a7d941fcb77b9e936dbc71d9a53ee4c96c3502.tar.bz2 | |
Merge pull request #1143 from colincross/status
Change default NINJA_STATUS to [%f/%t]
| -rw-r--r-- | doc/manual.asciidoc | 2 | ||||
| -rw-r--r-- | src/build.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/manual.asciidoc b/doc/manual.asciidoc index 9fc5fb9..d7ec932 100644 --- a/doc/manual.asciidoc +++ b/doc/manual.asciidoc @@ -208,7 +208,7 @@ specified by `-j` or its default) `%e`:: Elapsed time in seconds. _(Available since Ninja 1.2.)_ `%%`:: A plain `%` character. -The default progress status is `"[%s/%t] "` (note the trailing space +The default progress status is `"[%f/%t] "` (note the trailing space to separate from the build rule). Another example of possible progress status could be `"[%u/%r/%f] "`. diff --git a/src/build.cc b/src/build.cc index 3a17bdb..c4d5953 100644 --- a/src/build.cc +++ b/src/build.cc @@ -84,7 +84,7 @@ BuildStatus::BuildStatus(const BuildConfig& config) progress_status_format_ = getenv("NINJA_STATUS"); if (!progress_status_format_) - progress_status_format_ = "[%s/%t] "; + progress_status_format_ = "[%f/%t] "; } void BuildStatus::PlanHasTotalEdges(int total) { |