[Cmake-commits] CMake branch, next, updated. v2.8.7-3199-ga36e092

[Eric Noulard]

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  a36e092d605afc283eb12a22abb7605577540b6e (commit)
       via  4576f40ee0f1306189179919efb35c915fe49cf1 (commit)
       via  1bfe81e01e1fb8b4e790082d15ca7cf7d7b7f6ae (commit)
       via  6330f67a2511067b820dcbaa34f7d890f7c92c96 (commit)
       via  b4f949a3dd05c90814fb69372e1268718b1a586c (commit)
       via  acc3862d0add923d0ec91356b39aa0e030a5d211 (commit)
       via  50fe2c6460d42fdd6edafbe2b64087b687f3bd16 (commit)
      from  f5243578b93208ede6243223e2ae800196976a66 (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=a36e092d605afc283eb12a22abb7605577540b6e
commit a36e092d605afc283eb12a22abb7605577540b6e
Merge: f524357 4576f40
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Sun Mar 18 12:55:55 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Mar 18 12:55:55 2012 -0400

    Merge topic 'CPack-fixSTGZpermission-bug13046' into next
    
    4576f40 CPack STGZ put execute permission on all packages files (component case)
    1bfe81e KWSys Nightly Date Stamp
    6330f67 KWSys Nightly Date Stamp
    b4f949a KWSys Nightly Date Stamp
    acc3862 KWSys Nightly Date Stamp
    50fe2c6 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4576f40ee0f1306189179919efb35c915fe49cf1
commit 4576f40ee0f1306189179919efb35c915fe49cf1
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Sun Mar 18 17:52:56 2012 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Sun Mar 18 17:52:56 2012 +0100

    CPack STGZ put execute permission on all packages files (component case)

diff --git a/Source/CPack/cmCPackSTGZGenerator.cxx b/Source/CPack/cmCPackSTGZGenerator.cxx
index 184c557..966a231 100644
--- a/Source/CPack/cmCPackSTGZGenerator.cxx
+++ b/Source/CPack/cmCPackSTGZGenerator.cxx
@@ -54,21 +54,32 @@ int cmCPackSTGZGenerator::InitializeInternal()
 //----------------------------------------------------------------------
 int cmCPackSTGZGenerator::PackageFiles()
 {
+ bool retval = true;
   if ( !this->Superclass::PackageFiles() )
     {
     return 0;
     }
-  return cmSystemTools::SetPermissions(packageFileNames[0].c_str(),
+
+  /* TGZ generator (our Superclass) may
+   * have generated several packages (component packaging)
+   * so we must iterate over generated packages.
+   */
+  for (std::vector<std::string>::iterator it=packageFileNames.begin();
+       it != packageFileNames.end(); ++it)
+  {
+    retval &= cmSystemTools::SetPermissions((*it).c_str(),
 #if defined( _MSC_VER ) || defined( __MINGW32__ )
-    S_IREAD | S_IWRITE | S_IEXEC
+      S_IREAD | S_IWRITE | S_IEXEC
 #elif defined( __BORLANDC__ )
-    S_IRUSR | S_IWUSR | S_IXUSR
+      S_IRUSR | S_IWUSR | S_IXUSR
 #else
-    S_IRUSR | S_IWUSR | S_IXUSR |
-    S_IRGRP | S_IWGRP | S_IXGRP |
-    S_IROTH | S_IWOTH | S_IXOTH
+      S_IRUSR | S_IWUSR | S_IXUSR |
+      S_IRGRP | S_IWGRP | S_IXGRP |
+      S_IROTH | S_IWOTH | S_IXOTH
 #endif
-  );
+    );
+  }
+  return retval;
 }
 
 //----------------------------------------------------------------------

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

Summary of changes:
 Source/CPack/cmCPackSTGZGenerator.cxx |   25 ++++++++++++++++++-------
 Source/kwsys/kwsysDateStamp.cmake     |    2 +-
 2 files changed, 19 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake