[Cmake-commits] CMake branch, next, updated. v2.8.5-1830-g59c05d0

[David Cole]

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  59c05d03a49fef910d60870014a69803ae6bb84e (commit)
       via  7b8dcdd17312a7c3ed731743468136b0ea89a6c7 (commit)
       via  d78bdb27832c91c775ad3782c9eb436dcd6a1e7c (commit)
      from  f52a566b9dc3394fd9ec2e22855658aa98c8fb6a (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=59c05d03a49fef910d60870014a69803ae6bb84e
commit 59c05d03a49fef910d60870014a69803ae6bb84e
Merge: f52a566 7b8dcdd
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Sep 6 14:22:31 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 6 14:22:31 2011 -0400

    Merge topic 'fix-12284-cpack-symlinks' into next
    
    7b8dcdd CPack: Do not recurse through directory symlinks (#12284)
    d78bdb2 CMake: Write symlinks to directories as files in archives (#12284)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b8dcdd17312a7c3ed731743468136b0ea89a6c7
commit 7b8dcdd17312a7c3ed731743468136b0ea89a6c7
Author:     Johan Björk <phb at spotify.com>
AuthorDate: Sat Aug 27 19:34:37 2011 +0200
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Tue Sep 6 14:04:37 2011 -0400

    CPack: Do not recurse through directory symlinks (#12284)
    
    ...when building CPack archive-based packages (.tar.gz and similar)
    
    Rather, put the symlinks-to-directories into the archive as files,
    and expect/trust that the things the symlinks point to are also in
    the archive.

diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 0e4acd5..083279f 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -1000,6 +1000,7 @@ int cmCPackGenerator::DoPackage()
   std::string findExpr = tempDirectory;
   findExpr += "/*";
   gl.RecurseOn();
+  gl.SetRecurseThroughSymlinks(false);
   if ( !gl.FindFiles(findExpr) )
     {
     cmCPackLogger(cmCPackLog::LOG_ERROR,

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d78bdb27832c91c775ad3782c9eb436dcd6a1e7c
commit d78bdb27832c91c775ad3782c9eb436dcd6a1e7c
Author:     Johan Björk <phb at spotify.com>
AuthorDate: Sat Aug 27 19:35:08 2011 +0200
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Tue Sep 6 13:58:00 2011 -0400

    CMake: Write symlinks to directories as files in archives (#12284)
    
    Do not recurse through directory symlinks when adding files.
    
    Recursing through directory symlinks will generate broken archives,
    i.e., they will look something like this:
      foo -> bar/bar
      foo/Info <- Shouldn't be in archive.
      bar/bar
      bar/bar/Info

diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx
index 25dc8ba..eab8a59 100644
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@@ -180,7 +180,8 @@ bool cmArchiveWrite::AddPath(const char* path,
     {
     return false;
     }
-  if(!cmSystemTools::FileIsDirectory(path))
+  if(!cmSystemTools::FileIsDirectory(path) ||
+    cmSystemTools::FileIsSymlink(path))
     {
     return true;
     }

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

Summary of changes:
 Source/CPack/cmCPackGenerator.cxx |    1 +
 Source/cmArchiveWrite.cxx         |    3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake