[Cmake-commits] CMake branch, next, updated. v3.1.2-1116-g82caa82
Brad King
brad.king at kitware.com
Sat Feb 7 06:52:05 EST 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 82caa821d99066ee5eba5dcdbd0ee937b6890919 (commit)
via 63668954e002aa41ff0287aae22caeeacdc0c356 (commit)
via ae775fe8041183030c69db1714c898b6e74f1284 (commit)
via 7bb50e4a31ad5a8a58fe60885014d431a887b27f (commit)
from 57d15db5af7074d421ee5f86eafcf852c93e2d6a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82caa821d99066ee5eba5dcdbd0ee937b6890919
commit 82caa821d99066ee5eba5dcdbd0ee937b6890919
Merge: 57d15db 6366895
Author: Brad King <brad.king at kitware.com>
AuthorDate: Sat Feb 7 06:52:03 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 7 06:52:03 2015 -0500
Merge topic 'makefile-progress-improvements' into next
63668954 Help: Add notes for topic 'makefile-progress-improvements'
ae775fe8 Makefile: Change link step message color to bold green
7bb50e4a Makefile: Add progress to link step messages
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=63668954e002aa41ff0287aae22caeeacdc0c356
commit 63668954e002aa41ff0287aae22caeeacdc0c356
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 6 19:16:45 2015 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 6 19:16:45 2015 -0500
Help: Add notes for topic 'makefile-progress-improvements'
diff --git a/Help/release/dev/makefile-progress-improvements.rst b/Help/release/dev/makefile-progress-improvements.rst
new file mode 100644
index 0000000..9cc9706
--- /dev/null
+++ b/Help/release/dev/makefile-progress-improvements.rst
@@ -0,0 +1,7 @@
+makefile-progress-improvements
+------------------------------
+
+* With Makefile generators, the build-time progress output has been improved.
+ It no longer mixes progress and build rule messages during parallel builds.
+ The link rule messages now have progress and are displayed as bold green
+ instead of bold red (since red is often associated with an error message).
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae775fe8041183030c69db1714c898b6e74f1284
commit ae775fe8041183030c69db1714c898b6e74f1284
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 6 19:07:56 2015 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 6 19:07:56 2015 -0500
Makefile: Change link step message color to bold green
Avoid displaying red messages when no error has occurred.
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index c60a9c7..c4f7243 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1367,7 +1367,7 @@ cmLocalUnixMakefileGenerator3::AppendEcho(std::vector<std::string>& commands,
color_name = "--green ";
break;
case EchoLink:
- color_name = "--red --bold ";
+ color_name = "--green --bold ";
break;
case EchoGenerate:
color_name = "--blue --bold ";
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7bb50e4a31ad5a8a58fe60885014d431a887b27f
commit 7bb50e4a31ad5a8a58fe60885014d431a887b27f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 6 19:07:24 2015 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 6 19:07:24 2015 -0500
Makefile: Add progress to link step messages
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index d4036d2..ab58cbd 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -171,15 +171,19 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
return;
}
+ this->NumberOfProgressActions++;
if(!this->NoRuleMessages)
{
+ cmLocalUnixMakefileGenerator3::EchoProgress progress;
+ this->MakeEchoProgress(progress);
// Add the link message.
std::string buildEcho = "Linking ";
buildEcho += linkLanguage;
buildEcho += " executable ";
buildEcho += targetOutPath;
this->LocalGenerator->AppendEcho(commands, buildEcho.c_str(),
- cmLocalUnixMakefileGenerator3::EchoLink);
+ cmLocalUnixMakefileGenerator3::EchoLink,
+ &progress);
}
// Build a list of compiler flags and linker flags.
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index cdda36c..84761cc 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -341,8 +341,11 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
this->Convert(targetFullPathImport,cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::SHELL);
+ this->NumberOfProgressActions++;
if(!this->NoRuleMessages)
{
+ cmLocalUnixMakefileGenerator3::EchoProgress progress;
+ this->MakeEchoProgress(progress);
// Add the link message.
std::string buildEcho = "Linking ";
buildEcho += linkLanguage;
@@ -365,7 +368,8 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
}
buildEcho += targetOutPath.c_str();
this->LocalGenerator->AppendEcho(commands, buildEcho.c_str(),
- cmLocalUnixMakefileGenerator3::EchoLink);
+ cmLocalUnixMakefileGenerator3::EchoLink,
+ &progress);
}
const char* forbiddenFlagVar = 0;
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/makefile-progress-improvements.rst | 7 +++++++
Source/cmLocalUnixMakefileGenerator3.cxx | 2 +-
Source/cmMakefileExecutableTargetGenerator.cxx | 6 +++++-
Source/cmMakefileLibraryTargetGenerator.cxx | 6 +++++-
4 files changed, 18 insertions(+), 3 deletions(-)
create mode 100644 Help/release/dev/makefile-progress-improvements.rst
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list