ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logic: Reworked CDB project setup

Browse Source 
* added separate step for project name, project location and cdb path
* added description that project stays up-to-date under cdb path picker.
* added include and framework paths to advanced settings
* disregard source extensions for cdb projects

bug id = 70
This commit is contained in:
Eberhard Graether
2016-06-13 16:43:37 +02:00
parent aae388d8ee
commit b07d03692d
20 changed files with 329 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/utility/file/FileManager.cpp
+13 -4
View File
@@ -47,7 +47,7 @@ void FileManager::fetchFilePaths(const std::vector<FileInfo>& oldFileInfos)
for (std::map<FilePath, FileInfo>::iterator it = m_files.begin(); it != m_files.end(); it++)
{
const FilePath& filePath = it->first;
if (filePath.exists() && !hasSourceExtension(filePath))
if (filePath.exists() && !hasSourceFilePath(filePath))
{
FileInfo fileInfo = FileSystem::getFileInfoForPath(filePath);
@@ -63,6 +63,8 @@ void FileManager::fetchFilePaths(const std::vector<FileInfo>& oldFileInfos)
}
}
m_sourceFiles.clear();
std::vector<FileInfo> fileInfos = FileSystem::getFileInfosFromPaths(m_sourcePaths, m_sourceExtensions);
for (FileInfo fileInfo: fileInfos)
{
@@ -72,6 +74,8 @@ void FileManager::fetchFilePaths(const std::vector<FileInfo>& oldFileInfos)
continue;
}
m_sourceFiles.insert(filePath);
std::map<FilePath, FileInfo>::iterator it = m_files.find(filePath);
if (it != m_files.end())
{
@@ -112,7 +116,7 @@ std::set<FilePath> FileManager::getRemovedFilePaths() const
bool FileManager::hasFilePath(const FilePath& filePath) const
{
if (m_files.find(filePath) != m_files.end())
if (hasSourceFilePath(filePath))
{
return true;
}
@@ -133,9 +137,14 @@ bool FileManager::hasFilePath(const FilePath& filePath) const
return false;
}
bool FileManager::hasSourceExtension(const FilePath& filePath) const
bool FileManager::hasSourceFilePath(const FilePath& filePath) const
{
return filePath.hasExtension(m_sourceExtensions);
if (m_sourceFiles.find(filePath) != m_sourceFiles.end())
{
return true;
}
return false;
}
const FileInfo FileManager::getFileInfo(const FilePath& filePath) const