summaryrefslogtreecommitdiffstats
path: root/Source/cmDepends.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'Source/cmDepends.cxx')
-rw-r--r--Source/cmDepends.cxx197
1 files changed, 84 insertions, 113 deletions
diff --git a/Source/cmDepends.cxx b/Source/cmDepends.cxx
index 8686bcd..5df3cc1 100644
--- a/Source/cmDepends.cxx
+++ b/Source/cmDepends.cxx
@@ -19,26 +19,25 @@
#include <cmsys/FStream.hxx>
#include <string.h>
-cmDepends::cmDepends(cmLocalGenerator* lg, const char* targetDir):
- CompileDirectory(),
- LocalGenerator(lg),
- Verbose(false),
- FileComparison(0),
- TargetDirectory(targetDir),
- MaxPath(16384),
- Dependee(new char[MaxPath]),
- Depender(new char[MaxPath])
+cmDepends::cmDepends(cmLocalGenerator* lg, const char* targetDir)
+ : CompileDirectory()
+ , LocalGenerator(lg)
+ , Verbose(false)
+ , FileComparison(0)
+ , TargetDirectory(targetDir)
+ , MaxPath(16384)
+ , Dependee(new char[MaxPath])
+ , Depender(new char[MaxPath])
{
}
cmDepends::~cmDepends()
{
- delete [] this->Dependee;
- delete [] this->Depender;
+ delete[] this->Dependee;
+ delete[] this->Depender;
}
-bool cmDepends::Write(std::ostream &makeDepends,
- std::ostream &internalDepends)
+bool cmDepends::Write(std::ostream& makeDepends, std::ostream& internalDepends)
{
// Lookup the set of sources to scan.
std::string srcLang = "CMAKE_DEPENDS_CHECK_";
@@ -49,97 +48,92 @@ bool cmDepends::Write(std::ostream &makeDepends,
cmSystemTools::ExpandListArgument(srcStr, pairs);
std::map<std::string, std::set<std::string> > dependencies;
- for(std::vector<std::string>::iterator si = pairs.begin();
- si != pairs.end();)
- {
+ for (std::vector<std::string>::iterator si = pairs.begin();
+ si != pairs.end();) {
// Get the source and object file.
std::string const& src = *si++;
- if(si == pairs.end()) { break; }
+ if (si == pairs.end()) {
+ break;
+ }
std::string const& obj = *si++;
dependencies[obj].insert(src);
- }
- for(std::map<std::string, std::set<std::string> >::const_iterator
- it = dependencies.begin(); it != dependencies.end(); ++it)
- {
+ }
+ for (std::map<std::string, std::set<std::string> >::const_iterator it =
+ dependencies.begin();
+ it != dependencies.end(); ++it) {
// Write the dependencies for this pair.
- if(!this->WriteDependencies(it->second, it->first,
- makeDepends, internalDepends))
- {
+ if (!this->WriteDependencies(it->second, it->first, makeDepends,
+ internalDepends)) {
return false;
- }
}
+ }
return this->Finalize(makeDepends, internalDepends);
}
-bool cmDepends::Finalize(std::ostream&,
- std::ostream&)
+bool cmDepends::Finalize(std::ostream&, std::ostream&)
{
return true;
}
-bool cmDepends::Check(const char *makeFile, const char *internalFile,
+bool cmDepends::Check(const char* makeFile, const char* internalFile,
std::map<std::string, DependencyVector>& validDeps)
{
// Dependency checks must be done in proper working directory.
std::string oldcwd = ".";
- if(this->CompileDirectory != ".")
- {
+ if (this->CompileDirectory != ".") {
// Get the CWD but do not call CollapseFullPath because
// we only need it to cd back, and the form does not matter
oldcwd = cmSystemTools::GetCurrentWorkingDirectory(false);
cmSystemTools::ChangeDirectory(this->CompileDirectory);
- }
+ }
// Check whether dependencies must be regenerated.
bool okay = true;
cmsys::ifstream fin(internalFile);
- if(!(fin && this->CheckDependencies(fin, internalFile, validDeps)))
- {
+ if (!(fin && this->CheckDependencies(fin, internalFile, validDeps))) {
// Clear all dependencies so they will be regenerated.
this->Clear(makeFile);
cmSystemTools::RemoveFile(internalFile);
okay = false;
- }
+ }
// Restore working directory.
- if(oldcwd != ".")
- {
+ if (oldcwd != ".") {
cmSystemTools::ChangeDirectory(oldcwd);
- }
+ }
return okay;
}
-void cmDepends::Clear(const char *file)
+void cmDepends::Clear(const char* file)
{
// Print verbose output.
- if(this->Verbose)
- {
+ if (this->Verbose) {
std::ostringstream msg;
msg << "Clearing dependencies in \"" << file << "\"." << std::endl;
cmSystemTools::Stdout(msg.str().c_str());
- }
+ }
// Write an empty dependency file.
cmGeneratedFileStream depFileStream(file);
- depFileStream
- << "# Empty dependencies file\n"
- << "# This may be replaced when dependencies are built." << std::endl;
+ depFileStream << "# Empty dependencies file\n"
+ << "# This may be replaced when dependencies are built."
+ << std::endl;
}
-bool cmDepends::WriteDependencies(
- const std::set<std::string>&, const std::string&,
- std::ostream&, std::ostream&)
+bool cmDepends::WriteDependencies(const std::set<std::string>&,
+ const std::string&, std::ostream&,
+ std::ostream&)
{
// This should be implemented by the subclass.
return false;
}
-bool cmDepends::CheckDependencies(std::istream& internalDepends,
- const char* internalDependsFileName,
- std::map<std::string, DependencyVector>& validDeps)
+bool cmDepends::CheckDependencies(
+ std::istream& internalDepends, const char* internalDependsFileName,
+ std::map<std::string, DependencyVector>& validDeps)
{
// Parse dependencies from the stream. If any dependee is missing
// or newer than the depender then dependencies should be
@@ -148,22 +142,18 @@ bool cmDepends::CheckDependencies(std::istream& internalDepends,
bool dependerExists = false;
DependencyVector* currentDependencies = 0;
- while(internalDepends.getline(this->Dependee, this->MaxPath))
- {
- if ( this->Dependee[0] == 0 || this->Dependee[0] == '#' ||
- this->Dependee[0] == '\r' )
- {
+ while (internalDepends.getline(this->Dependee, this->MaxPath)) {
+ if (this->Dependee[0] == 0 || this->Dependee[0] == '#' ||
+ this->Dependee[0] == '\r') {
continue;
- }
- size_t len = internalDepends.gcount()-1;
- if ( this->Dependee[len-1] == '\r' )
- {
- len --;
+ }
+ size_t len = internalDepends.gcount() - 1;
+ if (this->Dependee[len - 1] == '\r') {
+ len--;
this->Dependee[len] = 0;
- }
- if ( this->Dependee[0] != ' ' )
- {
- memcpy(this->Depender, this->Dependee, len+1);
+ }
+ if (this->Dependee[0] != ' ') {
+ memcpy(this->Depender, this->Dependee, len + 1);
// Calling FileExists() for the depender here saves in many cases 50%
// of the calls to FileExists() further down in the loop. E.g. for
// kdelibs/khtml this reduces the number of calls from 184k down to 92k,
@@ -175,7 +165,7 @@ bool cmDepends::CheckDependencies(std::istream& internalDepends,
// access.
currentDependencies = &validDeps[this->Depender];
continue;
- }
+ }
/*
// Parse the dependency line.
if(!this->ParseDependency(line.c_str()))
@@ -190,95 +180,80 @@ bool cmDepends::CheckDependencies(std::istream& internalDepends,
// * if the depender does not exist, but the dependee is newer than the
// depends file
bool regenerate = false;
- const char* dependee = this->Dependee+1;
+ const char* dependee = this->Dependee + 1;
const char* depender = this->Depender;
- if (currentDependencies != 0)
- {
+ if (currentDependencies != 0) {
currentDependencies->push_back(dependee);
- }
+ }
- if(!cmSystemTools::FileExists(dependee))
- {
+ if (!cmSystemTools::FileExists(dependee)) {
// The dependee does not exist.
regenerate = true;
// Print verbose output.
- if(this->Verbose)
- {
+ if (this->Verbose) {
std::ostringstream msg;
- msg << "Dependee \"" << dependee
- << "\" does not exist for depender \""
+ msg << "Dependee \"" << dependee << "\" does not exist for depender \""
<< depender << "\"." << std::endl;
cmSystemTools::Stdout(msg.str().c_str());
- }
}
- else
- {
- if(dependerExists)
- {
+ } else {
+ if (dependerExists) {
// The dependee and depender both exist. Compare file times.
int result = 0;
- if((!this->FileComparison->FileTimeCompare(depender, dependee,
- &result) || result < 0))
- {
+ if ((!this->FileComparison->FileTimeCompare(depender, dependee,
+ &result) ||
+ result < 0)) {
// The depender is older than the dependee.
regenerate = true;
// Print verbose output.
- if(this->Verbose)
- {
+ if (this->Verbose) {
std::ostringstream msg;
- msg << "Dependee \"" << dependee
- << "\" is newer than depender \""
+ msg << "Dependee \"" << dependee << "\" is newer than depender \""
<< depender << "\"." << std::endl;
cmSystemTools::Stdout(msg.str().c_str());
- }
}
}
- else
- {
+ } else {
// The dependee exists, but the depender doesn't. Regenerate if the
// internalDepends file is older than the dependee.
int result = 0;
- if((!this->FileComparison->FileTimeCompare(internalDependsFileName,
- dependee, &result) || result < 0))
- {
+ if ((!this->FileComparison->FileTimeCompare(internalDependsFileName,
+ dependee, &result) ||
+ result < 0)) {
// The depends-file is older than the dependee.
regenerate = true;
// Print verbose output.
- if(this->Verbose)
- {
+ if (this->Verbose) {
std::ostringstream msg;
msg << "Dependee \"" << dependee
<< "\" is newer than depends file \""
<< internalDependsFileName << "\"." << std::endl;
cmSystemTools::Stdout(msg.str().c_str());
- }
}
}
}
- if(regenerate)
- {
+ }
+ if (regenerate) {
// Dependencies must be regenerated.
okay = false;
// Remove the information of this depender from the map, it needs
// to be rescanned
- if (currentDependencies != 0)
- {
+ if (currentDependencies != 0) {
validDeps.erase(this->Depender);
currentDependencies = 0;
- }
+ }
// Remove the depender to be sure it is rebuilt.
- if (dependerExists)
- {
+ if (dependerExists) {
cmSystemTools::RemoveFile(depender);
dependerExists = false;
- }
}
}
+ }
return okay;
}
@@ -286,26 +261,22 @@ bool cmDepends::CheckDependencies(std::istream& internalDepends,
void cmDepends::SetIncludePathFromLanguage(const std::string& lang)
{
// Look for the new per "TARGET_" variant first:
- const char * includePath = 0;
+ const char* includePath = 0;
std::string includePathVar = "CMAKE_";
includePathVar += lang;
includePathVar += "_TARGET_INCLUDE_PATH";
cmMakefile* mf = this->LocalGenerator->GetMakefile();
includePath = mf->GetDefinition(includePathVar);
- if(includePath)
- {
+ if (includePath) {
cmSystemTools::ExpandListArgument(includePath, this->IncludePath);
- }
- else
- {
+ } else {
// Fallback to the old directory level variable if no per-target var:
includePathVar = "CMAKE_";
includePathVar += lang;
includePathVar += "_INCLUDE_PATH";
includePath = mf->GetDefinition(includePathVar);
- if(includePath)
- {
+ if (includePath) {
cmSystemTools::ExpandListArgument(includePath, this->IncludePath);
- }
}
+ }
}