}
modelCDMApplication* modelCDMAppli::CreateApplication(
- 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 application folder with new name
+#ifdef _WIN32
+ std::string copyCommand = "xcopy \"" + this->path + CDMUtilities::SLASH + "template_appli\" \"" + this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "\" /Y";
+#else
std::string copyCommand = "cp -r \"" + this->path + CDMUtilities::SLASH + "template_appli\" \"" + 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 + "'.");
std::string applicationName = stdfileName;
//check if application already exist
bool found = false;
- for (int i = 0; !found && i < this->applications.size(); i++)
+ for (int i = 0; !found && i < (int)(this->applications.size()); i++)
{
if (this->applications[i]->GetName() == applicationName)
{
{
//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 < 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])
{
if(this->CMakeLists != NULL)
{
//set properties parameters based on model
- for (int i = 0; i < this->applications.size(); i++)
+ for (int i = 0; i < (int)(this->applications.size()); i++)
properties["appli add " + this->applications[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->applications.size(); i++)
+ for (int i = 0; i < (int)(this->applications.size()); i++)
{
properties["application " + this->applications[i]->GetName()] = true;
this->applications[i]->CheckStructure(properties);