[Cmake-commits] CMake branch, next, updated. v2.8.1-1295-gbdbc646

[cmake-commits at cmake.org]

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  bdbc646c279d80351796041c023d62987650e841 (commit)
       via  d093abef7e1b965cd6bc8a347852905d6c2b0913 (commit)
      from  81d5a940ce84df361aabca7811e4404bc53854f6 (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=bdbc646c279d80351796041c023d62987650e841
commit bdbc646c279d80351796041c023d62987650e841
Merge: 81d5a94 d093abe
Author: David Cole <david.cole at kitware.com>
Date:   Thu Jun 3 13:46:24 2010 -0400

    Merge branch 'add-git-to-ExternalProject' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d093abef7e1b965cd6bc8a347852905d6c2b0913
commit d093abef7e1b965cd6bc8a347852905d6c2b0913
Author: David Cole <david.cole at kitware.com>
Date:   Thu Jun 3 13:43:39 2010 -0400

    Fix failing ExternalProject test on Borland dashboards.
    
    If there is a .bat or .cmd file used as a custom command
    then the Borland Makefiles generator (specifically) requires
    using the "call " syntax before the name of the .bat or .cmd
    file. This fix applies to all Makefile based generators where
    WindowsShell is true.

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index fce5a9c..004d19a 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -973,6 +973,24 @@ cmLocalUnixMakefileGenerator3
                                       this->ConfigurationName.c_str());
     if (cmd.size())
       {
+      // Use "call " before any invocations of .bat or .cmd files
+      // invoked as custom commands in the WindowsShell.
+      //
+      bool useCall = false;
+
+      if (this->WindowsShell)
+        {
+        std::string suffix;
+        if (cmd.size() > 4)
+          {
+          suffix = cmSystemTools::LowerCase(cmd.substr(cmd.size()-4));
+          if (suffix == ".bat" || suffix == ".cmd")
+            {
+            useCall = true;
+            }
+          }
+        }
+
       cmSystemTools::ReplaceString(cmd, "/./", "/");
       // Convert the command to a relative path only if the current
       // working directory will be the start-output directory.
@@ -1044,6 +1062,10 @@ cmLocalUnixMakefileGenerator3
             }
           }
         }
+      if (useCall && launcher.empty())
+        {
+        cmd = "call " + cmd;
+        }
       commands1.push_back(cmd);
       }
     }

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

Summary of changes:
 Source/cmLocalUnixMakefileGenerator3.cxx |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake