[Cmake-commits] CMake branch, next, updated. v3.0.0-rc5-3218-gc060f0b

[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  c060f0be669674dabda945e28d860ad4dd28876d (commit)
       via  2903d609b1629f0a250ff5ba4ac1018498b00495 (commit)
       via  ed52685dd7ea5c54e7a5e6caa789293d76f10b15 (commit)
      from  f7322c49b2655fac6c9f84e13b691c900e8f0bfd (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=c060f0be669674dabda945e28d860ad4dd28876d
commit c060f0be669674dabda945e28d860ad4dd28876d
Merge: f7322c4 2903d60
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 19 10:57:31 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 19 10:57:31 2014 -0400

    Merge topic 'update-kwsys' into next
    
    2903d609 Merge branch 'upstream-kwsys' into update-kwsys
    ed52685d KWSys 2014-05-19 (c282e64f)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2903d609b1629f0a250ff5ba4ac1018498b00495
commit 2903d609b1629f0a250ff5ba4ac1018498b00495
Merge: d5f8abc ed52685
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 19 10:58:14 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon May 19 10:58:14 2014 -0400

    Merge branch 'upstream-kwsys' into update-kwsys


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed52685dd7ea5c54e7a5e6caa789293d76f10b15
commit ed52685dd7ea5c54e7a5e6caa789293d76f10b15
Author:     KWSys Robot <kwrobot at kitware.com>
AuthorDate: Mon May 19 10:53:51 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon May 19 10:58:10 2014 -0400

    KWSys 2014-05-19 (c282e64f)
    
    Extract upstream KWSys using the following shell commands.
    
    $ git archive --prefix=upstream-kwsys/ c282e64f | tar x
    $ git shortlog --no-merges --abbrev=8 --format='%h %s' 6074f33f..c282e64f
    Brad King (2):
          2e00d252 SystemTools: Port cygwin path conversion to modern API
          c282e64f Process: Workaround child kill trouble on Cygwin
    
    Change-Id: I39a3ca47fbb4065eff922d94e6d7019c417ed75c

diff --git a/ProcessUNIX.c b/ProcessUNIX.c
index faeb967..241e295 100644
--- a/ProcessUNIX.c
+++ b/ProcessUNIX.c
@@ -2413,6 +2413,12 @@ static void kwsysProcessKill(pid_t process_id)
   /* Suspend the process to be sure it will not create more children.  */
   kill(process_id, SIGSTOP);
 
+#if defined(__CYGWIN__)
+  /* Some Cygwin versions seem to need help here.  Give up our time slice
+     so that the child can process SIGSTOP before we send SIGKILL.  */
+  usleep(1);
+#endif
+
   /* Kill all children if we can find them.  */
 #if defined(__linux__) || defined(__CYGWIN__)
   /* First try using the /proc filesystem.  */
diff --git a/SystemTools.cxx b/SystemTools.cxx
index a2681c1..704cbbc 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -92,7 +92,7 @@ extern char **environ;
 #endif
 
 #ifdef __CYGWIN__
-extern "C" void cygwin_conv_to_win32_path(const char *path, char *win32_path);
+# include <sys/cygwin.h>
 #endif
 
 // getpwnam doesn't exist on Windows and Cray Xt3/Catamount
@@ -1113,7 +1113,10 @@ bool SystemTools::PathCygwinToWin32(const char *path, char *win32_path)
     }
   else
     {
-    cygwin_conv_to_win32_path(path, win32_path);
+    if(cygwin_conv_path(CCP_POSIX_TO_WIN_A, path, win32_path, MAX_PATH) != 0)
+      {
+      win32_path[0] = 0;
+      }
     SystemToolsTranslationMap::value_type entry(path, win32_path);
     SystemTools::Cyg2Win32Map->insert(entry);
     }

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

Summary of changes:


hooks/post-receive
-- 
CMake