[Cmake-commits] CMake branch, next, updated. v2.8.8-2846-g8fc1fd5

[Peter Kuemmel]

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  8fc1fd50fa0035a34359b0af9aa7385c2f149859 (commit)
       via  92cee7626c5066a4af4cf66f85b0cd2c06bd9439 (commit)
       via  3bd41f2eb564d891c95e3ead5e72656b7daa3ff1 (commit)
       via  ad5c9d06c48b566fa6b1bb885142003c8ac9de60 (commit)
      from  6280c71f28bea97d21e4b2910b2089460d7fb5e0 (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=8fc1fd50fa0035a34359b0af9aa7385c2f149859
commit 8fc1fd50fa0035a34359b0af9aa7385c2f149859
Merge: 6280c71 92cee76
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Wed May 9 13:09:28 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 9 13:09:28 2012 -0400

    Merge topic 'ninja_convenience_targets' into next
    
    92cee76 Ninja: Add a convenient 'help' target.
    3bd41f2 Ninja: Add a convenient 'clean' target.
    ad5c9d0 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=92cee7626c5066a4af4cf66f85b0cd2c06bd9439
commit 92cee7626c5066a4af4cf66f85b0cd2c06bd9439
Author:     Nicolas Despres <nicolas.despres at gmail.com>
AuthorDate: Thu Apr 19 17:07:35 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Wed May 9 19:08:12 2012 +0200

    Ninja: Add a convenient 'help' target.

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index ee3842d..67f809a 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -755,6 +755,7 @@ void cmGlobalNinjaGenerator::WriteBuiltinTargets(std::ostream& os)
   this->WriteTargetAll(os);
   this->WriteTargetRebuildManifest(os);
   this->WriteTargetClean(os);
+  this->WriteTargetHelp(os);
 }
 
 void cmGlobalNinjaGenerator::WriteTargetAll(std::ostream& os)
@@ -841,3 +842,23 @@ void cmGlobalNinjaGenerator::WriteTargetClean(std::ostream& os)
              /*orderOnlyDeps=*/ cmNinjaDeps(),
              /*variables=*/ cmNinjaVars());
 }
+
+void cmGlobalNinjaGenerator::WriteTargetHelp(std::ostream& os)
+{
+  WriteRule(*this->RulesFileStream,
+            "HELP",
+            "ninja -t targets",
+            "All primary targets available:",
+            "Rule for printing all primary targets available.",
+            /*depfile=*/ "",
+            /*restat=*/ false,
+            /*generator=*/ false);
+  WriteBuild(os,
+             "Print all primary targets available.",
+             "HELP",
+             /*outputs=*/ cmNinjaDeps(1, "help"),
+             /*explicitDeps=*/ cmNinjaDeps(),
+             /*implicitDeps=*/ cmNinjaDeps(),
+             /*orderOnlyDeps=*/ cmNinjaDeps(),
+             /*variables=*/ cmNinjaVars());
+}
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 32edfaa..e652972 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -274,6 +274,7 @@ private:
   void WriteTargetAll(std::ostream& os);
   void WriteTargetRebuildManifest(std::ostream& os);
   void WriteTargetClean(std::ostream& os);
+  void WriteTargetHelp(std::ostream& os);
 
   /// Called when we have seen the given custom command.  Returns true
   /// if we has seen it before.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3bd41f2eb564d891c95e3ead5e72656b7daa3ff1
commit 3bd41f2eb564d891c95e3ead5e72656b7daa3ff1
Author:     Nicolas Despres <nicolas.despres at gmail.com>
AuthorDate: Thu Apr 19 16:47:48 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Wed May 9 19:08:12 2012 +0200

    Ninja: Add a convenient 'clean' target.
    
    It has been asked on the mailing list:
    http://public.kitware.com/pipermail/cmake-developers/2012-April/003805.html

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 9cbd502..ee3842d 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -754,6 +754,7 @@ void cmGlobalNinjaGenerator::WriteBuiltinTargets(std::ostream& os)
 
   this->WriteTargetAll(os);
   this->WriteTargetRebuildManifest(os);
+  this->WriteTargetClean(os);
 }
 
 void cmGlobalNinjaGenerator::WriteTargetAll(std::ostream& os)
@@ -820,3 +821,23 @@ void cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream& os)
                   implicitDeps,
                   cmNinjaDeps());
 }
+
+void cmGlobalNinjaGenerator::WriteTargetClean(std::ostream& os)
+{
+  WriteRule(*this->RulesFileStream,
+            "CLEAN",
+            "ninja -t clean",
+            "Cleaning all built files...",
+            "Rule for cleaning all built files.",
+            /*depfile=*/ "",
+            /*restat=*/ false,
+            /*generator=*/ false);
+  WriteBuild(os,
+             "Clean all the built files.",
+             "CLEAN",
+             /*outputs=*/ cmNinjaDeps(1, "clean"),
+             /*explicitDeps=*/ cmNinjaDeps(),
+             /*implicitDeps=*/ cmNinjaDeps(),
+             /*orderOnlyDeps=*/ cmNinjaDeps(),
+             /*variables=*/ cmNinjaVars());
+}
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 3217581..32edfaa 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -273,6 +273,7 @@ private:
   void WriteBuiltinTargets(std::ostream& os);
   void WriteTargetAll(std::ostream& os);
   void WriteTargetRebuildManifest(std::ostream& os);
+  void WriteTargetClean(std::ostream& os);
 
   /// Called when we have seen the given custom command.  Returns true
   /// if we has seen it before.

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake         |    2 +-
 Source/cmGlobalNinjaGenerator.cxx |   42 +++++++++++++++++++++++++++++++++++++
 Source/cmGlobalNinjaGenerator.h   |    2 +
 3 files changed, 45 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake