[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1984-g03df039

[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  03df039502924398fe51ccd492ef4a5c93c86b71 (commit)
       via  7df291fb6e6971f60cc7b338bcaa81069ed11757 (commit)
       via  9d66f74335a09019644c7b82af0860da439fce87 (commit)
       via  bc75f4c4c606412429e97d12ef1d550e7096cdfc (commit)
      from  622894b34fd13b098c7b2a5b7b7c4b3d0b770c31 (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=03df039502924398fe51ccd492ef4a5c93c86b71
commit 03df039502924398fe51ccd492ef4a5c93c86b71
Merge: 622894b 7df291f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 7 10:12:46 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 7 10:12:46 2013 -0500

    Merge topic 'update-kwsys' into next
    
    7df291f Merge branch 'upstream-kwsys' into update-kwsys
    9d66f74 KWSys 2013-02-05 (5c34ed2e)
    bc75f4c CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7df291fb6e6971f60cc7b338bcaa81069ed11757
commit 7df291fb6e6971f60cc7b338bcaa81069ed11757
Merge: bc75f4c 9d66f74
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 7 08:34:56 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 7 08:34:56 2013 -0500

    Merge branch 'upstream-kwsys' into update-kwsys


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d66f74335a09019644c7b82af0860da439fce87
commit 9d66f74335a09019644c7b82af0860da439fce87
Author:     KWSys Robot <kwrobot at kitware.com>
AuthorDate: Tue Feb 5 08:37:35 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 7 08:34:52 2013 -0500

    KWSys 2013-02-05 (5c34ed2e)
    
    Extract upstream KWSys using the following shell commands.
    
    $ git archive --prefix=upstream-kwsys/ 5c34ed2e | tar x
    $ git shortlog --no-merges --abbrev=8 --format='%h %s' 5b0d1bd9..5c34ed2e
    Brad King (1):
          5c34ed2e SystemTools: Do not abort with no current directory
    
    Change-Id: Id054017eac2bf10c71ca721df48298cdff2bea82

diff --git a/SystemTools.cxx b/SystemTools.cxx
index 881c49a..22bf193 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -196,18 +196,16 @@ inline int Rmdir(const char* dir)
 }
 inline const char* Getcwd(char* buf, unsigned int len)
 {
-  const char* ret = _getcwd(buf, len);
-  if(!ret)
+  if(const char* ret = _getcwd(buf, len))
     {
-    fprintf(stderr, "No current working directory.\n");
-    abort();
-    }
-  // make sure the drive letter is capital
-  if(strlen(buf) > 1 && buf[1] == ':')
-    {
-    buf[0] = toupper(buf[0]);
+    // make sure the drive letter is capital
+    if(strlen(buf) > 1 && buf[1] == ':')
+      {
+      buf[0] = toupper(buf[0]);
+      }
+    return ret;
     }
-  return ret;
+  return 0;
 }
 inline int Chdir(const char* dir)
 {
@@ -245,13 +243,7 @@ inline int Rmdir(const char* dir)
 }
 inline const char* Getcwd(char* buf, unsigned int len)
 {
-  const char* ret = getcwd(buf, len);
-  if(!ret)
-    {
-    fprintf(stderr, "No current working directory\n");
-    abort();
-    }
-  return ret;
+  return getcwd(buf, len);
 }
 
 inline int Chdir(const char* dir)
@@ -3089,7 +3081,7 @@ kwsys_stl::string SystemTools::CollapseFullPath(const char* in_path,
         }
       else
         {
-        // ??
+        base_components.push_back("");
         }
       }
 

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

Summary of changes:
 Source/CMakeVersion.cmake    |    2 +-
 Source/kwsys/SystemTools.cxx |   28 ++++++++++------------------
 2 files changed, 11 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
CMake