[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-94-g9095b13
Brad King
brad.king at kitware.com
Tue Jun 7 08:43:04 EDT 2016
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 9095b13b1caa941bf0109f62ceab07495aff37cd (commit)
via ff08a80af19530c95db4faa921168fb9ab346047 (commit)
via 3b2844328c116cba71c71365507f33f98611e3dc (commit)
from 7f2a735a10a3180a6614ce10d3705e521421bb22 (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=9095b13b1caa941bf0109f62ceab07495aff37cd
commit 9095b13b1caa941bf0109f62ceab07495aff37cd
Merge: 7f2a735 ff08a80
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 7 08:43:03 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 7 08:43:03 2016 -0400
Merge topic 'clang-format-again' into next
ff08a80a Source/CPack: Run clang-format to fix style
3b284432 Tests/FindOpenCL: Run clang-format to fix style
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff08a80af19530c95db4faa921168fb9ab346047
commit ff08a80af19530c95db4faa921168fb9ab346047
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 7 08:39:45 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 7 08:41:16 2016 -0400
Source/CPack: Run clang-format to fix style
diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx
index ddaa483..bef0fb4 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -57,9 +57,9 @@ int cmCPackDebGenerator::PackageOnePack(std::string const& initialTopLevel,
// Begin the archive for this pack
std::string localToplevel(initialTopLevel);
std::string packageFileName(cmSystemTools::GetParentDirectory(toplevel));
- std::string outputFileName(std::string(
- this->GetOption("CPACK_PACKAGE_FILE_NAME")) +
- "-" + packageName + this->GetOutputExtension());
+ std::string outputFileName(
+ std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME")) + "-" +
+ packageName + this->GetOutputExtension());
localToplevel += "/" + packageName;
/* replace the TEMP DIRECTORY with the component one */
@@ -174,9 +174,9 @@ int cmCPackDebGenerator::PackageComponentsAllInOne(
// The ALL GROUPS in ONE package case
std::string localToplevel(initialTopLevel);
std::string packageFileName(cmSystemTools::GetParentDirectory(toplevel));
- std::string outputFileName(std::string(
- this->GetOption("CPACK_PACKAGE_FILE_NAME")) +
- this->GetOutputExtension());
+ std::string outputFileName(
+ std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME")) +
+ this->GetOutputExtension());
// all GROUP in one vs all COMPONENT in one
localToplevel += "/" + compInstDirName;
diff --git a/Source/CPack/cmCPackGeneratorFactory.cxx b/Source/CPack/cmCPackGeneratorFactory.cxx
index cf072bb..2210835 100644
--- a/Source/CPack/cmCPackGeneratorFactory.cxx
+++ b/Source/CPack/cmCPackGeneratorFactory.cxx
@@ -125,7 +125,7 @@ cmCPackGeneratorFactory::cmCPackGeneratorFactory()
}
if (cmCPackProductBuildGenerator::CanGenerate()) {
this->RegisterGenerator("productbuild", "Mac OSX pkg",
- cmCPackProductBuildGenerator::CreateGenerator);
+ cmCPackProductBuildGenerator::CreateGenerator);
}
#endif
#if !defined(_WIN32) && !defined(__QNXNTO__) && !defined(__BEOS__) && \
diff --git a/Source/CPack/cmCPackPKGGenerator.cxx b/Source/CPack/cmCPackPKGGenerator.cxx
index 7bc05d0..3d3ef31 100644
--- a/Source/CPack/cmCPackPKGGenerator.cxx
+++ b/Source/CPack/cmCPackPKGGenerator.cxx
@@ -11,17 +11,17 @@
============================================================================*/
#include "cmCPackPKGGenerator.h"
-#include "cmake.h"
+#include "cmCPackComponentGroup.h"
+#include "cmCPackLog.h"
+#include "cmGeneratedFileStream.h"
#include "cmGlobalGenerator.h"
#include "cmLocalGenerator.h"
-#include "cmSystemTools.h"
#include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
-#include "cmCPackComponentGroup.h"
-#include "cmCPackLog.h"
+#include "cmSystemTools.h"
+#include "cmake.h"
-#include <cmsys/SystemTools.hxx>
#include <cmsys/Glob.hxx>
+#include <cmsys/SystemTools.hxx>
cmCPackPKGGenerator::cmCPackPKGGenerator()
{
@@ -39,13 +39,12 @@ bool cmCPackPKGGenerator::SupportsComponentInstallation() const
int cmCPackPKGGenerator::InitializeInternal()
{
- cmCPackLogger(cmCPackLog::LOG_DEBUG,
- "cmCPackPKGGenerator::Initialize()" << std::endl);
+ cmCPackLogger(cmCPackLog::LOG_DEBUG, "cmCPackPKGGenerator::Initialize()"
+ << std::endl);
return this->Superclass::InitializeInternal();
}
-
std::string cmCPackPKGGenerator::GetPackageName(
const cmCPackComponent& component)
{
@@ -53,16 +52,15 @@ std::string cmCPackPKGGenerator::GetPackageName(
std::string packagesDir = this->GetOption("CPACK_TEMPORARY_DIRECTORY");
packagesDir += ".dummy";
std::ostringstream out;
- out << cmSystemTools::GetFilenameWithoutLastExtension(packagesDir)
- << "-" << component.Name << ".pkg";
+ out << cmSystemTools::GetFilenameWithoutLastExtension(packagesDir) << "-"
+ << component.Name << ".pkg";
return out.str();
} else {
return component.ArchiveFile + ".pkg";
}
}
-void cmCPackPKGGenerator::WriteDistributionFile(
- const char* metapackageFile)
+void cmCPackPKGGenerator::WriteDistributionFile(const char* metapackageFile)
{
std::string distributionTemplate =
this->FindTemplate("CPack.distribution.dist.in");
@@ -144,8 +142,8 @@ void cmCPackPKGGenerator::CreateChoiceOutline(
out << "</line>" << std::endl;
}
-void cmCPackPKGGenerator::CreateChoice(
- const cmCPackComponentGroup& group, std::ostringstream& out)
+void cmCPackPKGGenerator::CreateChoice(const cmCPackComponentGroup& group,
+ std::ostringstream& out)
{
out << "<choice id=\"" << group.Name << "Choice\" "
<< "title=\"" << group.DisplayName << "\" "
@@ -158,8 +156,8 @@ void cmCPackPKGGenerator::CreateChoice(
out << "></choice>" << std::endl;
}
-void cmCPackPKGGenerator::CreateChoice(
- const cmCPackComponent& component, std::ostringstream& out)
+void cmCPackPKGGenerator::CreateChoice(const cmCPackComponent& component,
+ std::ostringstream& out)
{
std::string packageId = "com.";
packageId += this->GetOption("CPACK_PACKAGE_VENDOR");
@@ -277,8 +275,8 @@ std::string cmCPackPKGGenerator::EscapeForXML(std::string str)
return str;
}
-bool cmCPackPKGGenerator::CopyCreateResourceFile(
- const std::string& name, const std::string& dirName)
+bool cmCPackPKGGenerator::CopyCreateResourceFile(const std::string& name,
+ const std::string& dirName)
{
std::string uname = cmSystemTools::UpperCase(name);
std::string cpackVar = "CPACK_RESOURCE_FILE_" + uname;
@@ -323,8 +321,8 @@ bool cmCPackPKGGenerator::CopyCreateResourceFile(
return true;
}
-bool cmCPackPKGGenerator::CopyResourcePlistFile(
- const std::string& name, const char* outName)
+bool cmCPackPKGGenerator::CopyResourcePlistFile(const std::string& name,
+ const char* outName)
{
if (!outName) {
outName = name.c_str();
diff --git a/Source/CPack/cmCPackPKGGenerator.h b/Source/CPack/cmCPackPKGGenerator.h
index 3011f78..20ba94c 100644
--- a/Source/CPack/cmCPackPKGGenerator.h
+++ b/Source/CPack/cmCPackPKGGenerator.h
@@ -13,7 +13,6 @@
#ifndef cmCPackPKGGenerator_h
#define cmCPackPKGGenerator_h
-
#include "cmCPackGenerator.h"
class cmCPackComponent;
@@ -97,7 +96,6 @@ protected:
// The PostFlight component when creating a metapackage
cmCPackComponent PostFlightComponent;
-
};
#endif
diff --git a/Source/CPack/cmCPackProductBuildGenerator.cxx b/Source/CPack/cmCPackProductBuildGenerator.cxx
index aa9a27d..c2a13d0 100644
--- a/Source/CPack/cmCPackProductBuildGenerator.cxx
+++ b/Source/CPack/cmCPackProductBuildGenerator.cxx
@@ -11,17 +11,17 @@
============================================================================*/
#include "cmCPackProductBuildGenerator.h"
-#include "cmake.h"
+#include "cmCPackComponentGroup.h"
+#include "cmCPackLog.h"
+#include "cmGeneratedFileStream.h"
#include "cmGlobalGenerator.h"
#include "cmLocalGenerator.h"
-#include "cmSystemTools.h"
#include "cmMakefile.h"
-#include "cmGeneratedFileStream.h"
-#include "cmCPackComponentGroup.h"
-#include "cmCPackLog.h"
+#include "cmSystemTools.h"
+#include "cmake.h"
-#include <cmsys/SystemTools.hxx>
#include <cmsys/Glob.hxx>
+#include <cmsys/SystemTools.hxx>
cmCPackProductBuildGenerator::cmCPackProductBuildGenerator()
{
@@ -37,56 +37,47 @@ int cmCPackProductBuildGenerator::PackageFiles()
// TODO: Use toplevel
// It is used! Is this an obsolete comment?
- std::string packageDirFileName
- = this->GetOption("CPACK_TEMPORARY_DIRECTORY");
+ std::string packageDirFileName =
+ this->GetOption("CPACK_TEMPORARY_DIRECTORY");
// Create the directory where component packages will be built.
std::string basePackageDir = packageDirFileName;
basePackageDir += "/Contents/Packages";
- if (!cmsys::SystemTools::MakeDirectory(basePackageDir.c_str()))
- {
+ if (!cmsys::SystemTools::MakeDirectory(basePackageDir.c_str())) {
cmCPackLogger(cmCPackLog::LOG_ERROR,
"Problem creating component packages directory: "
<< basePackageDir << std::endl);
return 0;
}
- if (!this->Components.empty())
- {
+ if (!this->Components.empty()) {
std::map<std::string, cmCPackComponent>::iterator compIt;
for (compIt = this->Components.begin(); compIt != this->Components.end();
- ++compIt)
- {
+ ++compIt) {
std::string packageDir = toplevel;
packageDir += '/';
packageDir += compIt->first;
if (!this->GenerateComponentPackage(basePackageDir,
GetPackageName(compIt->second),
- packageDir,
- &compIt->second))
- {
+ packageDir, &compIt->second)) {
return 0;
- }
}
}
- else
- {
- if(!this->GenerateComponentPackage(basePackageDir,
- this->GetOption("CPACK_PACKAGE_NAME"),
- toplevel, NULL))
- {
+ } else {
+ if (!this->GenerateComponentPackage(basePackageDir,
+ this->GetOption("CPACK_PACKAGE_NAME"),
+ toplevel, NULL)) {
return 0;
}
}
// Copy or create all of the resource files we need.
std::string resDir = packageDirFileName + "/Contents";
- if ( !this->CopyCreateResourceFile("License", resDir.c_str())
- || !this->CopyCreateResourceFile("ReadMe", resDir.c_str())
- || !this->CopyCreateResourceFile("Welcome", resDir.c_str()))
- {
+ if (!this->CopyCreateResourceFile("License", resDir.c_str()) ||
+ !this->CopyCreateResourceFile("ReadMe", resDir.c_str()) ||
+ !this->CopyCreateResourceFile("Welcome", resDir.c_str())) {
cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem copying the resource files"
- << std::endl);
+ << std::endl);
return 0;
}
@@ -97,13 +88,13 @@ int cmCPackProductBuildGenerator::PackageFiles()
std::string version = this->GetOption("CPACK_PACKAGE_VERSION");
std::string productbuild = this->GetOption("CPACK_COMMAND_PRODUCTBUILD");
- pkgCmd << productbuild
- << " --distribution \"" << packageDirFileName
- << "/Contents/distribution.dist\""
- << " --package-path \"" << packageDirFileName << "/Contents/Packages" << "\""
- << " --resources \"" << resDir << "\""
- << " --version \"" << version << "\""
- << " \"" << packageFileNames[0] << "\"";
+ pkgCmd << productbuild << " --distribution \"" << packageDirFileName
+ << "/Contents/distribution.dist\""
+ << " --package-path \"" << packageDirFileName << "/Contents/Packages"
+ << "\""
+ << " --resources \"" << resDir << "\""
+ << " --version \"" << version << "\""
+ << " \"" << packageFileNames[0] << "\"";
// Run ProductBuild
return RunProductBuild(pkgCmd.str());
@@ -123,7 +114,6 @@ int cmCPackProductBuildGenerator::InitializeInternal()
}
this->SetOptionIfNotSet("CPACK_COMMAND_PKGBUILD", program.c_str());
-
program = cmSystemTools::FindProgram("productbuild", no_paths, false);
if (program.empty()) {
cmCPackLogger(cmCPackLog::LOG_ERROR, "Cannot find productbuild executable"
@@ -135,9 +125,7 @@ int cmCPackProductBuildGenerator::InitializeInternal()
return this->Superclass::InitializeInternal();
}
-
-bool cmCPackProductBuildGenerator::RunProductBuild(
- const std::string& command)
+bool cmCPackProductBuildGenerator::RunProductBuild(const std::string& command)
{
std::string tmpFile = this->GetOption("CPACK_TOPLEVEL_DIRECTORY");
tmpFile += "/ProductBuildOutput.log";
@@ -145,12 +133,11 @@ bool cmCPackProductBuildGenerator::RunProductBuild(
cmCPackLogger(cmCPackLog::LOG_VERBOSE, "Execute: " << command << std::endl);
std::string output, error_output;
int retVal = 1;
- 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 )
- {
+ 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) {
cmGeneratedFileStream ofs(tmpFile.c_str());
ofs << "# Run command: " << command << std::endl
<< "# Output:" << std::endl
@@ -160,23 +147,20 @@ bool cmCPackProductBuildGenerator::RunProductBuild(
<< "Please check " << tmpFile
<< " for errors" << std::endl);
return false;
- }
+ }
return true;
}
bool cmCPackProductBuildGenerator::GenerateComponentPackage(
- const std::string& packageFileDir,
- const std::string& packageFileName,
- const std::string& packageDir,
- const cmCPackComponent* component)
+ const std::string& packageFileDir, const std::string& packageFileName,
+ const std::string& packageDir, const cmCPackComponent* component)
{
std::string packageFile = packageFileDir;
packageFile += '/';
packageFile += packageFileName;
- cmCPackLogger(cmCPackLog::LOG_OUTPUT,
- "- Building component package: " <<
- packageFile << std::endl);
+ cmCPackLogger(cmCPackLog::LOG_OUTPUT, "- Building component package: "
+ << packageFile << std::endl);
const char* comp_name = component ? component->Name.c_str() : NULL;
@@ -184,15 +168,13 @@ bool cmCPackProductBuildGenerator::GenerateComponentPackage(
const char* postflight = this->GetComponentScript("POSTFLIGHT", comp_name);
std::string resDir = packageFileDir;
- if(component)
- {
+ if (component) {
resDir += "/";
resDir += component->Name;
}
std::string scriptDir = resDir + "/scripts";
- if ( !cmsys::SystemTools::MakeDirectory(scriptDir.c_str()))
- {
+ if (!cmsys::SystemTools::MakeDirectory(scriptDir.c_str())) {
cmCPackLogger(cmCPackLog::LOG_ERROR,
"Problem creating installer directory: " << scriptDir
<< std::endl);
@@ -202,20 +184,13 @@ bool cmCPackProductBuildGenerator::GenerateComponentPackage(
// if preflight, postflight, or postupgrade are set
// then copy them into the script directory and make
// them executable
- if(preflight)
- {
- this->CopyInstallScript(scriptDir.c_str(),
- preflight,
- "preinstall");
+ if (preflight) {
+ this->CopyInstallScript(scriptDir.c_str(), preflight, "preinstall");
}
- if(postflight)
- {
- this->CopyInstallScript(scriptDir.c_str(),
- postflight,
- "postinstall");
+ if (postflight) {
+ this->CopyInstallScript(scriptDir.c_str(), postflight, "postinstall");
}
-
// The command that will be used to run ProductBuild
std::ostringstream pkgCmd;
@@ -223,17 +198,15 @@ bool cmCPackProductBuildGenerator::GenerateComponentPackage(
pkgId += this->GetOption("CPACK_PACKAGE_VENDOR");
pkgId += '.';
pkgId += this->GetOption("CPACK_PACKAGE_NAME");
- if(component)
- {
+ if (component) {
pkgId += '.';
pkgId += component->Name;
- }
+ }
std::string version = this->GetOption("CPACK_PACKAGE_VERSION");
std::string pkgbuild = this->GetOption("CPACK_COMMAND_PKGBUILD");
- pkgCmd << pkgbuild
- << " --root \"" << packageDir << "\""
+ pkgCmd << pkgbuild << " --root \"" << packageDir << "\""
<< " --identifier \"" << pkgId << "\""
<< " --scripts \"" << scriptDir << "\""
<< " --version \"" << version << "\""
@@ -245,12 +218,10 @@ bool cmCPackProductBuildGenerator::GenerateComponentPackage(
}
const char* cmCPackProductBuildGenerator::GetComponentScript(
- const char* script,
- const char* component_name)
+ const char* script, const char* component_name)
{
std::string scriptname = std::string("CPACK_") + script + "_";
- if(component_name)
- {
+ if (component_name) {
scriptname += cmSystemTools::UpperCase(component_name);
scriptname += "_";
}
diff --git a/Source/CPack/cmCPackProductBuildGenerator.h b/Source/CPack/cmCPackProductBuildGenerator.h
index 0740f89..b05b50a 100644
--- a/Source/CPack/cmCPackProductBuildGenerator.h
+++ b/Source/CPack/cmCPackProductBuildGenerator.h
@@ -13,7 +13,6 @@
#ifndef cmCPackProductBuildGenerator_h
#define cmCPackProductBuildGenerator_h
-
#include "cmCPackPKGGenerator.h"
class cmCPackComponent;
@@ -54,7 +53,6 @@ protected:
const char* GetComponentScript(const char* script,
const char* script_component);
-
};
#endif
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b2844328c116cba71c71365507f33f98611e3dc
commit 3b2844328c116cba71c71365507f33f98611e3dc
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 7 08:37:04 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 7 08:41:06 2016 -0400
Tests/FindOpenCL: Run clang-format to fix style
diff --git a/Tests/FindOpenCL/Test/main.c b/Tests/FindOpenCL/Test/main.c
index b075caf..dc77636 100644
--- a/Tests/FindOpenCL/Test/main.c
+++ b/Tests/FindOpenCL/Test/main.c
@@ -1,16 +1,17 @@
#ifdef __APPLE__
- #include <OpenCL/opencl.h>
+#include <OpenCL/opencl.h>
#else
- #include <CL/cl.h>
+#include <CL/cl.h>
#endif
int main()
{
cl_uint platformIdCount;
- // We can't assert on the result because this may return an error if no ICD is
+ // We can't assert on the result because this may return an error if no ICD
+ // is
// found
- clGetPlatformIDs (0, NULL, &platformIdCount);
+ clGetPlatformIDs(0, NULL, &platformIdCount);
return 0;
}
-----------------------------------------------------------------------
Summary of changes:
Source/CPack/cmCPackDebGenerator.cxx | 12 +--
Source/CPack/cmCPackGeneratorFactory.cxx | 2 +-
Source/CPack/cmCPackPKGGenerator.cxx | 40 ++++----
Source/CPack/cmCPackPKGGenerator.h | 2 -
Source/CPack/cmCPackProductBuildGenerator.cxx | 127 ++++++++++---------------
Source/CPack/cmCPackProductBuildGenerator.h | 2 -
Tests/FindOpenCL/Test/main.c | 9 +-
7 files changed, 80 insertions(+), 114 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list