}
modelCDMLibrary* modelCDMLib::CreateLibrary(
- const std::string& name,
+ const std::string& namein,
std::string*& result
)
{
+ std::vector<std::string> words;
+ CDMUtilities::splitter::split(words,namein," '/\\*\"%",CDMUtilities::splitter::no_empties);
+ std::string name;
+ for (int i = 0; i < (int)(words.size()); i++)
+ {
+ name += words[i];
+ }
+ if (name == "")
+ {
+ result = new std::string("The given name is not valid: '/\\*\"% are forbidden.");
+ return NULL;
+ }
//copy template library folder with new name
+#ifdef _WIN32
+ std::string copyCommand = "xcopy \"" + this->path + CDMUtilities::SLASH + "template_lib\" \"" + this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "\" /Y";
+#else
std::string copyCommand = "cp -r \"" + this->path + CDMUtilities::SLASH + "template_lib\" \"" + this->path + CDMUtilities::SLASH + name + "\"";
+#endif
if(system(copyCommand.c_str()))
{
result = new std::string("An error occurred while running '" + copyCommand + "'.");
in.close();
out.close();
//delete old file and rename new file
+#ifdef _WIN32
+ std::string renameCommand = "move /Y \"" + this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt.tmp\" \"" + this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt\"";
+#else
std::string renameCommand = "mv \"" + this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt.tmp\" \"" + this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt\"";
+#endif
if(system(renameCommand.c_str()))
{
result = new std::string("An error occurred while running '" + renameCommand + "'.");
return NULL;
}
+ //add library to lib CMakeLists
+ std::fstream out1((this->path + CDMUtilities::SLASH + "CMakeLists.txt").c_str(), std::fstream::in | std::fstream::out | std::fstream::app);
+ if (out1.is_open())
+ {
+ out1 << "ADD_SUBDIRECTORY(" << name << ")" << std::endl;
+ out1.close();
+ }
+
+
//add library to model
modelCDMLibrary* library = new modelCDMLibrary(this, this->path + CDMUtilities::SLASH + name, name, this->level + 1);
this->libraries.push_back(library);
std::string libraryName = stdfileName;
//check if library already exist
bool found = false;
- for (int i = 0; !found && i < this->libraries.size(); i++)
+ for (int i = 0; !found && i < (int)(this->libraries.size()); i++)
{
if (this->libraries[i]->GetName() == libraryName)
{
{
//check if folder already exist
bool found = false;
- for (int i = 0; !found && i < this->children.size(); i++)
+ for (int i = 0; !found && i < (int)(this->children.size()); i++)
{
if (this->children[i]->GetName() == stdfileName)
{
else
{
bool found = false;
- for (int i = 0; !found && i < this->children.size(); i++)
+ for (int i = 0; !found && i < (int)(this->children.size()); i++)
{
if (this->children[i]->GetName() == stdfileName)
{
}
}
- for (int i = 0; i < checkedLibraries.size(); i++)
+ for (int i = 0; i < (int)(checkedLibraries.size()); i++)
{
if(!checkedLibraries[i])
{
i--;
}
}
- for (int i = 0; i < checked.size(); i++)
+ for (int i = 0; i < (int)(checked.size()); i++)
{
if(!checked[i])
{
if(this->CMakeLists != NULL)
{
//set properties parameters based on model
- for (int i = 0; i < this->libraries.size(); i++)
+ for (int i = 0; i < (int)(this->libraries.size()); i++)
properties["lib add " + libraries[i]->GetName()] = false;
//open cmakelists
{
word = words[0];
CDMUtilities::splitter::split(words, word, " ", CDMUtilities::splitter::empties_ok);
- for (int i = 0; i < words.size(); i++)
+ for (int i = 0; i < (int)(words.size()); i++)
{
if(words[i].substr(0,2) == "//")
break;
}
//check libraries' structure
- for (int i = 0; i < this->libraries.size(); i++)
+ for (int i = 0; i < (int)(this->libraries.size()); i++)
{
properties["library " + this->libraries[i]->GetName()] = true;
this->libraries[i]->CheckStructure(properties);
}
}
+
+bool modelCDMLib::IsLibraryIncluded(const std::string& library_name)
+{
+ if (this->HasCMakeLists())
+ {
+ CDMUtilities::CMLFile cmlFile = CDMUtilities::readCMLFile(this->CMakeLists->GetPath().c_str());
+ for (int i = 0; i < cmlFile.size(); ++i)
+ {
+ if (cmlFile[i].first=="command" && cmlFile[i].second[0] == "ADD_SUBDIRECTORY")
+ {
+ 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] != '#')
+ {
+ if (library_name == cmlFile[i].second[pos])
+ return true;
+ break;
+ }
+ pos++;
+ }
+ }
+ }
+ }
+ return false;
+}
+
+bool modelCDMLib::SetLibraryInclude(const std::string& library_name, const bool& toInclude)
+{
+ if (this->HasCMakeLists())
+ {
+ CDMUtilities::CMLFile cmlFile = CDMUtilities::readCMLFile(this->CMakeLists->GetPath().c_str());
+
+ bool found = false;
+
+ for (int i = 0; i < cmlFile.size(); ++i)
+ {
+ if(toInclude && cmlFile[i].first == "comment")
+ {
+ std::vector<std::string> segments;
+ std::string line = cmlFile[i].second[0];
+ while(line[0] == '#')
+ line.erase(0,1);
+
+ CDMUtilities::splitter::split(segments, line, " ()", CDMUtilities::splitter::no_empties);
+ if (segments.size() > 1 && segments[0] == "ADD_SUBDIRECTORY" && segments[1] == library_name)
+ {
+ found = true;
+ while(cmlFile[i].second[0][0] == '#')
+ cmlFile[i].second[0].erase(0,1);
+ }
+ }
+ else if(cmlFile[i].first == "command" && cmlFile[i].second[0] == "ADD_SUBDIRECTORY")
+ {
+ 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] != '#')
+ {
+ if (library_name == cmlFile[i].second[pos])
+ {
+ found = true;
+ if (!toInclude)
+ {
+ cmlFile[i].first = "comment";
+ cmlFile[i].second[0] = "#" + cmlFile[i].second[0];
+ while (cmlFile[i].second.size() > 1)
+ {
+ cmlFile[i].second[0] += cmlFile[i].second[1];
+ cmlFile[i].second.erase(cmlFile[i].second.begin()+1);
+ }
+
+ }
+ }
+ break;
+ }
+ pos++;
+ }
+ }
+ }
+ if (!found && toInclude)
+ {
+ CDMUtilities::syntaxElement element;
+ element.first = "command";
+ element.second.push_back("ADD_SUBDIRECTORY(" + library_name + ")");
+ cmlFile.push_back(element);
+ }
+
+ return CDMUtilities::writeCMLFile(this->CMakeLists->GetPath().c_str(),cmlFile);
+ }
+ return false;
+}