}
modelCDMProject::modelCDMProject(
+ modelCDMIProjectTreeNode* parent,
const std::string& path,
const std::string& name,
const std::string& buildPath
)
{
+ std::cout << "creating project: " + name + " in " + path + "\n";
+ this->parent = parent;
this->path = CDMUtilities::fixPath(path);
//open makelists file
std::string pathFixed(CDMUtilities::fixPath(path));
CDMUtilities::splitter::split(nameBits, word, " ", CDMUtilities::splitter::no_empties);
this->name = this->nameProject = "";
- for (int i = 0; i < nameBits.size(); i++)
+ for (int i = 0; i < (int)(nameBits.size()); i++)
{
if(i != 0)
this->name += " ";
//if appli, create appli
if(stdfileName == "appli")
{
- this->appli = new modelCDMAppli(pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
+ this->appli = new modelCDMAppli(this, pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
this->children.push_back(this->appli);
}
//if lib, create lib
else if(stdfileName == "lib")
{
- this->lib = new modelCDMLib(pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
+ this->lib = new modelCDMLib(this, pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
this->children.push_back(this->lib);
}
//if package , create package
else if(stdfileName.size() > 9 && stdfileName.substr(0,5) == "bbtk_" && stdfileName.substr(stdfileName.size()-4,4) == "_PKG")
{
- modelCDMPackage* package = new modelCDMPackage(pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
+ modelCDMPackage* package = new modelCDMPackage(this, pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
this->packages.push_back(package);
this->children.push_back(package);
}
//if is an unknown folder, create folder
else
{
- this->children.push_back(new modelCDMFolder(pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1));
+ this->children.push_back(new modelCDMFolder(this, pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1));
}
cont = dir.GetNext(&fileName);
//if CMakeLists, create CMakeLists
if(stdfileName == "CMakeLists.txt")
{
- this->CMakeLists = new modelCDMCMakeListsFile(pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
+ this->CMakeLists = new modelCDMCMakeListsFile(this, pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
this->children.push_back(this->CMakeLists);
}
else
{
- this->children.push_back(new modelCDMFile(pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1));
+ this->children.push_back(new modelCDMFile(this, pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1));
}
//if is an unknown file, create file
cont = dir.GetNext(&fileName);
}
this->SortChildren();
+ std::sort(this->packages.begin(), this->packages.end(), CompareNodeItem);
}
return this->lib;
}
+std::string modelCDMProject::GetBuildInstruction() const
+{
+ std::string makeComm = "make -C \"" + this->buildPath + "\""; /*> \"" + this->buildPath + CDMUtilities::SLASH + "building.log\" 2>&1";*/
+ return makeComm;
+}
+
bool modelCDMProject::SetVersion(const std::string& version, std::string*& result)
{
CDMUtilities::splitter::split(vers, version, " .", CDMUtilities::splitter::no_empties);
time_t now = time(0);
- tm* ltm = localtime(&now);
+
+ tm ltm;
+#ifdef _WIN32
+ localtime_s(<m, &now);
+#else
+ ltm = *(localtime(&now));
+#endif
std::stringstream date;
- date << ltm->tm_mday << "/" << 1 + ltm->tm_mon << "/" << 1900 + ltm->tm_year;
+ date << ltm.tm_mday << "/" << 1 + ltm.tm_mon << "/" << 1900 + ltm.tm_year;
//set name of library in CMakeLists inside copied folder
std::string line;
else if(line.find("SET(PROJECT_BUILD_VERSION") != std::string::npos)
line = "SET(PROJECT_BUILD_VERSION " + vers[2] + ")";
else if(line.find("SET(PROJECT_VERSION_DATE") != std::string::npos)
- line = "SET(PROJECT_VERSION_DATE \"" + date.str() + "\")";
+ line = "SET(PROJECT_VERSION_DATE \"" + date.str() + "\")";
out << line << std::endl;
}
in.close();
CDMUtilities::splitter::split(words,name," ",CDMUtilities::splitter::no_empties);
std::string nameFixed = "";
- for (int i = 0; i < words.size(); i++)
+ for (int i = 0; i < (int)(words.size()); i++)
{
nameFixed += words[i];
}
words.clear();
CDMUtilities::splitter::split(words,authors," ",CDMUtilities::splitter::no_empties);
std::string authorFixed;
- for (int i = 0; i < words.size(); i++)
+ for (int i = 0; i < (int)(words.size()); i++)
{
authorFixed += words[i];
}
words.clear();
std::string descriptionFixed;
CDMUtilities::splitter::split(words,authorsEmail," ",CDMUtilities::splitter::no_empties);
- for (int i = 0; i < words.size(); i++)
+ for (int i = 0; i < (int)(words.size()); i++)
{
descriptionFixed += words[i];
}
words.clear();
CDMUtilities::splitter::split(words,description," ",CDMUtilities::splitter::no_empties);
- for (int i = 0; i < words.size(); i++)
+ for (int i = 0; i < (int)(words.size()); i++)
{
descriptionFixed += "_" + words[i];
}
}
//add library to model
- modelCDMPackage* package = new modelCDMPackage(this->path + CDMUtilities::SLASH + "bbtk_" + nameFixed + "_PKG", "bbtk_" + nameFixed + "_PKG", this->level + 1);
+ modelCDMPackage* package = new modelCDMPackage(this, this->path + CDMUtilities::SLASH + "bbtk_" + nameFixed + "_PKG", "bbtk_" + nameFixed + "_PKG", this->level + 1);
this->packages.push_back(package);
this->children.push_back(package);
CDMUtilities::splitter::split(nameBits, word, " ", CDMUtilities::splitter::no_empties);
this->name = this->nameProject = "";
- for (int i = 0; i < nameBits.size(); i++)
+ for (int i = 0; i < (int)(nameBits.size()); i++)
{
if(i != 0)
this->name += " ";
{
if (this->appli == NULL)
{
- this->appli = new modelCDMAppli(this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
+ this->appli = new modelCDMAppli(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
this->children.push_back(this->appli);
}
else
{
if (this->lib == NULL)
{
- this->lib = new modelCDMLib(this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
+ this->lib = new modelCDMLib(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
this->children.push_back(this->lib);
}
else
//if package , create package
else if(stdfileName.size() > 9 && stdfileName.substr(0,5) == "bbtk_" && stdfileName.substr(stdfileName.size()-4,4) == "_PKG")
{
- std::string packageName = stdfileName.substr(5, stdfileName.size()-9);
bool found = false;
- for (int i = 0;!found && i < this->packages.size(); i++)
+ for (int i = 0; !found && i < (int)(this->packages.size()); i++)
{
- if (this->packages[i]->GetName() == packageName)
+ if (this->packages[i]->GetName() == stdfileName)
{
found = true;
int pos = std::find(this->children.begin(), this->children.end(), this->packages[i]) - this->children.begin();
}
if(!found)
{
- modelCDMPackage* package = new modelCDMPackage(this->path + CDMUtilities::SLASH + stdfileName, stdfileName,this->level + 1);
+ modelCDMPackage* package = new modelCDMPackage(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
this->packages.push_back(package);
this->children.push_back(package);
}
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)
{
if(!found)
{
- modelCDMFolder* folder = new modelCDMFolder(this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
+ modelCDMFolder* folder = new modelCDMFolder(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
this->children.push_back(folder);
}
}
{
if (this->CMakeLists == NULL)
{
- this->CMakeLists = new modelCDMCMakeListsFile(this->path + CDMUtilities::SLASH + stdfileName, 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 + CDMUtilities::SLASH + stdfileName, 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 < checkedPackages.size(); i++)
+ for (int i = 0; i < (int)(checkedPackages.size()); i++)
{
if(!checkedPackages[i])
{
i--;
}
}
- for (int i = 0; i < checked.size(); i++)
+ for (int i = 0; i < (int)(checked.size()); i++)
{
if(!checked[i])
{
i--;
}
}
+
this->SortChildren();
+ std::sort(this->packages.begin(), this->packages.end(), CompareNodeItem);
return true;
}
bool modelCDMProject::ConfigureBuild(std::string*& result)
{
- //TODO: implement method
+ //TODO: adjust for windows and mac
+#ifdef _WIN32
+ // ------ Windows
+#elif __APPLE__
+ // ------ Apple
+#else
+ // ------ Linux
+ //open binary folder
+ wxDir dir(crea::std2wx((this->buildPath).c_str()));
+
+ //if folder doesn't exist then create it
+ if (!dir.IsOpened())
+ {
+ //create command line to create folder
+ std::string createComm = "mkdir \"" + this->buildPath + "\"";
+ //execute creation command
+ if (system(createComm.c_str()))
+ {
+ //if there was an error then report it
+ result = new std::string("There was an error creating the build path: \"" + this->buildPath + "\"");
+ return false;
+ }
+ }
+ //create command line to execute ccmake
+ //TODO:: adjust for different Linux distributions
+ std::string confComm = "gnome-terminal --tab --working-directory=\"" + this->buildPath + "\" -e \"ccmake '" + this->path + "'\"";
+ //execute command
+ if(CDMUtilities::openTerminal(confComm))
+ {
+ //if there was an error then report it
+ result = new std::string("There was an error opening the configuration tool in the desired place.");
+ return false;
+ }
+#endif
return true;
}
-bool modelCDMProject::Build(std::string*& result)
+bool modelCDMProject::Build(std::string*& result, const std::string& line)
{
- //TODO: implement method
+ //TODO: adjust for windows and mac
+#ifdef _WIN32
+ // ------ Windows
+#elif __APPLE__
+ // ------ Apple
+#else
+ // ------ Linux
+ //open binary folder
+ wxDir dir(crea::std2wx((this->buildPath).c_str()));
+
+ //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");
+ return false;
+ }
+ //create make command
+ std::string makeComm = "gnome-terminal -e \"bash -c \\\"";
+ for (int i = 0; i < line.size(); i++)
+ {
+ if(line[i] == '"')
+ {
+ makeComm+="\\\\\\\"";
+ }
+ else if(line[i] == '\\')
+ {
+ makeComm+="\\\\\\\\";
+ }
+ else
+ {
+ makeComm.push_back(line[i]);
+ }
+ }
+ makeComm += "; echo -e '\\a'; bash";
+ makeComm += "\\\"\"";
+
+ std::cout << "executing '" << makeComm << "'" << std::endl;
+ //execute make command
+ if(system(makeComm.c_str()))
+ {
+ //if there was an error then report it
+ result = new std::string("There was an error compiling the project, please check the \"building.log\" file located in the build folder to read more about the problem.");
+ return false;
+ }
+#endif
return true;
}
bool modelCDMProject::Connect(std::string*& result)
{
- //TODO: implement method
+ //TODO: adjust for windows and mac
+#ifdef _WIN32
+ // ------ Windows
+#elif __APPLE__
+ // ------ Apple
+#else
+ // ------ Linux
+ //open binary folder
+ wxDir dir(crea::std2wx((this->buildPath).c_str()));
+
+ //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");
+ 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;
+ //execute 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.");
+ return false;
+ }
+#endif
return true;
}
+
+void modelCDMProject::CheckStructure(std::map<std::string, bool>& properties)
+{
+ //check cmake exist
+ if(this->CMakeLists != NULL)
+ {
+ //set properties parameters based on model
+ properties["project add appli"] = this->appli != NULL;
+ properties["project add lib"] = this->lib != NULL;
+ for (int i = 0; i < (int)(this->packages.size()); i++)
+ properties["project add " + packages[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);
+
+ //set instructions
+ if (words.size() > 0 && words[words.size()-1] == "SET")
+ {
+ std::getline(ss,word, ')');
+
+ CDMUtilities::splitter::split(words, word, " ", CDMUtilities::splitter::no_empties);
+ if (words.size() > 1)
+ {
+ if (words[0] == "USE_CREA" && words[1] == "ON")
+ {
+ properties["project set USE_CREA"] = true;
+ }
+ else if (words[0] == "USE_GDCM" && words[1] == "ON")
+ {
+ properties["project set USE_GDCM"] = true;
+ }
+ else if (words[0] == "USE_GDCM_VTK" && words[1] == "ON")
+ {
+ properties["project set USE_GDCM_VTK"] = true;
+ }
+ else if (words[0] == "USE_GDCM2" && words[1] == "ON")
+ {
+ properties["project set USE_GDCM2"] = true;
+ }
+ else if (words[0] == "USE_WXWIDGETS" && words[1] == "ON")
+ {
+ properties["project set USE_WXWIDGETS"] = true;
+ }
+ else if (words[0] == "USE_KWWIDGETS" && words[1] == "ON")
+ {
+ properties["project set USE_KWWIDGETS"] = true;
+ }
+ else if (words[0] == "USE_VTK" && words[1] == "ON")
+ {
+ properties["project set USE_VTK"] = true;
+ }
+ else if (words[0] == "USE_ITK" && words[1] == "ON")
+ {
+ properties["project set USE_ITK"] = true;
+ }
+ else if (words[0] == "USE_BOOST" && words[1] == "ON")
+ {
+ properties["project set USE_BOOST"] = true;
+ }
+ }
+ }
+ //add instructions
+ else 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)
+ {
+ if(words[0] == "appli")
+ {
+ properties["project add "+words[0]] = this->appli != NULL;
+ }
+ else if(words[0] == "lib")
+ {
+ properties["project add "+words[0]] = this->lib != NULL;
+ }
+ else
+ {
+ properties["project add "+words[0]] = true;
+ }
+ }
+ }
+ }
+
+ }
+
+ //check appli's structure
+ this->appli->CheckStructure(properties);
+ //check lib's structure
+ this->lib->CheckStructure(properties);
+ //check packages' structure
+ for (int i = 0; i < (int)(this->packages.size()); i++)
+ {
+ properties["package " + this->packages[i]->GetName()] = true;
+ this->packages[i]->CheckStructure(properties);
+ }
+}
git://git.creatis.insa-lyon.fr / crea.git / blobdiff