X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FcreaDevManagerLib%2FmodelCDMLib.cpp;h=38cd30df188cdf8a06faf7c326f9272d7ad5380c;hb=5a17d994576296f2a5a85f3a01ad5631786a0c56;hp=57411ec64f340fc70288a41e9d364eb33904831c;hpb=6a43a8cc1e5216f06e41799fbe154b2b1ef6d44b;p=crea.git

diff --git a/lib/creaDevManagerLib/modelCDMLib.cpp b/lib/creaDevManagerLib/modelCDMLib.cpp
index 57411ec..38cd30d 100644
--- a/lib/creaDevManagerLib/modelCDMLib.cpp
+++ b/lib/creaDevManagerLib/modelCDMLib.cpp
@@ -121,12 +121,28 @@ const std::vector<modelCDMLibrary*>& modelCDMLib::GetLibraries() const
 }
 
 modelCDMLibrary* modelCDMLib::CreateLibrary(
-    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 library folder with new name
+#ifdef _WIN32
+	std::string copyCommand = "xcopy \"" + this->path + CDMUtilities::SLASH + "template_lib\" \"" + this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "\" /Y";
+#else
   std::string copyCommand = "cp -r \"" + this->path + CDMUtilities::SLASH + "template_lib\" \"" + this->path + CDMUtilities::SLASH + name + "\"";
+#endif
   if(system(copyCommand.c_str()))
     {
       result = new std::string("An error occurred while running '" + copyCommand + "'.");
@@ -150,13 +166,26 @@ modelCDMLibrary* modelCDMLib::CreateLibrary(
   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 + "'.");
       return NULL;
     }
 
+  //add library to lib 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(" << name << ")" << std::endl;
+      out1.close();
+    }
+
+
   //add library to model
   modelCDMLibrary* library = new modelCDMLibrary(this, this->path + CDMUtilities::SLASH + name, name, this->level + 1);
   this->libraries.push_back(library);
@@ -378,3 +407,122 @@ void modelCDMLib::CheckStructure(std::map<std::string, bool>& properties)
       this->libraries[i]->CheckStructure(properties);
     }
 }
+
+bool modelCDMLib::IsLibraryIncluded(const std::string& library_name)
+{
+  if(this->HasCMakeLists())
+    {
+      std::ifstream CMFile(this->CMakeLists->GetPath().c_str());
+      if (CMFile.is_open())
+        {
+          std::string line;
+          while(!CMFile.eof())
+            {
+              std::getline(CMFile, line);
+              while(line[0]==' ')
+                line.erase(0,1);
+              if(line[0] != '#')
+                {
+                  std::vector<std::string> lineSeg;
+                  CDMUtilities::splitter::split(lineSeg,line,"()",CDMUtilities::splitter::no_empties);
+                  if(lineSeg.size() > 0 && lineSeg[0] == "ADD_SUBDIRECTORY" && lineSeg[1] == library_name)
+                    {
+                      CMFile.close();
+                      return true;
+                    }
+                }
+            }
+          CMFile.close();
+        }
+    }
+  return false;
+}
+
+bool modelCDMLib::SetLibraryInclude(const std::string& library_name, const bool& toInclude)
+{
+  if (this->HasCMakeLists())
+    {
+      std::ifstream CMFile(this->CMakeLists->GetPath().c_str());
+      if (CMFile.is_open())
+        {
+          std::stringstream outs;
+          std::string line;
+          bool found = false;
+          while(!CMFile.eof())
+            {
+              std::getline(CMFile, line);
+              if (CMFile.eof()) {
+                break;
+              }
+              if(line != "")
+                {
+                  std::vector<std::string> segs;
+                  CDMUtilities::splitter::split(segs, line, " ", CDMUtilities::splitter::no_empties);
+                  //is comment
+                  if(segs.size() > 0 && segs[0][0] == '#')
+                    {
+                      if(toInclude)
+                        {
+                          CDMUtilities::splitter::split(segs, line, " #()", CDMUtilities::splitter::no_empties);
+                          if (segs.size() > 1 && segs[0] == "ADD_SUBDIRECTORY" && segs[1] == library_name)
+                            {
+                              found = true;
+                              outs << "ADD_SUBDIRECTORY(" << library_name << ")\n";
+                            }
+                          else
+                            outs << line << "\n";
+                        }
+                      else
+                        {
+                          outs << line << "\n";
+                        }
+                    }
+                  //is not comment
+                  else
+                    {
+                      if (segs.size() > 0 && !toInclude)
+                        {
+                          CDMUtilities::splitter::split(segs, line, " ()", CDMUtilities::splitter::no_empties);
+                          if (segs.size() > 1 && segs[0] == "ADD_SUBDIRECTORY" && segs[1] == library_name)
+                            {
+                              outs << "#" << line << "\n";
+                            }
+                          else
+                            {
+                              outs << line << "\n";
+                            }
+                        }
+                      else
+                        {
+                          CDMUtilities::splitter::split(segs, line, " ()", CDMUtilities::splitter::no_empties);
+                          if (segs.size() > 1 && segs[0] == "ADD_SUBDIRECTORY" && segs[1] == library_name)
+                            {
+                              found = true;
+                            }
+                          outs << line << "\n";
+                        }
+                    }
+                }
+              else
+                {
+                  outs << "\n";
+                }
+
+            }
+
+          CMFile.close();
+
+          if(!found && toInclude)
+            outs << "ADD_SUBDIRECTORY(" << library_name << ")\n";
+
+          std::ofstream CMFileOut(this->CMakeLists->GetPath().c_str());
+          if (CMFileOut.is_open())
+            {
+              CMFileOut << outs.rdbuf();
+              CMFileOut.close();
+              return true;
+            }
+        }
+    }
+  return false;
+}