Feature #1711 CreaDevManager application implementation

[crea.git] / lib / creaDevManagerLib / modelCDMApplication.cpp

diff --git a/lib/creaDevManagerLib/modelCDMApplication.cpp b/lib/creaDevManagerLib/modelCDMApplication.cpp
index 56c9e08bbae20cdb00db5e66d2042c61c0368bd3..1a9c3ad4c8c1f84e3d9658397948c4d912d072a6 100644 (file)
--- a/lib/creaDevManagerLib/modelCDMApplication.cpp
+++ b/lib/creaDevManagerLib/modelCDMApplication.cpp
@@ -82,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];
                 }
@@ -140,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;
                         }
@@ -176,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];
     }
@@ -206,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 + "'.");
@@ -262,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];
                 }
@@ -290,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)
                 {
@@ -336,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)
                     {
@@ -358,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]);
                                 }
@@ -384,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;
                             }
@@ -400,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])
         {
@@ -409,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])
         {
@@ -456,7 +461,7 @@ void modelCDMApplication::CheckStructure(std::map<std::string, bool>& properties
                 {
                   word = words[0];
                   CDMUtilities::splitter::split(words, word, " ", CDMUtilities::splitter::empties_ok);
-                  for (int i = 0; i < words.size(); i++)
+                  for (int i = 0; i < (int)(words.size()); i++)
                     {
                       if(words[i].substr(0,2) == "//")
                         break;
@@ -485,7 +490,7 @@ void modelCDMApplication::CheckStructure(std::map<std::string, bool>& properties
                 {
                   if (words[0] == "${EXE_NAME}_LINK_LIBRARIES")
                     {
-                      for (int i = 1; i < words.size(); i++)
+                      for (int i = 1; i < (int)(words.size()); i++)
                         {
                           properties["application " + this->name + " lib " + words[i]] = true;
                         }
@@ -498,7 +503,7 @@ void modelCDMApplication::CheckStructure(std::map<std::string, bool>& properties
 
               CDMUtilities::splitter::split(words, word, " \t", CDMUtilities::splitter::no_empties);
 
-              for (int i = 0; i < words.size(); i++)
+              for (int i = 0; i < (int)(words.size()); i++)
                 {
                   properties["application " + this->name + " dir " + words[i]] = true;
                 }
@@ -509,3 +514,27 @@ void modelCDMApplication::CheckStructure(std::map<std::string, bool>& properties
 
     }
 }
+
+std::map<std::string, bool> modelCDMApplication::Get3rdPartyLibraries()
+{
+  std::map<std::string, bool> res;
+  res["Test"] = false;
+  return res;
+}
+
+bool modelCDMApplication::Set3rdPartyLibrary(const std::string& library_name, const bool& toInclude)
+{
+  return false;
+}
+
+std::map<std::string, bool> modelCDMApplication::GetCustomLibraries()
+{
+  std::map<std::string, bool> res;
+  res["Test"] = false;
+  return res;
+}
+
+bool modelCDMApplication::SetCustomLibrary(const std::string& library_name, const bool& toInclude)
+{
+  return false;
+}