[Cmake-commits] CMake branch, next, updated. v2.8.8-3348-g03f870a

[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  03f870a7660880db3792ea4a9b3c62a8a5cb802c (commit)
       via  0c42faf63acadf320ea6371d42d03386e1c20176 (commit)
       via  ba41a238f708da78d0f053bfba1e7d9c70369a16 (commit)
       via  370c422def60c84dc54da9c92cacf9b6ff7522ac (commit)
       via  7ecbf9daacaa9d26476984b957bc7e6f4d6b030d (commit)
      from  01d972abfce9c8d4fd73993101cc1d38c2bc6451 (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=03f870a7660880db3792ea4a9b3c62a8a5cb802c
commit 03f870a7660880db3792ea4a9b3c62a8a5cb802c
Merge: 01d972a 0c42faf
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sun Jul 1 18:13:45 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jul 1 18:13:45 2012 -0400

    Merge topic 'ninja-cmdLineLimit' into next
    
    0c42faf Ninja: also consider variables when checking command line length
    ba41a23 CMake Nightly Date Stamp
    370c422 CMake Nightly Date Stamp
    7ecbf9d CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0c42faf63acadf320ea6371d42d03386e1c20176
commit 0c42faf63acadf320ea6371d42d03386e1c20176
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Mon Jul 2 00:01:41 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Mon Jul 2 00:01:41 2012 +0200

    Ninja: also consider variables when checking command line length

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index c3989c0..6e8ce87 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -160,34 +160,35 @@ void cmGlobalNinjaGenerator::WriteBuild(std::ostream& os,
 
   arguments << "\n";
 
-
-  cmOStringStream builds;
+  cmOStringStream build;
 
   // Write outputs files.
-  builds << "build";
+  build << "build";
   for(cmNinjaDeps::const_iterator i = outputs.begin();
-      i != outputs.end();
-      ++i)
-    builds << " " << EncodeIdent(EncodePath(*i), os);
-  builds << ":";
-
+      i != outputs.end(); ++i)
+    build << " " << EncodeIdent(EncodePath(*i), os);
+  build << ":";
 
   // Write the rule.
-  builds << " " << rule;
+  build << " " << rule;
+
+  // Write the variables bound to this build statement.
+  cmOStringStream variable_assignments;
+  for(cmNinjaVars::const_iterator i = variables.begin();
+      i != variables.end(); ++i)
+    cmGlobalNinjaGenerator::WriteVariable(variable_assignments,
+                                          i->first, i->second, "", 1);
 
   // check if a response file rule should be used
+  std::string buildstr = build.str();
+  const std::string assignments = variable_assignments.str();
   const std::string args = arguments.str();
-  if (cmdLineLimit > 0 &&
-       (args.size() + + builds.str().size()) > (size_t)cmdLineLimit)
-    builds << "_RSPFILE";
-
-  os << builds.str() << args;
+  if (cmdLineLimit > 0
+      && args.size() + buildstr.size() + assignments.size()
+         > (size_t) cmdLineLimit)
+    buildstr += "_RSPFILE";
 
-  // Write the variables bound to this build statement.
-  for(cmNinjaVars::const_iterator i = variables.begin();
-      i != variables.end();
-      ++i)
-    cmGlobalNinjaGenerator::WriteVariable(os, i->first, i->second, "", 1);
+  os << buildstr << args << assignments;
 }
 
 void cmGlobalNinjaGenerator::WritePhonyBuild(std::ostream& os,
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 9a496f2..ea9c406 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -272,7 +272,7 @@ std::string cmLocalNinjaGenerator::BuildCommandLine(
   // don't use POST_BUILD.
   if (cmdLines.empty())
 #ifdef _WIN32
-    return "cd.";
+    return "cd .";
 #else
     return ":";
 #endif

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

Summary of changes:
 Source/CMakeVersion.cmake         |    2 +-
 Source/cmGlobalNinjaGenerator.cxx |   39 +++++++++++++++++++------------------
 Source/cmLocalNinjaGenerator.cxx  |    2 +-
 3 files changed, 22 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
CMake