[Cmake-commits] CMake branch, next, updated. v2.8.8-3094-gafae091

[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  afae0914662c91f25907861319a3a20ef4096d3e (commit)
       via  343ff7a72e7c08f3a63dde25bd1f06c8c3854f56 (commit)
      from  f6bf2b07712c8bd5c4a05d7ff24c485a1ab993ea (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=afae0914662c91f25907861319a3a20ef4096d3e
commit afae0914662c91f25907861319a3a20ef4096d3e
Merge: f6bf2b0 343ff7a
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sun Jun 10 09:31:24 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jun 10 09:31:24 2012 -0400

    Merge topic 'ninja-cldeps' into next
    
    343ff7a Ninja: fix line length


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=343ff7a72e7c08f3a63dde25bd1f06c8c3854f56
commit 343ff7a72e7c08f3a63dde25bd1f06c8c3854f56
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sun Jun 10 15:31:06 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Sun Jun 10 15:31:06 2012 +0200

    Ninja: fix line length

diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx
index 0b9a2fc..9aa94d3 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -192,7 +192,8 @@ void Win32Fatal(const char* function) {
 
 }  // anonymous namespace
 
-Subprocess::Subprocess() : child_(NULL) , overlapped_(), is_reading_(false), exit_code_(1) {
+Subprocess::Subprocess() : child_(NULL) , overlapped_(), is_reading_(false),
+                           exit_code_(1) {
 }
 
 Subprocess::~Subprocess() {
@@ -273,14 +274,17 @@ bool Subprocess::Start(SubprocessSet* set, const string& command) {
                       NULL, NULL,
                       &startup_info, &process_info)) {
     DWORD error = GetLastError();
-    if (error == ERROR_FILE_NOT_FOUND) { // file (program) not found error is treated as a normal build action failure
+    if (error == ERROR_FILE_NOT_FOUND) {
+      // file (program) not found error is treated
+      // as a normal build action failure
       if (child_pipe)
         CloseHandle(child_pipe);
       CloseHandle(pipe_);
       CloseHandle(nul);
       pipe_ = NULL;
       // child_ is already NULL;
-      buf_ = "CreateProcess failed: The system cannot find the file specified.\n";
+      buf_ =
+       "CreateProcess failed: The system cannot find the file specified.\n";
       return true;
     } else {
       Win32Fatal("CreateProcess");    // pass all other errors to Win32Fatal
@@ -436,7 +440,8 @@ void SubprocessSet::Clear() {
   for (vector<Subprocess*>::iterator i = running_.begin();
        i != running_.end(); ++i) {
     if ((*i)->child_)
-      if (!GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, GetProcessId((*i)->child_)))
+      if (!GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT,
+                                    GetProcessId((*i)->child_)))
         Win32Fatal("GenerateConsoleCtrlEvent");
   }
   for (vector<Subprocess*>::iterator i = running_.begin();
@@ -530,7 +535,12 @@ static string getArg(string& cmdline) {
 }
 
 static void parseCommandLine(LPTSTR wincmdline,
-        string& srcfile, string& dfile, string& objfile, string& prefix, string& clpath, string& rest) {
+                             string& srcfile,
+                             string& dfile,
+                             string& objfile,
+                             string& prefix,
+                             string& clpath,
+                             string& rest) {
   string cmdline(wincmdline);
   /* self */ getArg(cmdline);
   srcfile = getArg(cmdline);
@@ -595,7 +605,8 @@ int main() {
   // the same command line verbatim.
 
   string srcfile, dfile, objfile, prefix, clpath, rest;
-  parseCommandLine(GetCommandLine(), srcfile, dfile, objfile, prefix, clpath, rest);
+  parseCommandLine(GetCommandLine(), srcfile, dfile, objfile,
+                                     prefix, clpath, rest);
 
 #if 0
   fprintf(stderr, "\n\ncmcldebug:\n");
@@ -630,7 +641,8 @@ int main() {
   std::string sysHeadersLower = "program files (x86)\\microsoft ";
   while (getline(ss, line)) {
     if (startsWith(line, prefix)) {
-       if (!contains(line, sysHeadersCamel) && !contains(line, sysHeadersLower)) {
+       if (!contains(line, sysHeadersCamel)
+           && !contains(line, sysHeadersLower)) {
         string inc = trimLeadingSpace(line.substr(prefix.size()).c_str());
         if (inc[inc.size() - 1] == '\r') // blech, stupid \r\n
           inc = inc.substr(0, inc.size() - 1);

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

Summary of changes:
 Source/cmcldeps.cxx |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake