#include <iostream>
#include <fstream>
+#include <sstream>
#include <algorithm>
#include "CDMUtilities.h"
{
}
-modelCDMAppli::modelCDMAppli(const std::string& path, const int& level)
+modelCDMAppli::modelCDMAppli(modelCDMIProjectTreeNode* parent, const std::string& path, const std::string& name, const int& level)
{
+ std::cout << "creating appli\n";
+ this->parent = parent;
this->type = wxDIR_DIRS;
- this->name = "appli";
+ this->name = name;
this->level = level;
this->path = path;
{
std::string stdfileName = crea::wx2std(fileName);
- modelCDMApplication* application = new modelCDMApplication(pathFixed + "/" + stdfileName, this->level + 1);
- this->applications.push_back(application);
- this->children.push_back(application);
+ if(stdfileName != "template_appli" && stdfileName != "template_wx_appli")
+ {
+ modelCDMApplication* application = new modelCDMApplication(this, pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
+ this->applications.push_back(application);
+ this->children.push_back(application);
+ }
+ else
+ {
+ modelCDMFolder* folder = new modelCDMFolder(this, pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
+ this->children.push_back(folder);
+ }
cont = dir.GetNext(&fileName);
}
//if CMakeLists, create CMakeLists
if(stdfileName == "CMakeLists.txt")
{
- this->CMakeLists = new modelCDMCMakeListsFile(pathFixed + "/" + stdfileName, this->level + 1);
+ this->CMakeLists = new modelCDMCMakeListsFile(this, pathFixed + 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(pathFixed + "/" + stdfileName, this->level + 1));
+ this->children.push_back(new modelCDMFile(this, pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1));
}
cont = dir.GetNext(&fileName);
}
this->SortChildren();
+ std::sort(this->applications.begin(), this->applications.end(), CompareNodeItem);
}
modelCDMAppli::~modelCDMAppli()
modelCDMApplication* modelCDMAppli::CreateApplication(
const std::string& name,
- std::string*& result,
- const std::string& path
+ std::string*& result
)
{
//copy template application folder with new name
- //TODO: fix for windows
- std::string copyCommand = "cp -r " + this->path + "/template_appli " + this->path + "/" + name;
+ std::string copyCommand = "cp -r \"" + this->path + CDMUtilities::SLASH + "template_appli\" \"" + this->path + CDMUtilities::SLASH + name + "\"";
if(system(copyCommand.c_str()))
{
result = new std::string("An error occurred while running '" + copyCommand + "'.");
}
//set name of library in CMakeLists inside copied folder
std::string line;
- std::ifstream in((this->path + "/" + name + "/CMakeLists.txt").c_str());
+ std::ifstream in((this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt").c_str());
if( !in.is_open())
{
result = new std::string("CMakeLists.txt file failed to open.");
return NULL;
}
- std::ofstream out((this->path + "/" + name + "/CMakeLists.txt.tmp").c_str());
+ std::ofstream out((this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt.tmp").c_str());
while (getline(in, line))
{
if(line == "SET ( EXE_NAME MyExe )")
in.close();
out.close();
//delete old file and rename new file
- std::string renameCommand = "mv " + this->path + "/" + name + "/CMakeLists.txt.tmp " + this->path + "/" + name + "/CMakeLists.txt";
+ std::string renameCommand = "mv \"" + this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt.tmp\" \"" + this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt\"";
if(system(renameCommand.c_str()))
{
result = new std::string("An error occurred while running '" + renameCommand + "'.");
}
//add application to model
- //TODO: fix for windows
- modelCDMApplication* application = new modelCDMApplication(this->path + "/" + name, this->level + 1);
+ modelCDMApplication* application = new modelCDMApplication(this, this->path + CDMUtilities::SLASH + name, name, this->level + 1);
this->applications.push_back(application);
this->children.push_back(application);
this->SortChildren();
- result = new std::string(this->path + "/" + name);
+ result = new std::string(this->path + CDMUtilities::SLASH + name);
return application;
}
{
std::cout << "refreshing appli" << std::endl;
this->type = wxDIR_DIRS;
- this->name = "appli";
- this->level = level;
- this->path = path;
-
-
std::vector<bool> checked(this->children.size(), false);
std::vector<bool> checkedApplications(this->applications.size(), false);
while (cont)
{
std::string stdfileName = crea::wx2std(fileName);
- std::string applicationName = stdfileName;
- //check if they already exist
- bool found = false;
- for (int i = 0;!found && i < this->applications.size(); i++)
+
+ if(stdfileName != "template_appli" && stdfileName != "template_wx_appli")
{
- if (this->applications[i]->GetName() == applicationName)
+ std::string applicationName = stdfileName;
+ //check if application already exist
+ bool found = false;
+ for (int i = 0; !found && i < (int)(this->applications.size()); i++)
{
- found = true;
- int pos = std::find(this->children.begin(), this->children.end(), this->applications[i]) - this->children.begin();
- checked[pos] = true;
- checkedApplications[i] = true;
- if(!this->applications[i]->Refresh(result))
- return false;
+ if (this->applications[i]->GetName() == applicationName)
+ {
+ found = true;
+ int pos = std::find(this->children.begin(), this->children.end(), this->applications[i]) - this->children.begin();
+ checked[pos] = true;
+ checkedApplications[i] = true;
+ if(!this->applications[i]->Refresh(result))
+ return false;
+ }
+ }
+ if(!found)
+ {
+ modelCDMApplication* application= new modelCDMApplication(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
+ this->applications.push_back(application);
+ this->children.push_back(application);
}
}
- if(!found)
+ else
{
- modelCDMApplication* application= new modelCDMApplication(this->path + "/" + stdfileName, this->level + 1);
- this->applications.push_back(application);
- this->children.push_back(application);
+ //check if folder already exist
+ bool found = false;
+ for (int i = 0; !found && i < (int)(this->children.size()); i++)
+ {
+ if (this->children[i]->GetName() == stdfileName)
+ {
+ found = true;
+ checked[i] = true;
+
+ if(!this->children[i]->Refresh(result))
+ return false;
+ }
+ }
+ if(!found)
+ {
+ modelCDMFolder* folder= new modelCDMFolder(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
+ this->children.push_back(folder);
+ }
}
cont = dir.GetNext(&fileName);
}
{
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
else
{
bool found = false;
- for (int i = 0; i <!found && this->children.size(); i++)
+ for (int i = 0; !found && i < (int)(this->children.size()); i++)
{
if (this->children[i]->GetName() == stdfileName)
{
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);
}
}
}
}
- for (int i = 0; i < checkedApplications.size(); i++)
+ for (int i = 0; i < (int)(checkedApplications.size()); i++)
{
if(!checkedApplications[i])
{
i--;
}
}
- for (int i = 0; i < checked.size(); i++)
+ for (int i = 0; i < (int)(checked.size()); i++)
{
if(!checked[i])
{
}
}
this->SortChildren();
+ std::sort(this->applications.begin(), this->applications.end(), CompareNodeItem);
return true;
}
+
+void modelCDMAppli::CheckStructure(std::map<std::string, bool>& properties)
+{
+ //check cmake exist
+ if(this->CMakeLists != NULL)
+ {
+ //set properties parameters based on model
+ for (int i = 0; i < (int)(this->applications.size()); i++)
+ properties["appli add " + this->applications[i]->GetName()] = 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<std::string> 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);
+
+ //add instructions
+ if (words.size() > 0 && words[words.size()-1] == "ADD_SUBDIRECTORY")
+ {
+ std::getline(ss,word, ')');
+ //std::cout << word << std::endl;
+ CDMUtilities::splitter::split(words, word, " ", CDMUtilities::splitter::no_empties);
+
+ if (words.size() > 0)
+ {
+ {
+ properties["appli add " + words[0]] = true;
+ }
+ }
+ }
+ }
+
+ }
+
+ //check libraries' structure
+ for (int i = 0; i < (int)(this->applications.size()); i++)
+ {
+ properties["application " + this->applications[i]->GetName()] = true;
+ this->applications[i]->CheckStructure(properties);
+ }
+}
git://git.creatis.insa-lyon.fr / crea.git / blobdiff