X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FmodelCDMLibrary.cpp;h=c3dcc6a00a915e3ac072ee6d334bba26cd740021;hb=f3f98131ffd23351c3cd872a0b04aecdc97b7c92;hp=fd0e08420b0236889bc8bfbea6ded9d2d3b181c0;hpb=ef630179c0efdb37f43994958b727f585cf2c3ec;p=crea.git diff --git a/lib/creaDevManagerLib/modelCDMLibrary.cpp b/lib/creaDevManagerLib/modelCDMLibrary.cpp index fd0e084..c3dcc6a 100644 --- a/lib/creaDevManagerLib/modelCDMLibrary.cpp +++ b/lib/creaDevManagerLib/modelCDMLibrary.cpp @@ -34,9 +34,12 @@ #include "modelCDMLibrary.h" +#include "modelCDMLib.h" + #include #include #include +#include #include "CDMUtilities.h" #include "creaWx.h" @@ -117,6 +120,8 @@ modelCDMLibrary::modelCDMLibrary(modelCDMIProjectTreeNode* parent, const std::st while (cont) { std::string stdfileName = crea::wx2std(fileName); + std::size_t fileTypePos = stdfileName.find_last_of("."); + std::string fileType = stdfileName.substr(fileTypePos); //if CMakeLists, create CMakeLists if(stdfileName == "CMakeLists.txt") @@ -124,6 +129,17 @@ modelCDMLibrary::modelCDMLibrary(modelCDMIProjectTreeNode* parent, const std::st this->CMakeLists = new modelCDMCMakeListsFile(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1); this->children.push_back(this->CMakeLists); } + //if is a code file, create code file + else if(fileType == ".c" || + fileType == ".cxx" || + fileType == ".h" || + fileType == ".cpp" || + fileType == ".txx" || + fileType == ".cmake" ) + { + modelCDMCodeFile* file = new modelCDMCodeFile(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1); + this->children.push_back(file); + } //if is an unknown file, create file else { @@ -292,6 +308,8 @@ const bool modelCDMLibrary::Refresh(std::string*& result) while (cont) { std::string stdfileName = crea::wx2std(fileName); + std::size_t fileTypePos = stdfileName.find_last_of("."); + std::string fileType = stdfileName.substr(fileTypePos); //if CMakeLists, create CMakeLists if(stdfileName == "CMakeLists.txt") @@ -326,8 +344,22 @@ const bool modelCDMLibrary::Refresh(std::string*& result) if(!found) { - modelCDMFile* file = new modelCDMFile(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1); - this->children.push_back(file); + //if is a code file, create modelCDMCodeFile + if( + fileType == ".c" || + fileType == ".cxx" || + fileType == ".h" || + fileType == ".cpp" || + fileType == ".txx" || + fileType == ".cmake" ) + { + this->children.push_back(new modelCDMCodeFile(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1)); + } + else + { + modelCDMFile* file = new modelCDMFile(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1); + this->children.push_back(file); + } } } @@ -455,37 +487,39 @@ std::map modelCDMLibrary::Get3rdPartyLibraries() if (this->HasCMakeLists()) { - CDMUtilities::CMLFile cmlFile = CDMUtilities::readCMLFile(this->CMakeLists->GetPath().c_str()); - // look at every syntax element - for (int i = 0; i < cmlFile.size(); ++i) + std::string CMfile = CDMUtilities::readFile(this->CMakeLists->GetPath().c_str()); + + boost::regex expression("^\\h*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{LIBRARY_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)) { - // 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*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{LIBRARY_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)) { - // search first parameter - int pos = 1; - while (pos < cmlFile[i].second.size()) + expression = boost::regex("(#[^\\n]*\\n|\\s*\\$\\{\\w+\\})"); + 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)) { - // see if it is ${LIBRARY_NAME}_LINK_LIBRARIES - if (cmlFile[i].second[pos] == "${LIBRARY_NAME}_LINK_LIBRARIES") - { - pos++; - // look for all the third party libraries included - while (pos < cmlFile[i].second.size()) - { - if (cmlFile[i].second[pos][0] == '$' && correspondence.find(cmlFile[i].second[pos]) != correspondence.end()) - { - res[correspondence[cmlFile[i].second[pos]]] = true; - } - pos++; - } - } - // 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] != ')') + if(what2.str()[0] != '#') { - break; + std::string dete = what2.str(); + CDMUtilities::normalizeStr(dete); + if(correspondence.find(dete) != correspondence.end()) + res[correspondence[dete]] = true; } - pos++; + start2 = what2[0].second; } } } @@ -505,105 +539,371 @@ bool modelCDMLibrary::Set3rdPartyLibrary(const std::string& library_name, const correspondence["GDCM"] = "${GDCM_LIBRARIES}"; correspondence["Boost"] = "${BOOST_LIBRARIES}"; + std::map regexCorrespondence; + + regexCorrespondence["Crea"] = "\\$\\{crea_LIBRARIES\\}"; + regexCorrespondence["WxWidgets"] = "\\$\\{WXWIDGETS_LIBRARIES\\}"; + regexCorrespondence["KWWidgets"] = "\\$\\{KWWidgets_LIBRARIES\\}"; + regexCorrespondence["VTK"] = "\\$\\{VTK_LIBRARIES\\}"; + regexCorrespondence["ITK"] = "\\$\\{ITK_LIBRARIES\\}"; + regexCorrespondence["GDCM"] = "\\$\\{GDCM_LIBRARIES\\}"; + regexCorrespondence["Boost"] = "\\$\\{BOOST_LIBRARIES\\}"; + if (correspondence.find(library_name) != correspondence.end()) { std::string library_command = correspondence[library_name]; + std::string regex_command = regexCorrespondence[library_name]; if (this->HasCMakeLists()) { - CDMUtilities::CMLFile cmlFile = CDMUtilities::readCMLFile(this->CMakeLists->GetPath()); + std::string CMfile = CDMUtilities::readFile(this->CMakeLists->GetPath().c_str()); + std::string resCMfile = ""; + + boost::regex expression("^\\h*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{LIBRARY_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)) + { + resCMfile += what.prefix().str(); + bool found = false; + if (toInclude) { + expression = "^\\h*#+\\h*" + regex_command; + std::string::const_iterator start1, end1; + start1 = what[0].first; + end1 = what[0].second; + boost::match_results what1, what2; + while(boost::regex_search(start1, end1, what1, expression, flags)) + { + found = true; + resCMfile += what1.prefix().str(); + std::string dete = what1[0].str(); + for (int i = 0; i < dete.size(); ++i) { + if (dete[i] != '#') + resCMfile.push_back(dete[i]); + } + what2 = what1; + start1 = what1[0].second; + } + if (found) + resCMfile += what2.suffix().str(); + else + { + expression = "^\\h*" + regex_command; + if(boost::regex_search(start1, end1, what1, expression, flags)) + found = true; + + expression = "^\\h*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{LIBRARY_NAME\\}_LINK_LIBRARIES"; + boost::regex_search(start1, end1, what1, expression, flags); + + resCMfile += what1.prefix().str() + what1.str(); + if(!found) + resCMfile += "\n" + library_command + "\n"; + resCMfile += what1.suffix().str(); + } + + }else{ + expression = "^\\h*" + regex_command; + std::string::const_iterator start1, end1; + start1 = what[0].first; + end1 = what[0].second; + boost::match_results what1, what2; + while(boost::regex_search(start1, end1, what1, expression, flags)) + { + found = true; + resCMfile += what1.prefix().str(); + resCMfile += "#" + what1.str(); + what2 = what1; + start1 = what1[0].second; + } + if (found) + resCMfile += what2.suffix().str(); + else + { + expression = "^\\h*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{LIBRARY_NAME\\}_LINK_LIBRARIES"; + boost::regex_search(start1, end1, what1, expression, flags); + + resCMfile += what1.prefix().str() + what1.str() + what1.suffix().str(); + } + } + resCMfile += what.suffix().str(); + + return CDMUtilities::writeFile(this->CMakeLists->GetPath().c_str(), resCMfile); + } + } + } + return false; +} - // look at every syntax element - for (int i = 0; i < cmlFile.size(); ++i) +std::map modelCDMLibrary::GetCustomLibraries() +{ + std::map res; + std::map res1; + + std::map correspondence; + std::vector libraries = ((modelCDMLib*)this->parent)->GetLibraries(); + for (int i = 0; i < libraries.size(); ++i) + { + if(libraries[i]->GetNameLibrary() == this->nameLibrary) + continue; + 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)*\\$\\{LIBRARY_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)) + { + + expression = boost::regex("^\\h*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{LIBRARY_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()) + 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*INCLUDE_DIRECTORIES([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*([\\./\\$\\{\\}\\w\\d]+|\"(?:[^\"\\\\]|\\\\.)*\"){0,1}?(([\\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*\\.\\.\\/([\\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(3) << std::endl; + if(correspondence.find(dete.substr(3)) != correspondence.end()) + res[correspondence[dete.substr(3)]] = res1[correspondence[dete.substr(3)]]; + + start2 = what2[0].second; + } + } + } + } + + return res; +} + +bool modelCDMLibrary::SetCustomLibrary(const std::string& library_name, const bool& toInclude) +{ + std::map correspondence; + std::vector libraries = ((modelCDMLib*)this->parent)->GetLibraries(); + for (int i = 0; i < libraries.size(); ++i) + { + if(libraries[i]->GetNameLibrary() == this->nameLibrary) + continue; + correspondence[libraries[i]->GetNameLibrary()] = libraries[i]->GetName(); + } + + if (correspondence.find(library_name) != correspondence.end()) + { + if (this->HasCMakeLists()) + { + std::string resCMfile = ""; + std::string CMfile = CDMUtilities::readFile(this->CMakeLists->GetPath().c_str()); + bool found = false; + + //find included libraries + boost::regex expression("^\\h*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{LIBRARY_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)) + { + resCMfile += what.prefix().str(); + expression = boost::regex("^\\h*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{LIBRARY_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)) + { + resCMfile += what1.prefix().str() + what1.str(); + //check if already exists + expression = boost::regex("^\\h*"+library_name); + std::string::const_iterator start2, end2; + start2 = what1[0].second; + end2 = what[0].second; + boost::match_results what2, temp2; + while(boost::regex_search(start2, end2, what2, expression, flags)) + { + resCMfile += what2.prefix().str(); + found = true; + if (!toInclude) + { + resCMfile += "#"; + } + resCMfile += what2.str(); + temp2 = what2; + start2 = what2[0].second; + } + if(found) + resCMfile += temp2.suffix().str(); + //check if is commented + else { - // see if it is ${LIBRARY_NAME}_LINK_LIBRARIES - if (cmlFile[i].second[pos] == "${LIBRARY_NAME}_LINK_LIBRARIES") + expression = boost::regex("^\\h*#+\\h*"+library_name); + start2 = what1[0].second; + end2 = what[0].second; + while(boost::regex_search(start2, end2, what2, expression, flags)) { - bool found = false; - pos++; - // look for all the third party libraries included - while (pos < cmlFile[i].second.size() && cmlFile[i].second[pos] != ")") + found = true; + resCMfile += what2.prefix().str(); + if(toInclude) { - // 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) - { - std::cout << "library uncommented: " << library_name << std::endl; - found = true; - while(cmlFile[i].second[pos][0] == '#') - { - cmlFile[i].second[pos].erase(0,1); - } - break; - } - } - } - pos++; + std::string dete = what2[0].str(); + for (int i = 0; i < dete.size(); ++i) { + if (dete[i] != '#') + resCMfile.push_back(dete[i]); + } } + temp2 = what2; + start2 = what2[0].second; + } + if(found) + resCMfile += temp2.suffix().str(); + //add at the beggining of instruction + else + { + if(toInclude) + resCMfile += "\n" + library_name; + resCMfile += what1.suffix().str(); + } + } + } + resCMfile += what.suffix().str(); + } + else + return false; + + //find included folders + CMfile = resCMfile; + resCMfile = ""; + - // 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] == ")") + found = false; + std::cout << "searching..." << CMfile << std::endl; + expression = boost::regex("^\\h*INCLUDE_DIRECTORIES([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*([\\.\\/\\$\\{\\}\\w\\d]+|\"(?:[^\"\\\\]|\\\\.)*\"){0,1}?(([\\s]|#[^\\n]*\\n)+([\\.\\/\\$\\{\\}\\w\\d]+|\"(?:[^\"\\\\]|\\\\.)*\"))*([\\s]|#[^\\n]*\\n)*\\)"); + start = CMfile.begin(); + end = CMfile.end(); + if(boost::regex_search(start, end, what, expression, flags)) + { + resCMfile += what.prefix().str(); + 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)) + { + resCMfile += what1.prefix().str() + what1.str(); + std::cout << what1.str() << std::endl; + //search if dir is already included + expression = boost::regex("^\\h*\\.\\.\\/"+correspondence[library_name]); + std::string::const_iterator start2, end2; + start2 = what1[0].second; + end2 = what[0].second; + boost::match_results what2, temp2; + while(boost::regex_search(start2, end2, what2, expression, flags)) + { + found = true; + resCMfile += what2.prefix().str(); + if(!toInclude) + resCMfile += "#"; + resCMfile += what2.str(); + temp2 = what2; + start2 = what2[0].second; + } + if(found) + resCMfile += temp2.suffix().str(); + //search if dir is commented + else + { + expression = boost::regex("^\\h*#+\\h*\\.\\.\\/"+correspondence[library_name]); + start2 = what1[0].second; + end2 = what[0].second; + while(boost::regex_search(start2, end2, what2, expression, flags)) + { + found = true; + resCMfile += what2.prefix().str(); + if(toInclude) { - 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; + std::string dete = what2[0].str(); + for (int i = 0; i < dete.size(); ++i) { + if (dete[i] != '#') + resCMfile.push_back(dete[i]); + } } + temp2 = what2; + start2 = what2[0].second; } - // 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] != ')') + if(found) + resCMfile += temp2.suffix().str(); + //add at the beggining of instruction + else { - break; + if(toInclude) + resCMfile += "\n../" + correspondence[library_name]; + resCMfile += what1.suffix().str(); } - pos++; } } + resCMfile += what.suffix().str(); } + else + return false; - return CDMUtilities::writeCMLFile(this->CMakeLists->GetPath(), cmlFile); + return CDMUtilities::writeFile(this->CMakeLists->GetPath().c_str(), resCMfile); } } - return false; -} - -std::map modelCDMLibrary::GetCustomLibraries() -{ - std::map res; - res["Test"] = false; - return res; -} -bool modelCDMLibrary::SetCustomLibrary(const std::string& library_name, const bool& toInclude) -{ return false; }