From ddaf63fe1b41dfd58c646b05fd16dbe374a81ef3 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Wed, 27 Apr 2016 16:27:45 -0400 Subject: fix path after moving github pages to ninja-build repo --- RELEASING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASING b/RELEASING index 20da5d9..880a55d 100644 --- a/RELEASING +++ b/RELEASING @@ -25,7 +25,7 @@ Make announcement on mailing list: Update website: 1. Make sure your ninja checkout is on the v1.5.0 tag 2. Clone https://github.com/ninja-build/ninja-build.github.io -3. In that repo, `cd ninja && ./update-docs.sh` +3. In that repo, `./update-docs.sh` 4. Update index.html with newest version and link to release notes 5. git commit -m 'run update-docs.sh, 1.5.0 release' 6. git push origin master -- cgit v0.12 From 6c2c2eecbfd2e4ddeeacb0129944618a6ce3dc4f Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 27 Apr 2016 16:54:49 -0700 Subject: Change default NINJA_STATUS to [%f/%t] PR #999 changed the status line to be printed when edges finish on dumb teerminals, but the default status message includes the number of started edges, resulting in sequential status lines with identical edge counts. Change the default status to show the number of finished edges, which will keep the count incrementing on every line. This will slightly change the output on smart terminals. Previously a build that was just starting would show a count equal to the number of concurrent jobs, and a build waiting for the final jobs to finish would show a count equal to the total number of edges. Now a starting build will show 0, and build waiting for the final jobs will show a count less than the total number of edges by the number of remaining jobs. Fixes: #1142 --- doc/manual.asciidoc | 2 +- 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) { -- cgit v0.12 From 24694d95f5ddc7fe86bdcf4da9d34aef0fd6033d Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Thu, 28 Apr 2016 10:40:39 -0400 Subject: Update %p to use finished edges after #1143. --- src/build.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build.cc b/src/build.cc index c4d5953..8c0fbf8 100644 --- a/src/build.cc +++ b/src/build.cc @@ -222,7 +222,7 @@ string BuildStatus::FormatProgressStatus( // Percentage case 'p': - percent = (100 * started_edges_) / total_edges_; + percent = (100 * finished_edges_) / total_edges_; snprintf(buf, sizeof(buf), "%3i%%", percent); out += buf; break; -- cgit v0.12 From 644f6b175741469d1a42d218494365a1a401f5d5 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Thu, 28 Apr 2016 10:55:55 -0400 Subject: mark this 1.7.1.git --- src/version.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.cc b/src/version.cc index 6613514..f64a94d 100644 --- a/src/version.cc +++ b/src/version.cc @@ -18,7 +18,7 @@ #include "util.h" -const char* kNinjaVersion = "1.7.0.git"; +const char* kNinjaVersion = "1.7.1.git"; void ParseVersion(const string& version, int* major, int* minor) { size_t end = version.find('.'); -- cgit v0.12