[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-532-geb52b44

[Clinton Stimpson]

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  eb52b449c2006892e5d13a035ea3c9d31b1a602c (commit)
       via  7b582d15ff4d70e77287eaf5abb4ea240eb26da6 (commit)
      from  37e53989fc45ec2f99bc987332c013bc910d6fb4 (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=eb52b449c2006892e5d13a035ea3c9d31b1a602c
commit eb52b449c2006892e5d13a035ea3c9d31b1a602c
Merge: 37e5398 7b582d1
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Fri Feb 20 10:19:19 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 20 10:19:19 2015 -0500

    Merge topic 'cpack-bundle-codesign-output' into next
    
    7b582d15 CPack: Print output from codesign if signing fails


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b582d15ff4d70e77287eaf5abb4ea240eb26da6
commit 7b582d15ff4d70e77287eaf5abb4ea240eb26da6
Author:     André Klitzing <aklitzing at gmail.com>
AuthorDate: Fri Feb 20 10:45:14 2015 +0100
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Fri Feb 20 08:17:53 2015 -0700

    CPack: Print output from codesign if signing fails

diff --git a/Source/CPack/cmCPackBundleGenerator.cxx b/Source/CPack/cmCPackBundleGenerator.cxx
index e751568..6e7a26b 100644
--- a/Source/CPack/cmCPackBundleGenerator.cxx
+++ b/Source/CPack/cmCPackBundleGenerator.cxx
@@ -214,6 +214,7 @@ int cmCPackBundleGenerator::SignBundle(const std::string& src_dir)
   // codesign the application.
   if(!cpack_apple_cert_app.empty())
     {
+    std::string output;
     std::string bundle_path;
     bundle_path = src_dir + "/";
     bundle_path += this->GetOption("CPACK_BUNDLE_NAME");
@@ -240,11 +241,11 @@ int cmCPackBundleGenerator::SignBundle(const std::string& src_dir)
       temp_sign_file_cmd << bundle_path;
       temp_sign_file_cmd << it->c_str() << "\"";
 
-      if(!this->RunCommand(temp_sign_file_cmd))
+      if(!this->RunCommand(temp_sign_file_cmd, &output))
         {
         cmCPackLogger(cmCPackLog::LOG_ERROR,
           "Error signing file:"
-          << bundle_path << it->c_str() << std::endl);
+          << bundle_path << it->c_str() << std::endl << output << std::endl);
 
         return 0;
         }
@@ -256,11 +257,11 @@ int cmCPackBundleGenerator::SignBundle(const std::string& src_dir)
     temp_sign_binary_cmd << " --deep -f -s \"" << cpack_apple_cert_app;
     temp_sign_binary_cmd << "\" \"" << bundle_path << "\"";
 
-    if(!this->RunCommand(temp_sign_binary_cmd))
+    if(!this->RunCommand(temp_sign_binary_cmd, &output))
       {
       cmCPackLogger(cmCPackLog::LOG_ERROR,
         "Error signing the application binary."
-        << std::endl);
+        << std::endl << output << std::endl);
 
       return 0;
       }
@@ -276,11 +277,11 @@ int cmCPackBundleGenerator::SignBundle(const std::string& src_dir)
       }
     temp_codesign_cmd << " \"" << bundle_path << "\"";
 
-    if(!this->RunCommand(temp_codesign_cmd))
+    if(!this->RunCommand(temp_codesign_cmd, &output))
       {
       cmCPackLogger(cmCPackLog::LOG_ERROR,
         "Error signing the application package."
-        << std::endl);
+        << std::endl << output << std::endl);
 
       return 0;
       }

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

Summary of changes:
 Source/CPack/cmCPackBundleGenerator.cxx |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake