[Cmake-commits] CMake branch, next, updated. v2.8.8-3049-gcbd602c

[Brad King]

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  cbd602cdf53b52fd54bea4440ed63594843774f3 (commit)
       via  89be6114d3c4144ab6230427e9b4f840f780d422 (commit)
      from  b14b971803ca308860358d84e243455c5c763579 (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=cbd602cdf53b52fd54bea4440ed63594843774f3
commit cbd602cdf53b52fd54bea4440ed63594843774f3
Merge: b14b971 89be611
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 6 15:27:37 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 6 15:27:37 2012 -0400

    Merge topic 'no-std-stringstream' into next
    
    89be611 Merge branch 'ninja-rspfile' into no-std-stringstream


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89be6114d3c4144ab6230427e9b4f840f780d422
commit 89be6114d3c4144ab6230427e9b4f840f780d422
Merge: a6a3364 e3a1f72
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 6 15:26:48 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 6 15:26:48 2012 -0400

    Merge branch 'ninja-rspfile' into no-std-stringstream
    
    Conflicts:
    	Source/cmGlobalNinjaGenerator.cxx
    	Source/cmLocalNinjaGenerator.cxx
    	Source/cmNinjaNormalTargetGenerator.cxx

diff --cc Source/cmGlobalNinjaGenerator.cxx
index 40348e6,c4b1cc9..ae996ff
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@@ -123,7 -127,7 +127,7 @@@ void cmGlobalNinjaGenerator::WriteBuild
  
    cmGlobalNinjaGenerator::WriteComment(os, comment);
  
-   cmOStringStream builds;
 -  std::stringstream arguments;
++  cmOStringStream arguments;
  
    // TODO: Better formatting for when there are multiple input/output files.
  
diff --cc Source/cmLocalNinjaGenerator.cxx
index f6a6bc2,a0141cf..d5baaee
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@@ -275,16 -275,16 +275,16 @@@ std::string cmLocalNinjaGenerator::Buil
      return ":";
  #endif
  
-   // TODO: This will work only on Unix platforms. I don't
-   // want to use a link.txt file because I will lose the benefit of the
-   // $in variables. A discussion about dealing with multiple commands in
-   // a rule is started here:
-   // groups.google.com/group/ninja-build/browse_thread/thread/d515f23a78986008
 -  std::ostringstream cmd;
 +  cmOStringStream cmd;
    for (std::vector<std::string>::const_iterator li = cmdLines.begin();
         li != cmdLines.end(); ++li) {
-     if (li != cmdLines.begin())
+     if (li != cmdLines.begin()) {
        cmd << " && ";
+ #ifdef _WIN32
+     } else if (cmdLines.size() > 1) {
+       cmd << "cmd.exe /c ";
+ #endif
+     }
      cmd << *li;
    }
    return cmd.str();
diff --cc Source/cmNinjaNormalTargetGenerator.cxx
index 1751091,ddf96eb..b38619a
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@@ -214,11 -239,11 +239,11 @@@ cmNinjaNormalTargetGenerato
      std::string linkCmd =
        this->GetLocalGenerator()->BuildCommandLine(linkCmds);
  
-     // Write the linker rule.
+     // Write the linker rule with response file if needed.
 -    std::ostringstream comment;
 +    cmOStringStream comment;
      comment << "Rule for linking " << this->TargetLinkLanguage << " "
              << this->GetVisibleTypeName() << ".";
 -    std::ostringstream description;
 +    cmOStringStream description;
      description << "Linking " << this->TargetLinkLanguage << " "
                  << this->GetVisibleTypeName() << " $out";
      this->GetGlobalGenerator()->AddRule(ruleName,

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

Summary of changes:


hooks/post-receive
-- 
CMake