X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FmodelCDMLibrary.cpp;h=58cc8929b669dea3741d889e30b937d297f34fae;hb=94511d0d24fe76a082b14afeab79bcaf0d1ecf13;hp=560759e02a300eea0aeb851863020623b0ac2508;hpb=2b6788596bc21c7942df4b0d6917eaf5b5d72277;p=crea.git diff --git a/lib/creaDevManagerLib/modelCDMLibrary.cpp b/lib/creaDevManagerLib/modelCDMLibrary.cpp index 560759e..58cc892 100644 --- a/lib/creaDevManagerLib/modelCDMLibrary.cpp +++ b/lib/creaDevManagerLib/modelCDMLibrary.cpp @@ -35,6 +35,7 @@ #include "modelCDMLibrary.h" #include +#include #include #include "CDMUtilities.h" @@ -45,16 +46,12 @@ modelCDMLibrary::modelCDMLibrary() { } -modelCDMLibrary::modelCDMLibrary(const std::string& path, const int& level) +modelCDMLibrary::modelCDMLibrary(modelCDMIProjectTreeNode* parent, const std::string& path, const std::string& name, const int& level) { + std::cout << "creating library: " + path + "\n"; + this->parent = parent; //folder name - std::vector words; - std::string delimiters; - //TODO::fix for windows - delimiters = "/"; - CDMUtilities::splitter::split(words, path, delimiters, CDMUtilities::splitter::no_empties); - this->name = words[words.size()-1]; - + this->name = name; //path this->path = CDMUtilities::fixPath(path); //type @@ -63,7 +60,7 @@ modelCDMLibrary::modelCDMLibrary(const std::string& path, const int& level) this->level = level; //open CMakeList - std::string pathMakeLists = path + "/CMakeLists.txt"; + std::string pathMakeLists = path + CDMUtilities::SLASH + "CMakeLists.txt"; std::ifstream confFile; confFile.open((pathMakeLists).c_str()); @@ -84,7 +81,7 @@ modelCDMLibrary::modelCDMLibrary(const std::string& path, const int& level) if(wordBits[0] == "LIBRARY_NAME") { word = wordBits[1]; - for (int i = 2; i < wordBits.size(); i++) + for (int i = 2; i < (int)(wordBits.size()); i++) { word += " " + wordBits[i]; } @@ -109,7 +106,7 @@ modelCDMLibrary::modelCDMLibrary(const std::string& path, const int& level) { std::string stdfileName = crea::wx2std(fileName); - modelCDMFolder* folder = new modelCDMFolder(this->path + "/" + stdfileName, this->level + 1); + modelCDMFolder* folder = new modelCDMFolder(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1); this->folders.push_back(folder); this->children.push_back(folder); @@ -124,19 +121,20 @@ modelCDMLibrary::modelCDMLibrary(const std::string& path, const int& level) //if CMakeLists, create CMakeLists if(stdfileName == "CMakeLists.txt") { - this->CMakeLists = new modelCDMCMakeListsFile(this->path + "/" + stdfileName, this->level + 1); + this->CMakeLists = new modelCDMCMakeListsFile(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1); this->children.push_back(this->CMakeLists); } //if is an unknown file, create file else { - this->children.push_back(new modelCDMFile(this->path + "/" + stdfileName, this->level + 1)); + this->children.push_back(new modelCDMFile(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1)); } cont = dir.GetNext(&fileName); } } this->SortChildren(); + std::sort(this->folders.begin(), this->folders.end(), CompareNodeItem); } modelCDMLibrary::~modelCDMLibrary() @@ -153,21 +151,21 @@ bool modelCDMLibrary::SetNameLibrary(const std::string& fileName, std::string*& std::vector words; CDMUtilities::splitter::split(words, fileName, ", /\\\"", CDMUtilities::splitter::no_empties); std::string fileNameReal = words[0]; - for (int i = 1; i < words.size(); i++) + for (int i = 1; i < (int)(words.size()); i++) { fileNameReal += "-" + words[i]; } std::string line; //opening original cmakelists - std::ifstream in((this->path + "/CMakeLists.txt").c_str()); + std::ifstream in((this->path + CDMUtilities::SLASH + "CMakeLists.txt").c_str()); if( !in.is_open()) { result = new std::string("CMakeLists.txt file failed to open."); return false; } //opening temporal cmakelists - std::ofstream out((this->path + "/CMakeLists.txt.tmp").c_str()); + std::ofstream out((this->path + CDMUtilities::SLASH + "CMakeLists.txt.tmp").c_str()); if( !out.is_open()) { result = new std::string("CMakeLists.txt.tmp file failed to open."); @@ -183,7 +181,7 @@ bool modelCDMLibrary::SetNameLibrary(const std::string& fileName, std::string*& in.close(); out.close(); //delete old file and rename new file - std::string renameCommand = "mv " + this->path + "/CMakeLists.txt.tmp " + this->path + "/CMakeLists.txt"; + std::string renameCommand = "mv \"" + this->path + CDMUtilities::SLASH + "CMakeLists.txt.tmp\" \"" + this->path + CDMUtilities::SLASH + "CMakeLists.txt\""; if(system(renameCommand.c_str())) { result = new std::string("An error occurred while running '" + renameCommand + "'."); @@ -197,26 +195,27 @@ bool modelCDMLibrary::SetNameLibrary(const std::string& fileName, std::string*& modelCDMFolder* modelCDMLibrary::CreateFolder(const std::string& name, std::string*& result) { //TODO:: mkdir depending on OS - std::string command = "mkdir " + path + "/" + name; - if(system(command.c_str())) - { - result = new std::string("Error executing: " + command + "."); - return NULL; - } - modelCDMFolder* folder = new modelCDMFolder(path + "/" + name, level + 1); - this->folders.push_back(folder); - this->children.push_back(folder); - - return folder; + std::string command = "mkdir \"" + path + CDMUtilities::SLASH + name + "\""; + if(system(command.c_str())) + { + result = new std::string("Error executing: " + command + "."); + return NULL; + } + modelCDMFolder* folder = new modelCDMFolder(this, path + CDMUtilities::SLASH + name, name, level + 1); + this->folders.push_back(folder); + this->children.push_back(folder); + + return folder; } const bool modelCDMLibrary::Refresh(std::string*& result) { + std::cout << "refreshing library: " << this->nameLibrary << std::endl; //set attributes this->type = wxDIR_DIRS; //open CMakeList - std::string pathMakeLists = path + "/CMakeLists.txt"; + std::string pathMakeLists = path + CDMUtilities::SLASH + "CMakeLists.txt"; std::ifstream confFile; confFile.open((pathMakeLists).c_str()); @@ -237,7 +236,7 @@ const bool modelCDMLibrary::Refresh(std::string*& result) if(wordBits[0] == "LIBRARY_NAME") { word = wordBits[1]; - for (int i = 2; i < wordBits.size(); i++) + for (int i = 2; i < (int)(wordBits.size()); i++) { word += " " + wordBits[i]; } @@ -262,12 +261,11 @@ const bool modelCDMLibrary::Refresh(std::string*& result) while (cont) { std::string stdfileName = crea::wx2std(fileName); - std::string folderName = stdfileName; //check if they already exist bool found = false; - for (int i = 0;!found && i < this->folders.size(); i++) + for (int i = 0; !found && i < (int)(this->folders.size()); i++) { - if (this->folders[i]->GetName() == folderName) + if (this->folders[i]->GetName() == stdfileName) { found = true; int pos = std::find(this->children.begin(), this->children.end(), this->folders[i]) - this->children.begin(); @@ -279,7 +277,7 @@ const bool modelCDMLibrary::Refresh(std::string*& result) } if(!found) { - modelCDMFolder* folder = new modelCDMFolder(this->path + "/" + stdfileName, this->level + 1); + modelCDMFolder* folder = new modelCDMFolder(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1); this->folders.push_back(folder); this->children.push_back(folder); } @@ -296,7 +294,7 @@ const bool modelCDMLibrary::Refresh(std::string*& result) { if (this->CMakeLists == NULL) { - this->CMakeLists = new modelCDMCMakeListsFile(this->path + "/" + stdfileName, this->level + 1); + this->CMakeLists = new modelCDMCMakeListsFile(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1); this->children.push_back(this->CMakeLists); } else @@ -307,11 +305,11 @@ const bool modelCDMLibrary::Refresh(std::string*& result) return false; } } - //if is an unknown file, create file + //if is an unknown file, check if exist in children else { bool found = false; - for (int i = 0; i children.size(); i++) + for (int i = 0; !found && i < (int)(this->children.size()); i++) { if (this->children[i]->GetName() == stdfileName) { @@ -324,7 +322,7 @@ const bool modelCDMLibrary::Refresh(std::string*& result) if(!found) { - modelCDMFile* file = new modelCDMFile(this->path + "/" + stdfileName, this->level + 1); + modelCDMFile* file = new modelCDMFile(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1); this->children.push_back(file); } } @@ -333,7 +331,7 @@ const bool modelCDMLibrary::Refresh(std::string*& result) } } - for (int i = 0; i < checkedFolders.size(); i++) + for (int i = 0; i < (int)(checkedFolders.size()); i++) { if(!checkedFolders[i]) { @@ -342,7 +340,7 @@ const bool modelCDMLibrary::Refresh(std::string*& result) i--; } } - for (int i = 0; i < checked.size(); i++) + for (int i = 0; i < (int)(checked.size()); i++) { if(!checked[i]) { @@ -353,5 +351,81 @@ const bool modelCDMLibrary::Refresh(std::string*& result) } } this->SortChildren(); + std::sort(this->folders.begin(), this->folders.end(), CompareNodeItem); return true; } + +void modelCDMLibrary::CheckStructure(std::map& properties) +{ + //check cmake exist + if(this->CMakeLists != NULL) + { + //set default values + properties["library " + this->name + " lib ${crea_LIBRARIES}"] = false; + properties["library " + this->name + " lib ${WXWIDGETS_LIBRARIES}"] = false; + properties["library " + this->name + " lib ${KWWidgets_LIBRARIES}"] = false; + properties["library " + this->name + " lib ${VTK_LIBRARIES}"] = false; + properties["library " + this->name + " lib ${ITK_LIBRARIES}"] = false; + properties["library " + this->name + " lib ${GDCM_LIBRARIES}"] = false; + properties["library " + this->name + " lib ${BOOST_LIBRARIES}"] = false; + + + //open cmakelists + std::ifstream confFile; + confFile.open((this->CMakeLists->GetPath()).c_str()); + + //take everything that is not commented + std::string fileContent; + + std::string word; + std::vector words; + while(confFile.is_open() && !confFile.eof()) + { + std::getline(confFile,word, '\n'); + if(word[0] != '#') + { + CDMUtilities::splitter::split(words, word, "#", CDMUtilities::splitter::empties_ok); + if (words.size() > 0) + { + word = words[0]; + CDMUtilities::splitter::split(words, word, " ", CDMUtilities::splitter::empties_ok); + for (int i = 0; i < (int)(words.size()); i++) + { + if(words[i].substr(0,2) == "//") + break; + fileContent += words[i] + " "; + } + } + } + } + + //check every instruction + std::stringstream ss(fileContent); + while(!ss.eof()) + { + std::getline(ss,word, '('); + + //check instruction name + CDMUtilities::splitter::split(words, word, " ", CDMUtilities::splitter::no_empties); + + //set instructions + if (words.size() > 0 && words[words.size()-1] == "SET") + { + std::getline(ss,word, ')'); + + CDMUtilities::splitter::split(words, word, " \t", CDMUtilities::splitter::no_empties); + if (words.size() > 1) + { + if (words[0] == "${LIBRARY_NAME}_LINK_LIBRARIES") + { + for (int i = 1; i < (int)(words.size()); i++) + { + properties["library " + this->name + " lib " + words[i]] = true; + } + } + } + } + } + + } +}