From a7d910c07f6ef2ab39e9bf1ba3b031126de8b41c Mon Sep 17 00:00:00 2001 From: Daniel Gonzalez Date: Thu, 18 Apr 2013 16:18:37 +0200 Subject: [PATCH] Feature #1711 CreaDevManager application implementation Neature: Now detecting included libraries in applications and Packages using Regular Expressions. --- lib/creaDevManagerLib/modelCDMApplication.cpp | 175 ++++++++---------- lib/creaDevManagerLib/modelCDMPackage.cpp | 98 +++++++++- 2 files changed, 179 insertions(+), 94 deletions(-) diff --git a/lib/creaDevManagerLib/modelCDMApplication.cpp b/lib/creaDevManagerLib/modelCDMApplication.cpp index a501236..2f7baf0 100644 --- a/lib/creaDevManagerLib/modelCDMApplication.cpp +++ b/lib/creaDevManagerLib/modelCDMApplication.cpp @@ -34,6 +34,10 @@ #include "modelCDMApplication.h" +#include "modelCDMProject.h" +#include "modelCDMLib.h" +#include "modelCDMLibrary.h" + #include #include #include @@ -708,114 +712,99 @@ bool modelCDMApplication::Set3rdPartyLibrary(const std::string& library_name, co } return false; +} -/* - std::map correspondence; +std::map modelCDMApplication::GetCustomLibraries() +{ + std::map res; + std::map res1; - correspondence["Crea"] = "${crea_LIBRARIES}"; - correspondence["WxWidgets"] = "${WXWIDGETS_LIBRARIES}"; - correspondence["KWWidgets"] = "${KWWidgets_LIBRARIES}"; - correspondence["VTK"] = "${VTK_LIBRARIES}"; - correspondence["ITK"] = "${ITK_LIBRARIES}"; - correspondence["GDCM"] = "${GDCM_LIBRARIES}"; - correspondence["Boost"] = "${BOOST_LIBRARIES}"; + std::map correspondence; + std::vector libraries; + if(this->GetParent() != NULL && this->GetParent()->GetParent() != NULL) + if(dynamic_cast(this->GetParent()->GetParent()) != NULL && dynamic_cast(this->GetParent()->GetParent())->GetLib() != NULL) + libraries = (dynamic_cast(this->GetParent()->GetParent()))->GetLib()->GetLibraries(); + for (int i = 0; i < libraries.size(); ++i) + { + correspondence[libraries[i]->GetName()] = libraries[i]->GetNameLibrary(); + res[libraries[i]->GetNameLibrary()] = false; + res1[libraries[i]->GetNameLibrary()] = false; + } - if (correspondence.find(library_name) != correspondence.end()) + if (this->HasCMakeLists()) { - std::string library_command = correspondence[library_name]; - if (this->HasCMakeLists()) + std::string CMfile = CDMUtilities::readFile(this->CMakeLists->GetPath().c_str()); + + //find included libraries + boost::regex expression("^\\h*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{EXE_NAME\\}_LINK_LIBRARIES(([\\s]|#[^\\n]*\\n)+([\\$\\{\\}\\w\\d]+|\"(?:[^\"\\\\]|\\\\.)*\"))*([\\s]|#[^\\n]*\\n)*\\)"); + std::string::const_iterator start, end; + start = CMfile.begin(); + end = CMfile.end(); + boost::match_results what; + boost::match_flag_type flags = boost::match_default; + if(boost::regex_search(start, end, what, expression, flags)) { - CDMUtilities::CMLFile cmlFile = CDMUtilities::readCMLFile(this->CMakeLists->GetPath()); - // look at every syntax element - for (int i = 0; i < cmlFile.size(); ++i) + expression = boost::regex("^\\h*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{EXE_NAME\\}_LINK_LIBRARIES"); + std::string::const_iterator start1, end1; + start1 = what[0].first; + end1 = what[0].second; + boost::match_results what1; + if(boost::regex_search(start1, end1, what1, expression, flags)) { - // if the element is a command and is a SET command - if (cmlFile[i].first == "command" && cmlFile[i].second[0] == "SET") + expression = boost::regex("^\\h*[\\w\\d]+"); + std::string::const_iterator start2, end2; + start2 = what1[0].second; + end2 = what[0].second; + boost::match_results what2; + while(boost::regex_search(start2, end2, what2, expression, flags)) { - // search first parameter - int pos = 1; - while (pos < cmlFile[i].second.size()) - { - // see if it is ${LIBRARY_NAME}_LINK_LIBRARIES - if (cmlFile[i].second[pos] == "${EXE_NAME}_LINK_LIBRARIES") - { - bool found = false; - pos++; - // look for all the third party libraries included - while (pos < cmlFile[i].second.size() && cmlFile[i].second[pos] != ")") - { - // if is library_command then found - if (cmlFile[i].second[pos] == library_command) - { - found = true; - //if toInclude is false the make it a comment - if (!toInclude) - { - cmlFile[i].second[pos] = "#" + cmlFile[i].second[pos]; - std::cout << "library commented: " << library_name << std::endl; - } - break; - } - else if (toInclude && cmlFile[i].second[pos][0] == '#') - { - std::vector segments; - CDMUtilities::splitter::split(segments, cmlFile[i].second[pos], "#", CDMUtilities::splitter::no_empties); - if(segments.size()) - { - for (int j = 0; j < segments[0].size(); ++j) - { - if(isspace(segments[0][j])) - { - segments[0].erase(j,1); - j--; - } - } - - if(segments[0].size() && segments[0] == library_command) - { - found = true; - while(cmlFile[i].second[pos][0] == '#') - { - cmlFile[i].second[pos].erase(0,1); - } - std::cout << "library uncommented: " << library_name << std::endl; - break; - } - } - } - pos++; - } + std::string dete = what2.str(); + CDMUtilities::normalizeStr(dete); + //std::cout << "detectado lib: " << dete << std::endl; + if(res1.find(dete) != res1.end()) + res1[dete] = true; - //if the library was not found and is an inclusion then include it - if (!found && toInclude && pos < cmlFile[i].second.size() && cmlFile[i].second[pos] == ")") - { - cmlFile[i].second.insert(cmlFile[i].second.begin()+pos, library_command); - cmlFile[i].second.insert(cmlFile[i].second.begin()+pos+1, "\n"); - std::cout << "library included: " << library_name << std::endl; - } - } - // if it is the first parameter but is not ${LIBRARY_NAME}_LINK_LIBRARIES then finish with this command - else if (!isspace(cmlFile[i].second[pos][0]) && cmlFile[i].second[pos][0] != '#' && cmlFile[i].second[pos][0] != '(' && cmlFile[i].second[pos][0] != ')') - { - break; - } - pos++; - } + start2 = what2[0].second; } } + } - return CDMUtilities::writeCMLFile(this->CMakeLists->GetPath(), cmlFile); + //find included folders + //std::cout << "searching..." << std::endl; + expression = boost::regex("^\\h*INCLUDE_DIRECTORIES([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*([\\./\\$\\{\\}\\w\\d]+|\"(?:[^\"\\\\]|\\\\.)*\")(([\\s]|#[^\\n]*\\n)+([\\$\\{\\}\\w\\d]+|\"(?:[^\"\\\\]|\\\\.)*\"))*([\\s]|#[^\\n]*\\n)*\\)"); + start = CMfile.begin(); + end = CMfile.end(); + if(boost::regex_search(start, end, what, expression, flags)) + { + //std::cout << what.str() << std::endl; + expression = boost::regex("^\\h*INCLUDE_DIRECTORIES([\\s]|#[^\\n]*\\n)*\\("); + std::string::const_iterator start1, end1; + start1 = what[0].first; + end1 = what[0].second; + boost::match_results what1; + if(boost::regex_search(start1, end1, what1, expression, flags)) + { + //std::cout << what1.str() << std::endl; + expression = boost::regex("^\\h*\\.\\.\\/\\.\\.\\/lib\\/([\\w\\d])+"); + std::string::const_iterator start2, end2; + start2 = what1[0].second; + end2 = what[0].second; + boost::match_results what2; + while(boost::regex_search(start2, end2, what2, expression, flags)) + { + std::string dete = what2.str(); + CDMUtilities::normalizeStr(dete); + //std::cout << "detectado dir: " << dete.substr(10) << std::endl; + if(correspondence.find(dete.substr(10)) != correspondence.end()) + res[correspondence[dete.substr(10)]] = res1[correspondence[dete.substr(10)]]; + + start2 = what2[0].second; + } + } } } - return false; -*/ -} -std::map modelCDMApplication::GetCustomLibraries() -{ - std::map res; - res["Test"] = false; return res; } diff --git a/lib/creaDevManagerLib/modelCDMPackage.cpp b/lib/creaDevManagerLib/modelCDMPackage.cpp index 9a296e9..7e8b9ba 100644 --- a/lib/creaDevManagerLib/modelCDMPackage.cpp +++ b/lib/creaDevManagerLib/modelCDMPackage.cpp @@ -34,6 +34,11 @@ #include "modelCDMPackage.h" +#include "modelCDMProject.h" +#include "modelCDMLib.h" +#include "modelCDMLibrary.h" + + #include #include #include @@ -852,7 +857,98 @@ bool modelCDMPackage::Set3rdPartyLibrary(const std::string& library_name, std::map modelCDMPackage::GetCustomLibraries() { std::map res; - res["Test"] = false; + std::map res1; + + std::map correspondence; + std::vector libraries; + modelCDMIProjectTreeNode* p = this; + while(p != NULL && dynamic_cast(p) == NULL) + p = p->GetParent(); + + if(p != NULL && dynamic_cast(p)->GetLib() != NULL) + libraries = dynamic_cast(p)->GetLib()->GetLibraries(); + + for (int i = 0; i < libraries.size(); ++i) + { + correspondence[libraries[i]->GetName()] = libraries[i]->GetNameLibrary(); + res[libraries[i]->GetNameLibrary()] = false; + res1[libraries[i]->GetNameLibrary()] = false; + } + + if (this->HasCMakeLists()) + { + std::string CMfile = CDMUtilities::readFile(this->CMakeLists->GetPath().c_str()); + + //find included libraries + boost::regex expression("^\\h*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{BBTK_PACKAGE_NAME\\}_LIBS(([\\s]|#[^\\n]*\\n)+([\\$\\{\\}\\w\\d]+|\"(?:[^\"\\\\]|\\\\.)*\"))*([\\s]|#[^\\n]*\\n)*\\)"); + std::string::const_iterator start, end; + start = CMfile.begin(); + end = CMfile.end(); + boost::match_results what; + boost::match_flag_type flags = boost::match_default; + if(boost::regex_search(start, end, what, expression, flags)) + { + + expression = boost::regex("^\\h*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{BBTK_PACKAGE_NAME\\}_LIBS"); + std::string::const_iterator start1, end1; + start1 = what[0].first; + end1 = what[0].second; + boost::match_results what1; + if(boost::regex_search(start1, end1, what1, expression, flags)) + { + expression = boost::regex("^\\h*[\\w\\d]+"); + std::string::const_iterator start2, end2; + start2 = what1[0].second; + end2 = what[0].second; + boost::match_results what2; + while(boost::regex_search(start2, end2, what2, expression, flags)) + { + std::string dete = what2.str(); + CDMUtilities::normalizeStr(dete); + //std::cout << "detectado lib: " << dete << std::endl; + if(res1.find(dete) != res1.end()) + res1[dete] = true; + + start2 = what2[0].second; + } + } + } + + //find included folders + //std::cout << "searching..." << std::endl; + expression = boost::regex("^\\h*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{BBTK_PACKAGE_NAME\\}_INCLUDE_DIRS(([\\s]|#[^\\n]*\\n|////[^\\n]*\\n)+([\\.\\/\\$\\{\\}\\w\\d]+|\"(?:[^\"\\\\]|\\\\.)*\"))*([\\s]|#[^\\n]*\\n)*\\)"); + start = CMfile.begin(); + end = CMfile.end(); + if(boost::regex_search(start, end, what, expression, flags)) + { + //std::cout << what.str() << std::endl; + expression = boost::regex("^\\h*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{BBTK_PACKAGE_NAME\\}_INCLUDE_DIRS"); + std::string::const_iterator start1, end1; + start1 = what[0].first; + end1 = what[0].second; + boost::match_results what1; + if(boost::regex_search(start1, end1, what1, expression, flags)) + { + //std::cout << what1.str() << std::endl; + expression = boost::regex("^\\h*\\.\\.\\/lib\\/([\\w\\d])+"); + std::string::const_iterator start2, end2; + start2 = what1[0].second; + end2 = what[0].second; + boost::match_results what2; + while(boost::regex_search(start2, end2, what2, expression, flags)) + { + std::string dete = what2.str(); + CDMUtilities::normalizeStr(dete); + //std::cout << "detectado dir: " << dete.substr(7) << std::endl; + if(correspondence.find(dete.substr(7)) != correspondence.end()) + res[correspondence[dete.substr(7)]] = res1[correspondence[dete.substr(7)]]; + + start2 = what2[0].second; + } + } + } + } + return res; } -- 2.45.0