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 7eea22de2d9b5055601dea903293b49ee6962e86 (commit) via 119b0d9795267a83aeb8902aa103750778d427a0 (commit) from b746bd5c9941cf4747fedd4822ea9660d10a00c5 (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 ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7eea22de2d9b5055601dea903293b49ee6962e86 commit 7eea22de2d9b5055601dea903293b49ee6962e86 Merge: b746bd5 119b0d9 Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Thu Jun 2 12:13:09 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Jun 2 12:13:09 2016 -0400 Merge topic 'productbuild' into next 119b0d97 productbuild: fix style and compile warnings https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=119b0d9795267a83aeb8902aa103750778d427a0 commit 119b0d9795267a83aeb8902aa103750778d427a0 Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Thu Jun 2 10:05:43 2016 -0600 Commit: Clinton Stimpson <clin...@elemtech.com> CommitDate: Thu Jun 2 10:12:43 2016 -0600 productbuild: fix style and compile warnings diff --git a/Source/CPack/cmCPackProductBuildGenerator.cxx b/Source/CPack/cmCPackProductBuildGenerator.cxx index 44adccd..c1f63cc 100644 --- a/Source/CPack/cmCPackProductBuildGenerator.cxx +++ b/Source/CPack/cmCPackProductBuildGenerator.cxx @@ -98,14 +98,15 @@ int cmCPackProductBuildGenerator::PackageFiles() std::string productbuild = this->GetOption("CPACK_COMMAND_PRODUCTBUILD"); pkgCmd << productbuild - << " --distribution \"" << packageDirFileName << "/Contents/distribution.dist\"" + << " --distribution \"" << packageDirFileName + << "/Contents/distribution.dist\"" << " --package-path \"" << packageDirFileName << "/Contents/Packages" << "\"" << " --resources \"" << resDir << "\"" << " --version \"" << version << "\"" << " \"" << packageFileNames[0] << "\""; // Run ProductBuild - return RunProductBuild(pkgCmd.str(), packageFileNames[0]); + return RunProductBuild(pkgCmd.str()); } int cmCPackProductBuildGenerator::InitializeInternal() @@ -135,17 +136,17 @@ int cmCPackProductBuildGenerator::InitializeInternal() } -bool cmCPackProductBuildGenerator::RunProductBuild(const std::string& command, - const std::string& packageFile) +bool cmCPackProductBuildGenerator::RunProductBuild( + const std::string& command) { std::string tmpFile = this->GetOption("CPACK_TOPLEVEL_DIRECTORY"); tmpFile += "/ProductBuildOutput.log"; cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Execute: " << command << std::endl); - std::string output, stderr; + std::string output, error_output; int retVal = 1; - bool res = cmSystemTools::RunSingleCommand(command.c_str(), &output, &stderr, &retVal, 0, - this->GeneratorVerbose, 0); + bool res = cmSystemTools::RunSingleCommand(command.c_str(), + &output, &error_output, &retVal, 0, this->GeneratorVerbose, 0); cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Done running command" << std::endl); if ( !res || retVal ) @@ -240,11 +241,12 @@ bool cmCPackProductBuildGenerator::GenerateComponentPackage( << " \"" << packageFile << "\""; // Run ProductBuild - return RunProductBuild(pkgCmd.str(), packageFile); + return RunProductBuild(pkgCmd.str()); } -const char* cmCPackProductBuildGenerator::GetComponentScript(const char* script, - const char* component_name) +const char* cmCPackProductBuildGenerator::GetComponentScript( + const char* script, + const char* component_name) { std::string scriptname = std::string("CPACK_") + script + "_"; if(component_name) diff --git a/Source/CPack/cmCPackProductBuildGenerator.h b/Source/CPack/cmCPackProductBuildGenerator.h index 9cc9653..0740f89 100644 --- a/Source/CPack/cmCPackProductBuildGenerator.h +++ b/Source/CPack/cmCPackProductBuildGenerator.h @@ -41,7 +41,7 @@ protected: // Run ProductBuild with the given command line, which will (if // successful) produce the given package file. Returns true if // ProductBuild succeeds, false otherwise. - bool RunProductBuild(const std::string& command, const std::string& packageFile); + bool RunProductBuild(const std::string& command); // Generate a package in the file packageFile for the given // component. All of the files within this component are stored in ----------------------------------------------------------------------- Summary of changes: Source/CPack/cmCPackProductBuildGenerator.cxx | 22 ++++++++++++---------- Source/CPack/cmCPackProductBuildGenerator.h | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits