From 96c6ccdac4c0db2047e0a7302dcb14fbfb091e3c Mon Sep 17 00:00:00 2001 From: Daniel Gonzalez Date: Wed, 17 Apr 2013 17:21:33 +0200 Subject: [PATCH] Feature #1711 CreaDevManager application implementation Change feature: Now including/excluding third party libraries in libraries using Regular Expressions. --- lib/creaDevManagerLib/CDMUtilities.cpp | 15 ++ lib/creaDevManagerLib/CDMUtilities.h | 7 + lib/creaDevManagerLib/modelCDMLibrary.cpp | 162 +++++++++--------- lib/creaDevManagerLib/modelCDMPackage.cpp | 4 +- .../wxCDMLibraryDescriptionPanel.cpp | 5 +- 5 files changed, 113 insertions(+), 80 deletions(-) diff --git a/lib/creaDevManagerLib/CDMUtilities.cpp b/lib/creaDevManagerLib/CDMUtilities.cpp index d67ec36..cc64ee3 100644 --- a/lib/creaDevManagerLib/CDMUtilities.cpp +++ b/lib/creaDevManagerLib/CDMUtilities.cpp @@ -373,6 +373,19 @@ namespace CDMUtilities return res; } + bool writeFile(const std::string& file_path, const std::string& st) + { + std::ofstream file(file_path.c_str()); + if (file.is_open()) + { + file << st; + file.close(); + return true; + } + return false; + + } + CMLFile readCMLFile(const std::string& file_path) { CMLFile res; @@ -523,6 +536,8 @@ namespace CDMUtilities return false; } + + void normalizeStr(std::string& st) { diff --git a/lib/creaDevManagerLib/CDMUtilities.h b/lib/creaDevManagerLib/CDMUtilities.h index e245450..92fe3d0 100644 --- a/lib/creaDevManagerLib/CDMUtilities.h +++ b/lib/creaDevManagerLib/CDMUtilities.h @@ -204,6 +204,13 @@ namespace CDMUtilities * @return A string with the contents of the given file. */ std::string readFile(const std::string& file_path); + /** + * Writes the given string into a file and returns whether the operation is successful. + * @param file_path Full path of the CMakeLists file. + * @param st string to write. + * @return True if the operation was successful. + */ + bool writeFile(const std::string& file_path, const std::string& st); /** * Reads a CMakeLists file and returns the read data. diff --git a/lib/creaDevManagerLib/modelCDMLibrary.cpp b/lib/creaDevManagerLib/modelCDMLibrary.cpp index 8567a6e..8c68167 100644 --- a/lib/creaDevManagerLib/modelCDMLibrary.cpp +++ b/lib/creaDevManagerLib/modelCDMLibrary.cpp @@ -508,92 +508,100 @@ 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()); - - // look at every syntax element - for (int i = 0; i < cmlFile.size(); ++i) + 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)) { - // 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()) - { - // see if it is ${LIBRARY_NAME}_LINK_LIBRARIES - if (cmlFile[i].second[pos] == "${LIBRARY_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) - { - 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++; - } - - // 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++; + 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::writeCMLFile(this->CMakeLists->GetPath(), cmlFile); + //std::cout << resCMfile << std::endl; + + return CDMUtilities::writeFile(this->CMakeLists->GetPath().c_str(), resCMfile); } } return false; diff --git a/lib/creaDevManagerLib/modelCDMPackage.cpp b/lib/creaDevManagerLib/modelCDMPackage.cpp index 147953b..c080ddd 100644 --- a/lib/creaDevManagerLib/modelCDMPackage.cpp +++ b/lib/creaDevManagerLib/modelCDMPackage.cpp @@ -722,7 +722,7 @@ std::map modelCDMPackage::Get3rdPartyLibraries() boost::match_flag_type flags = boost::match_default; while(boost::regex_search(start, end, what, expression, flags)) { - std::cout << what[0].str() << std::endl; + //std::cout << what[0].str() << std::endl; boost::regex expression1 = boost::regex("\\$\\{BBTK_PACKAGE_NAME\\}_USE_\\w+"); std::string::const_iterator start1, end1; start1 = what[0].first; @@ -732,7 +732,7 @@ std::map modelCDMPackage::Get3rdPartyLibraries() { std::string dete = what1.str(); CDMUtilities::normalizeStr(dete); - std::cout << dete << std::endl; + //std::cout << dete << std::endl; if(correspondence.find(dete) != correspondence.end()) res[correspondence[dete]] = true; } diff --git a/lib/creaDevManagerLib/wxCDMLibraryDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMLibraryDescriptionPanel.cpp index 42f58fe..fb756e9 100644 --- a/lib/creaDevManagerLib/wxCDMLibraryDescriptionPanel.cpp +++ b/lib/creaDevManagerLib/wxCDMLibraryDescriptionPanel.cpp @@ -351,7 +351,10 @@ void wxCDMLibraryDescriptionPanel::OnBtnSetExeName(wxCommandEvent& event) void wxCDMLibraryDescriptionPanel::On3rdLibraryChBChange(wxCommandEvent& event) { - this->library->Set3rdPartyLibrary(crea::wx2std(((wxCheckBox*)event.GetEventObject())->GetName()), ((wxCheckBox*)event.GetEventObject())->GetValue()); + if(this->library->Set3rdPartyLibrary(crea::wx2std(((wxCheckBox*)event.GetEventObject())->GetName()), ((wxCheckBox*)event.GetEventObject())->GetValue())) + ((wxCheckBox*)event.GetEventObject())->SetValue(((wxCheckBox*)event.GetEventObject())->GetValue()); + else + ((wxCheckBox*)event.GetEventObject())->SetValue(!((wxCheckBox*)event.GetEventObject())->GetValue()); } void wxCDMLibraryDescriptionPanel::OnLibraryChBChange(wxCommandEvent& event) -- 2.45.0