//fixing input parameters
std::vector<std::string> words;
- CDMUtilities::splitter::split(words,name," ",CDMUtilities::splitter::no_empties);
+ CDMUtilities::splitter::split(words,name," '/\"\\,.",CDMUtilities::splitter::no_empties);
std::string nameFixed = "";
for (int i = 0; i < (int)(words.size()); i++)
{
}
words.clear();
- CDMUtilities::splitter::split(words,authors," ",CDMUtilities::splitter::no_empties);
+ CDMUtilities::splitter::split(words,authors," '/\"\\,.",CDMUtilities::splitter::no_empties);
std::string authorFixed;
for (int i = 0; i < (int)(words.size()); i++)
{
words.clear();
std::string descriptionFixed;
- CDMUtilities::splitter::split(words,authorsEmail," ",CDMUtilities::splitter::no_empties);
+ CDMUtilities::splitter::split(words,authorsEmail," '/\"\\,",CDMUtilities::splitter::no_empties);
for (int i = 0; i < (int)(words.size()); i++)
{
- descriptionFixed += words[i];
+ descriptionFixed += words[i] + "/";
}
words.clear();
- CDMUtilities::splitter::split(words,description," ",CDMUtilities::splitter::no_empties);
+ CDMUtilities::splitter::split(words,description," '\"",CDMUtilities::splitter::no_empties);
for (int i = 0; i < (int)(words.size()); i++)
{
descriptionFixed += "_" + words[i];
return NULL;
}
+ //add library to project 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(bbtk_" << nameFixed << "_PKG)" << std::endl;
+ out1.close();
+ }
+
//add library to model
modelCDMPackage* package = new modelCDMPackage(this, this->path + CDMUtilities::SLASH + "bbtk_" + nameFixed + "_PKG", "bbtk_" + nameFixed + "_PKG", this->level + 1);
this->packages.push_back(package);
//TODO: adjust for windows and mac
#ifdef _WIN32
// ------ Windows
- //\\..\\IDE\\VCExpress.exe \"" + this->buildPath + CDMUtilities::SLASH + this->nameProject + ".sln\"
-// std::string command = "\"" + std::string(getenv("VS90COMNTOOLS")) + "..\\IDE\\VCExpress.exe\" \"" + this->buildPath + CDMUtilities::SLASH + this->nameProject + ".sln\" &";
- std::string command = "\"\"%VS90COMNTOOLS%..\\IDE\\VCExpress.exe\" \"" + this->buildPath + CDMUtilities::SLASH + this->nameProject + ".sln\" &\"";
- command = "start cmd.exe /k " + command + " &";
- if(0 == system(command.c_str()))
+ std::string command = "start \"\" \"" + this->buildPath + CDMUtilities::SLASH + this->nameProject + ".sln\"";
+ //wxMessageBox(crea::std2wx(command), wxT("Project Compilation - Check!"));
+ if(0 == system(command.c_str()))
return true;
else
{
- result = new std::string("An error has happened running: \"" + command + "\". Please make sure to have visual c++ express installed and to have the VS90COMNTOOLS environment variable set.");
+ result = new std::string("An error has happened running: \"" + command + "\". Please make sure to have visual c++ installed.");
return false;
}
#elif __APPLE__
return false;
}
//create plug command
- std::string plugComm = "bbPlugPackage \"" + this->buildPath + "\" > \"" + this->buildPath + CDMUtilities::SLASH + "plugging.log\" 2>&1";
- std::cout << "executing '" << plugComm << "'" << std::endl;
+ std::string plugComm = "bbPlugPackage \"" + this->buildPath + "\"";
+
+ std::string Comm = "gnome-terminal -e \"bash -c \\\"";
+ for (int i = 0; i < plugComm.size(); i++)
+ {
+ if(plugComm[i] == '"')
+ {
+ Comm+="\\\\\\\"";
+ }
+ else if(plugComm[i] == '\\')
+ {
+ Comm+="\\\\\\\\";
+ }
+ else
+ {
+ Comm.push_back(plugComm[i]);
+ }
+ }
+ Comm += "; echo -e '\\a'; bash";
+ Comm += "\\\"\"";
+
+
+ std::cout << "executing '" << Comm << "'" << std::endl;
//execute plug command
- if(system(plugComm.c_str()))
+ if(system(Comm.c_str()))
{
//if there was an error then report it
- result = new std::string("There was an error plugging the packages of the project, please check the plugging.log in the build folder file to read more about the problem.");
+ result = new std::string("There was an error plugging the packages of the project, please check the console to read more about the problem.");
return false;
}
#endif
this->packages[i]->CheckStructure(properties);
}
}
+
+bool modelCDMProject::IsPackageIncluded(const std::string& package_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 (package_name == cmlFile[i].second[pos])
+ return true;
+ break;
+ }
+ pos++;
+ }
+ }
+ }
+ }
+ return false;
+
+}
+
+bool modelCDMProject::SetPackageInclude(const std::string& package_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] == package_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 (package_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(" + package_name + ")");
+ cmlFile.push_back(element);
+ }
+
+ return CDMUtilities::writeCMLFile(this->CMakeLists->GetPath().c_str(),cmlFile);
+ }
+ return false;
+}
git://git.creatis.insa-lyon.fr / crea.git / blobdiff