kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'cpack-bundle-codesign-output' 

7b582d15 CPack: Print output from codesign if signing fails
This commit is contained in:
Brad King 2015-02-23 10:26:34 -05:00 committed by CMake Topic Stage
parent ae7c5f05c3 7b582d15ff
commit a089c1c903
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/CPack/cmCPackBundleGenerator.cxx
View File

@ -214,6 +214,7 @@ int cmCPackBundleGenerator::SignBundle(const std::string& src_dir)
// codesign the application. // codesign the application.
if(!cpack_apple_cert_app.empty()) if(!cpack_apple_cert_app.empty())
{ {
std::string output;
std::string bundle_path; std::string bundle_path;
bundle_path = src_dir + "/"; bundle_path = src_dir + "/";
bundle_path += this->GetOption("CPACK_BUNDLE_NAME"); 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 << bundle_path;
temp_sign_file_cmd << it->c_str() << "\""; 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, cmCPackLogger(cmCPackLog::LOG_ERROR,
"Error signing file:" "Error signing file:"
<< bundle_path << it->c_str() << std::endl); << bundle_path << it->c_str() << std::endl << output << std::endl);
return 0; 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 << " --deep -f -s \"" << cpack_apple_cert_app;
temp_sign_binary_cmd << "\" \"" << bundle_path << "\""; 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, cmCPackLogger(cmCPackLog::LOG_ERROR,
"Error signing the application binary." "Error signing the application binary."
<< std::endl); << std::endl << output << std::endl);
return 0; return 0;
} }
@ -276,11 +277,11 @@ int cmCPackBundleGenerator::SignBundle(const std::string& src_dir)
} }
temp_codesign_cmd << " \"" << bundle_path << "\""; temp_codesign_cmd << " \"" << bundle_path << "\"";
if(!this->RunCommand(temp_codesign_cmd)) if(!this->RunCommand(temp_codesign_cmd, &output))
{ {
cmCPackLogger(cmCPackLog::LOG_ERROR, cmCPackLogger(cmCPackLog::LOG_ERROR,
"Error signing the application package." "Error signing the application package."
<< std::endl); << std::endl << output << std::endl);
return 0; return 0;
} }