X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=lib%2FcreaDevManagerLib%2FmodelCDMApplication.cpp;h=7083c4738cb9e778fc26d04cf9bb14d9f4b676d7;hb=e308b316bca88bedb8fb0aa3f4fabc33bc070b78;hp=19cc293cd8543dca53f9a74e2fdb8d5ac8ce6566;hpb=11150e550ff03ee658e90cda4b475b4c24da0a7f;p=crea.git

diff --git a/lib/creaDevManagerLib/modelCDMApplication.cpp b/lib/creaDevManagerLib/modelCDMApplication.cpp
index 19cc293..7083c47 100644
--- a/lib/creaDevManagerLib/modelCDMApplication.cpp
+++ b/lib/creaDevManagerLib/modelCDMApplication.cpp
@@ -35,6 +35,7 @@
 #include "modelCDMApplication.h"
 
 #include <fstream>
+#include <sstream>
 #include <algorithm>
 
 #include "CDMUtilities.h"
@@ -81,7 +82,7 @@ modelCDMApplication::modelCDMApplication(modelCDMIProjectTreeNode* parent, const
           if(wordBits[0] == "EXE_NAME")
             {
               word = wordBits[1];
-              for (int i = 2; i < wordBits.size(); i++)
+              for (int i = 2; i < (int)(wordBits.size()); i++)
                 {
                   word += " " + wordBits[i];
                 }
@@ -139,7 +140,7 @@ modelCDMApplication::modelCDMApplication(modelCDMIProjectTreeNode* parent, const
                       std::getline(fileStream,word,'(');
                       std::vector<std::string> wordBits;
                       CDMUtilities::splitter::split(wordBits,word," \n",CDMUtilities::splitter::no_empties);
-                      if (wordBits[wordBits.size() - 1] == "main")
+                      if (wordBits[wordBits.size() - 1] == "main" || wordBits[wordBits.size() - 1] == "IMPLEMENT_APP")
                         {
                           this->mainFile = file;
                         }
@@ -175,7 +176,7 @@ bool modelCDMApplication::SetExecutableName(const std::string& fileName, std::st
   std::vector<std::string> words;
   CDMUtilities::splitter::split(words, fileName, ", /\\\"", CDMUtilities::splitter::no_empties);
   std::string fileNameReal = words[0];
-  for (int i = 1; i < words.size(); i++)
+  for (int i = 1; i < (int)(words.size()); i++)
     {
       fileNameReal += "-" + words[i];
     }
@@ -205,7 +206,12 @@ bool modelCDMApplication::SetExecutableName(const std::string& fileName, std::st
   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 + "'.");
@@ -261,7 +267,7 @@ const bool modelCDMApplication::Refresh(std::string*& result)
           if(wordBits[0] == "EXE_NAME")
             {
               word = wordBits[1];
-              for (int i = 2; i < wordBits.size(); i++)
+              for (int i = 2; i < (int)(wordBits.size()); i++)
                 {
                   word += " " + wordBits[i];
                 }
@@ -289,7 +295,7 @@ const bool modelCDMApplication::Refresh(std::string*& result)
           std::string applicationName = stdfileName;
           //check if they already exist
           bool found = false;
-          for (int i = 0; !found && i < this->folders.size(); i++)
+          for (int i = 0; !found && i < (int)(this->folders.size()); i++)
             {
               if (this->folders[i]->GetName() == applicationName)
                 {
@@ -335,7 +341,7 @@ const bool modelCDMApplication::Refresh(std::string*& result)
           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)
                     {
@@ -357,7 +363,7 @@ const bool modelCDMApplication::Refresh(std::string*& result)
                               std::getline(fileStream,word,'(');
                               std::vector<std::string> wordBits;
                               CDMUtilities::splitter::split(wordBits,word," \n",CDMUtilities::splitter::no_empties);
-                              if (wordBits[wordBits.size() - 1] == "main")
+                              if (wordBits[wordBits.size() - 1] == "main" || wordBits[wordBits.size() - 1] == "IMPLEMENT_APP")
                                 {
                                   this->mainFile = dynamic_cast<modelCDMFile*>(children[i]);
                                 }
@@ -383,7 +389,7 @@ const bool modelCDMApplication::Refresh(std::string*& result)
                           std::getline(fileStream,word,'(');
                           std::vector<std::string> wordBits;
                           CDMUtilities::splitter::split(wordBits,word," \n",CDMUtilities::splitter::no_empties);
-                          if (wordBits[wordBits.size() - 1] == "main")
+                          if (wordBits[wordBits.size() - 1] == "main" || wordBits[wordBits.size() - 1] == "IMPLEMENT_APP")
                             {
                               this->mainFile = file;
                             }
@@ -399,7 +405,7 @@ const bool modelCDMApplication::Refresh(std::string*& result)
         }
     }
 
-  for (int i = 0; i < checkedFolders.size(); i++)
+  for (int i = 0; i < (int)(checkedFolders.size()); i++)
     {
       if(!checkedFolders[i])
         {
@@ -408,7 +414,7 @@ const bool modelCDMApplication::Refresh(std::string*& result)
           i--;
         }
     }
-  for (int i = 0; i < checked.size(); i++)
+  for (int i = 0; i < (int)(checked.size()); i++)
     {
       if(!checked[i])
         {
@@ -421,3 +427,90 @@ const bool modelCDMApplication::Refresh(std::string*& result)
   this->SortChildren();
   return true;
 }
+
+void modelCDMApplication::CheckStructure(std::map<std::string, bool>& properties)
+{
+  //check cmake exist
+  if(this->CMakeLists != NULL)
+    {
+      //set default properties
+      properties["application " + this->name + " lib ${crea_LIBRARIES}"] = false;
+      properties["application " + this->name + " lib ${WXWIDGETS_LIBRARIES}"] = false;
+      properties["application " + this->name + " lib ${KWWidgets_LIBRARIES}"] = false;
+      properties["application " + this->name + " lib ${VTK_LIBRARIES}"] = false;
+      properties["application " + this->name + " lib ${ITK_LIBRARIES}"] = false;
+      properties["application " + this->name + " lib ${GDCM_LIBRARIES}"] = false;
+      properties["application " + this->name + " lib ${BOOST_LIBRARIES}"] = 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, " \t", CDMUtilities::splitter::no_empties);
+              if (words.size() > 1)
+                {
+                  if (words[0] == "${EXE_NAME}_LINK_LIBRARIES")
+                    {
+                      for (int i = 1; i < (int)(words.size()); i++)
+                        {
+                          properties["application " + this->name + " lib " + words[i]] = true;
+                        }
+                    }
+                }
+            }
+          else if (words.size() > 0 && words[words.size()-1] == "INCLUDE_DIRECTORIES")
+            {
+              std::getline(ss,word, ')');
+
+              CDMUtilities::splitter::split(words, word, " \t", CDMUtilities::splitter::no_empties);
+
+              for (int i = 0; i < (int)(words.size()); i++)
+                {
+                  properties["application " + this->name + " dir " + words[i]] = true;
+                }
+
+
+            }
+        }
+
+    }
+}