X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FmodelCDMPackage.cpp;h=377a11bb8303629c5a2c8af0858276e1a600004d;hb=b5874457abda388b3501cdfa57476de7c006c4ea;hp=c080ddd34c6abc857280395537e084344d34ca7f;hpb=96c6ccdac4c0db2047e0a7302dcb14fbfb091e3c;p=crea.git diff --git a/lib/creaDevManagerLib/modelCDMPackage.cpp b/lib/creaDevManagerLib/modelCDMPackage.cpp index c080ddd..377a11b 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 @@ -158,6 +163,12 @@ modelCDMPackage::modelCDMPackage(modelCDMIProjectTreeNode* parent, const std::st while (cont) { std::string stdfileName = crea::wx2std(fileName); + std::size_t fileTypePos = stdfileName.find_last_of("."); + std::string fileType; + if(fileTypePos != std::string::npos) + fileType = stdfileName.substr(fileTypePos); + else + fileType = ""; //if CMakeLists, create CMakeLists if(stdfileName == "CMakeLists.txt") @@ -165,11 +176,23 @@ modelCDMPackage::modelCDMPackage(modelCDMIProjectTreeNode* parent, const std::st this->CMakeLists = new modelCDMCMakeListsFile(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, path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1); + this->children.push_back(file); + } + //if is an unknown file, create file else { this->children.push_back(new modelCDMFile(this, path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1)); } - //if is an unknown file, create file + cont = dir.GetNext(&fileName); } } @@ -524,6 +547,12 @@ const bool modelCDMPackage::Refresh(std::string*& result) while (cont) { std::string stdfileName = crea::wx2std(fileName); + std::size_t fileTypePos = stdfileName.find_last_of("."); + std::string fileType; + if(fileTypePos != std::string::npos) + fileType = stdfileName.substr(fileTypePos); + else + fileType = ""; //if CMakeLists, create CMakeLists if(stdfileName == "CMakeLists.txt") @@ -558,8 +587,22 @@ const bool modelCDMPackage::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); + } } } @@ -747,99 +790,401 @@ bool modelCDMPackage::Set3rdPartyLibrary(const std::string& library_name, { std::map correspondence; - correspondence["VTK"] = "${BBTK_PACKAGE_NAME}_USE_VTK"; - correspondence["ITK"] = "${BBTK_PACKAGE_NAME}_USE_ITK"; - correspondence["GDCM"] = "${BBTK_PACKAGE_NAME}_USE_GDCM"; - correspondence["GDCM_VTK"] = "${BBTK_PACKAGE_NAME}_USE_GDCM_VTK"; - correspondence["GSMIS"] = "${BBTK_PACKAGE_NAME}_USE_GSMIS"; - correspondence["WxWidgets"] = "${BBTK_PACKAGE_NAME}_USE_WXWIDGETS"; - correspondence["KWWidgets"] = "${BBTK_PACKAGE_NAME}_USE_KWWIDGETS"; -/* - if(correspondence.find(library_name) != correspondence.end()) + correspondence["VTK"] = "_USE_VTK"; + correspondence["ITK"] = "_USE_ITK"; + correspondence["GDCM"] = "_USE_GDCM"; + correspondence["GDCM_VTK"] = "_USE_GDCM_VTK"; + correspondence["GSMIS"] = "_USE_GSMIS"; + correspondence["WxWidgets"] = "_USE_WXWIDGETS"; + correspondence["KWWidgets"] = "_USE_KWWIDGETS"; + + if (correspondence.find(library_name) != correspondence.end()) { std::string library_command = correspondence[library_name]; if (this->HasCMakeLists()) { - CDMUtilities::CMLFile cmlFile = CDMUtilities::readCMLFile(this->CMakeLists->GetPath().c_str()); + std::string CMfile = CDMUtilities::readFile(this->CMakeLists->GetPath().c_str()); + std::string resCMfile = ""; bool found = false; - // look at every syntax element - for (int i = 0; i < cmlFile.size(); ++i) - { - // if the element is a command and is a SET command - if (cmlFile[i].first == "command" && cmlFile[i].second[0] == "SET") - { - // search first parameter - int pos = 1; - while (pos < cmlFile[i].second.size()) - { - if (!isspace(cmlFile[i].second[pos][0]) && cmlFile[i].second[pos][0] != '#' && cmlFile[i].second[pos][0] != '(' && cmlFile[i].second[pos][0] != ')') - { - break; - } - pos++; - } - // if the first parameter is a third party statement - if (pos < cmlFile[i].second.size() && cmlFile[i].second[pos] == library_command) - { - std::string foundLibrary = cmlFile[i].second[pos]; - // search for second parameter - pos++; - while (pos < cmlFile[i].second.size()) - { - if (!isspace(cmlFile[i].second[pos][0]) && cmlFile[i].second[pos][0] != '#' && cmlFile[i].second[pos][0] != '(' && cmlFile[i].second[pos][0] != ')') - { - break; - } - pos++; - } - // if the second parameter is ON - if (pos < cmlFile[i].second.size() && cmlFile[i].second[pos] == "ON") - { - found = true; - if (toInclude) - { - std::cout << "library already included: " << library_name << std::endl; - } - else - { - cmlFile[i].first = "comment"; - cmlFile[i].second[0] = "#" + cmlFile[i].second[0]; - std::cout << "library include commented: " << library_name << std::endl; - } - } - else if (pos < cmlFile[i].second.size() && cmlFile[i].second[pos] == "OFF") - { - found = true; - if (toInclude) - { - cmlFile[i].second[pos] = "ON"; - std::cout << "library include activated: " << library_name << std::endl; - } - else - { - std::cout << "library include already disabled: " << library_name << std::endl; + + try { + boost::regex expression("^\\h*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{BBTK_PACKAGE_NAME\\}"+library_command+"([\\s]|#[^\\n]*\\n)+ON([\\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)) + { + found = true; + resCMfile += what.prefix().str(); + if (toInclude) + resCMfile += what.str(); + else + resCMfile += "#" + what.str(); + resCMfile += what.suffix().str(); + + return CDMUtilities::writeFile(this->CMakeLists->GetPath().c_str(), resCMfile); + } + else + { + boost::regex expression("^\\h*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{BBTK_PACKAGE_NAME\\}"+library_command+"([\\s]|#[^\\n]*\\n)+OFF([\\s]|#[^\\n]*\\n)*\\)"); + + start = CMfile.begin(); + end = CMfile.end(); + if(boost::regex_search(start, end, what, expression, flags)) + { + found = true; + resCMfile += what.prefix().str(); + if (toInclude) + { + std::string dete = what.str(); + int pos = dete.rfind("OFF"); + dete.replace(pos, 3, "ON"); + resCMfile += dete; + } + else + resCMfile += what.str(); + resCMfile += what.suffix().str(); + + return CDMUtilities::writeFile(this->CMakeLists->GetPath().c_str(), resCMfile); + } + else + { + boost::regex expression("^\\h*#\\h*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{BBTK_PACKAGE_NAME\\}"+library_command+"([\\s]|#[^\\n]*\\n)+ON([\\s]|#[^\\n]*\\n)*\\)"); + if(boost::regex_search(start, end, what, expression, flags)) + { + found = true; + resCMfile += what.prefix().str(); + if(toInclude) + { + std::string dete = what[0].str(); + for (int i = 0; i < dete.size(); ++i) { + if (dete[i] != '#') + resCMfile.push_back(dete[i]); + if (dete[i] == 'S') + { + resCMfile += dete.substr(i+1); + break; + } } - } - } - } else if (cmlFile[i].first == "comment") { - //TODO: check if it is commented - } - } + } + else + resCMfile += what.str(); + + resCMfile += what.suffix().str(); + return CDMUtilities::writeFile(this->CMakeLists->GetPath().c_str(), resCMfile); + } + else + { + boost::regex expression("^\\h*#\\h*UNCOMMENT EACH LIBRARY NEEDED \\(WILL BE FOUND AND USED AUTOMATICALLY\\)[^\\n]*\\n"); + if(boost::regex_search(start, end, what, expression, flags)) + { + found = true; + resCMfile += what.prefix().str(); + resCMfile += what.str(); + if(toInclude) + { + resCMfile += "SET(${BBTK_PACKAGE_NAME}"+ library_command +" ON)\n"; + } + resCMfile += what.suffix().str(); + return CDMUtilities::writeFile(this->CMakeLists->GetPath().c_str(), resCMfile); + } + } + } + } + } catch (boost::bad_expression& e) { + std::cout << "bad regex: " << e.what() << std::endl; + std::cout.flush(); + } } } -*/ return false; } 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; } bool modelCDMPackage::SetCustomLibrary(const std::string& library_name, const bool& toInclude) { - return false; + 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]->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 + //std::cout << "searching..." << CMfile << std::endl; + 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)) + { + //std::cout << what.str() << std::endl; + resCMfile += what.prefix().str(); + 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)) + { + 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 + { + expression = boost::regex("^\\h*#+\\h*"+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) + { + 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 = ""; + + + found = false; + //std::cout << "searching..." << CMfile << std::endl; + expression = boost::regex("^\\h*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{BBTK_PACKAGE_NAME\\}_INCLUDE_DIRS(([\\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*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)) + { + resCMfile += what1.prefix().str() + what1.str(); + //std::cout << what1.str() << std::endl; + //search if dir is already included + expression = boost::regex("^\\h*\\.\\.\\/lib\\/"+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*\\.\\.\\/lib\\/"+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) + { + 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../lib/" + correspondence[library_name]; + resCMfile += what1.suffix().str(); + } + } + } + resCMfile += what.suffix().str(); + } + else + return false; + + return CDMUtilities::writeFile(this->CMakeLists->GetPath().c_str(), resCMfile); + } + } + + return false; }