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

logic: vs solution parsing fix

Browse Source 
Fixed vs solution parsing to be able to handle some more variations of vs solution layouts...
This commit is contained in:
Manuel Dobusch
2016-02-23 16:49:02 +01:00
parent f0178fb3c6
commit 8a2c4b4e9b
7 changed files with 48 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/utility/solution/SolutionParserVisualStudio.cpp
+43 -3
View File
@@ -147,6 +147,7 @@ std::vector<std::string> SolutionParserVisualStudio::findProjectItems()
}
TiXmlElement* root = getFirstTagByNameWithAttribute(doc.RootElement(), "ClCompile", "Include");
TiXmlElement* headerRoot = getFirstTagByNameWithAttribute(doc.RootElement(), "ClInclude", "Include");
if (root != NULL)
{
// std::string text(root->GetText());
@@ -157,7 +158,7 @@ std::vector<std::string> SolutionParserVisualStudio::findProjectItems()
text = root->Attribute("Include");
}
if (text.find(".cpp") == std::string::npos)
if (text.find(".cpp") == std::string::npos && text.find(".c") == std::string::npos)
{
root = NULL;
}
@@ -167,7 +168,26 @@ std::vector<std::string> SolutionParserVisualStudio::findProjectItems()
}
}
if (root == NULL)
if (headerRoot != NULL)
{
std::string tag = headerRoot->Value();
std::string text = "";
if (headerRoot->Attribute("Include") != NULL)
{
text = headerRoot->Attribute("Include");
}
if (text.find(".h") == std::string::npos && text.find(".hpp") == std::string::npos)
{
headerRoot = NULL;
}
else
{
headerRoot = headerRoot->Parent()->ToElement();
}
}
/*if (root == NULL)
{
TiXmlElement* root = getFirstTagByNameWithAttribute(doc.RootElement(), "ClInclude", "Include");
if (root != NULL)
@@ -178,7 +198,9 @@ std::vector<std::string> SolutionParserVisualStudio::findProjectItems()
{
root = NULL;
}
}
}*/
if (root != NULL)
{
@@ -197,6 +219,24 @@ std::vector<std::string> SolutionParserVisualStudio::findProjectItems()
}
}
}
if (headerRoot != NULL)
{
for (TiXmlElement* child = headerRoot->FirstChildElement(); child != NULL; child = child->NextSiblingElement())
{
std::string filePath = child->Attribute("Include");
if (relativeProjectPaths[i].size() > 0)
{
filePath = relativeProjectPaths[i] + "/" + filePath;
}
if (checkValidFileExtension(filePath, validFileExtensions))
{
projectItems.push_back(filePath);
}
}
}
}
std::set<std::string> s(projectItems.begin(), projectItems.end());