in.close();
out.close();
//delete old file and rename new file
+#ifdef _WIN32
+ std::string renameCommand = "move /Y \"" + this->path + CDMUtilities::SLASH + "CMakeLists.txt.tmp\" \"" + this->path + CDMUtilities::SLASH + "CMakeLists.txt\"";
+#else
std::string renameCommand = "mv \"" + this->path + CDMUtilities::SLASH + "CMakeLists.txt.tmp\" \"" + this->path + CDMUtilities::SLASH + "CMakeLists.txt\"";
+#endif
if(system(renameCommand.c_str()))
{
result = new std::string("An error occurred while running '" + renameCommand + "'.");
//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];
//call project to create package : use bbCreatePackage <path> <name> [author] [description]
std::string creationCommand = "bbCreatePackage \"" + this->path + "\" \"" + nameFixed + "\" \"" + authorFixed + "\" \"" + descriptionFixed + "\"";
//TODO: bbCreatePackage script always returning 0. It should return 1 or greater if any error
- if(system(creationCommand.c_str()))
+ bool resultCommand = 0 != system(creationCommand.c_str());
+#ifdef _WIN32
+ resultCommand = false;
+#endif
+ if(resultCommand)
{
result = new std::string("An error occurred while running '" + creationCommand + "'.");
return NULL;
modelCDMIProjectTreeNode* modelCDMProject::CreateApplication(
const std::string& name,
+ const int& type,
std::string*& result,
const std::string& path
)
{
if(this->appli != NULL)
{
- return this->appli->CreateApplication(name, result);
+ return this->appli->CreateApplication(name, type, result);
}
result = new std::string("there is no appli folder in this project.");
return NULL;
//TODO: adjust for windows and mac
#ifdef _WIN32
// ------ Windows
+ if(0 == system("cmake-gui"))
+ return true;
+ else
+ {
+ result = new std::string("There was an error opening cmake-gui. Please make sure it's installed and that cmake's bin folder is in the system path.");
+ return false;
+ }
#elif __APPLE__
// ------ Apple
#else
//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()))
+ 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.");
+ return false;
+ }
#elif __APPLE__
// ------ Apple
#else
return true;
}
-bool modelCDMProject::Connect(std::string*& result)
+bool modelCDMProject::Connect(std::string*& result, const std::string& folder)
{
- //TODO: adjust for windows and mac
+ //TODO: adjust for mac
#ifdef _WIN32
// ------ Windows
+ //open binary folder
+ wxDir dir(crea::std2wx(folder));
+
+ //if binary folder can't be opened then return false
+ if (!dir.IsOpened())
+ {
+ result = new std::string("The path could not be opened. Make sure the folder exists and contains a bbtkPackage file.");
+ return false;
+ }
+ //create plug command
+ std::string plugComm = "bbPlugPackage \"" + folder + "\"";
+ std::cout << "executing '" << plugComm << "'" << std::endl;
+ //execute plug command
+ if(system(std::string("start cmd.exe /k \"" + plugComm + "\"").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 console to read more about the problem.");
+ return false;
+ }
#elif __APPLE__
// ------ Apple
#else
// ------ Linux
//open binary folder
- wxDir dir(crea::std2wx((this->buildPath).c_str()));
+ wxDir dir(crea::std2wx(folder));
//if binary folder can't be opened then return false
if (!dir.IsOpened())
{
- result = new std::string("The build path could not be opened. Make sure to configure the project before compiling it");
+ result = new std::string("The path could not be opened. Make sure the folder exists and contains a bbtkPackage file.");
return false;
}
//create plug command
if(system(plugComm.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 console to read more about the problem.");
+ 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.");
return false;
}
#endif