Feature #1711 CreaDevManager application implementation

Change feature: Now reading third party libraries in pkgs, libraries, application using Regular Expressions

diff --git a/lib/creaDevManagerLib/CDMUtilities.cpp b/lib/creaDevManagerLib/CDMUtilities.cpp
index 77f5f52cb7b199ec3efb419551f6b7cea640b80a..d67ec36f54feb879c81fdbbda2040ee7caaebc98 100644 (file)
--- a/lib/creaDevManagerLib/CDMUtilities.cpp
+++ b/lib/creaDevManagerLib/CDMUtilities.cpp
@@ -356,6 +356,23 @@ namespace CDMUtilities
        return res;
   }
 
+  std::string readFile(const std::string& file_path)
+  {
+    std::string res;
+    std::ifstream file(file_path.c_str());
+    if (file.is_open())
+      {
+        char ch = file.get();
+        while (!file.eof())
+          {
+            res.push_back(ch);
+            ch = file.get();
+          }
+        file.close();
+      }
+    return res;
+  }
+
   CMLFile readCMLFile(const std::string& file_path)
   {
     CMLFile res;
@@ -506,4 +523,14 @@ namespace CDMUtilities
     return false;
   }
 
+  void
+  normalizeStr(std::string& st)
+  {
+    while(st.size() && isspace(st[0]))
+      st.erase(0,1);
+    while(st.size() && isspace(st[st.size()-1]))
+      st.erase(st.size()-1,1);
+    return;
+  }
+
 }

diff --git a/lib/creaDevManagerLib/CDMUtilities.h b/lib/creaDevManagerLib/CDMUtilities.h
index f807d3262b59df22e837f09a8d71834e28655a02..e245450c831aaed17ad39616d0ffdab7881b8e4e 100644 (file)
--- a/lib/creaDevManagerLib/CDMUtilities.h
+++ b/lib/creaDevManagerLib/CDMUtilities.h
@@ -198,6 +198,13 @@ namespace CDMUtilities
    */
   typedef std::vector<syntaxElement> CMLFile;
 
+  /**
+   * Reads a file as string and returns the read data.
+   * @param file_path Full path of the CMakeLists file.
+   * @return A string with the contents of the given file.
+   */
+  std::string readFile(const std::string& file_path);
+
   /**
    * Reads a CMakeLists file and returns the read data.
    * @param file_path Full path of the CMakeLists file.
@@ -213,6 +220,11 @@ namespace CDMUtilities
    */
   bool writeCMLFile(const std::string& file_path, const CMLFile& data);
 
+  /**
+   * @param st Strips all space character at the beginning and at the end of the string.
+   */
+  void normalizeStr(std::string& st);
+
 };
 
 #endif /* CDMUTILITIES_H_ */

diff --git a/lib/creaDevManagerLib/modelCDMApplication.cpp b/lib/creaDevManagerLib/modelCDMApplication.cpp
index f7f7431bdd3af8cec850e6974767f13031f28ac3..c0d3b4620195ea526fef79d41b3960a7d321e898 100644 (file)
--- a/lib/creaDevManagerLib/modelCDMApplication.cpp
+++ b/lib/creaDevManagerLib/modelCDMApplication.cpp
@@ -559,37 +559,40 @@ std::map<std::string, bool> modelCDMApplication::Get3rdPartyLibraries()
 
   if (this->HasCMakeLists())
     {
-      CDMUtilities::CMLFile cmlFile = CDMUtilities::readCMLFile(this->CMakeLists->GetPath().c_str());
-      // look at every syntax element
-      for (int i = 0; i < cmlFile.size(); ++i)
+
+      std::string CMfile = CDMUtilities::readFile(this->CMakeLists->GetPath().c_str());
+
+      boost::regex expression("^\\h*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{EXE_NAME\\}_LINK_LIBRARIES(([\\s]|#[^\\n]*\\n)+([\\$\\{\\}\\w\\d]+|\"(?:[^\"\\\\]|\\\\.)*\"))*([\\s]|#[^\\n]*\\n)*\\)");
+      std::string::const_iterator start, end;
+      start = CMfile.begin();
+      end = CMfile.end();
+      boost::match_results<std::string::const_iterator> what;
+      boost::match_flag_type flags = boost::match_default;
+      if(boost::regex_search(start, end, what, expression, flags))
         {
-          // if the element is a command and is a SET command
-          if (cmlFile[i].first == "command" && cmlFile[i].second[0] == "SET")
+
+          expression = boost::regex("^\\h*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{EXE_NAME\\}_LINK_LIBRARIES");
+          std::string::const_iterator start1, end1;
+          start1 = what[0].first;
+          end1 = what[0].second;
+          boost::match_results<std::string::const_iterator> what1;
+          if(boost::regex_search(start1, end1, what1, expression, flags))
             {
-              // search first parameter
-              int pos = 1;
-              while (pos < cmlFile[i].second.size())
+              expression = boost::regex("(#[^\\n]*\\n|\\s*\\$\\{\\w+\\})");
+              std::string::const_iterator start2, end2;
+              start2 = what1[0].second;
+              end2 = what[0].second;
+              boost::match_results<std::string::const_iterator> what2;
+              while(boost::regex_search(start2, end2, what2, expression, flags))
                 {
-                  // see if it is ${LIBRARY_NAME}_LINK_LIBRARIES
-                  if (cmlFile[i].second[pos] == "${EXE_NAME}_LINK_LIBRARIES")
-                    {
-                      pos++;
-                      // look for all the third party libraries included
-                      while (pos < cmlFile[i].second.size())
-                        {
-                          if (cmlFile[i].second[pos][0] == '$' && correspondence.find(cmlFile[i].second[pos]) != correspondence.end())
-                            {
-                              res[correspondence[cmlFile[i].second[pos]]] = true;
-                            }
-                          pos++;
-                        }
-                    }
-                  // if it is the first parameter but is not ${LIBRARY_NAME}_LINK_LIBRARIES then finish with this command
-                  else if (!isspace(cmlFile[i].second[pos][0]) && cmlFile[i].second[pos][0] != '#' && cmlFile[i].second[pos][0] != '(' && cmlFile[i].second[pos][0] != ')')
+                  if(what2.str()[0] != '#')
                     {
-                      break;
+                      std::string dete = what2.str();
+                      CDMUtilities::normalizeStr(dete);
+                      if(correspondence.find(dete) != correspondence.end())
+                        res[correspondence[dete]] = true;
                     }
-                  pos++;
+                  start2 = what2[0].second;
                 }
             }
         }

diff --git a/lib/creaDevManagerLib/modelCDMLibrary.cpp b/lib/creaDevManagerLib/modelCDMLibrary.cpp
index fd0e08420b0236889bc8bfbea6ded9d2d3b181c0..8567a6eba3b8b13069965812042822787e111123 100644 (file)
--- a/lib/creaDevManagerLib/modelCDMLibrary.cpp
+++ b/lib/creaDevManagerLib/modelCDMLibrary.cpp
@@ -37,6 +37,7 @@
 #include <fstream>
 #include <sstream>
 #include <algorithm>
+#include <boost/regex.hpp>
 
 #include "CDMUtilities.h"
 #include "creaWx.h"
@@ -455,37 +456,39 @@ std::map<std::string, bool> modelCDMLibrary::Get3rdPartyLibraries()
 
   if (this->HasCMakeLists())
     {
-      CDMUtilities::CMLFile cmlFile = CDMUtilities::readCMLFile(this->CMakeLists->GetPath().c_str());
-      // look at every syntax element
-      for (int i = 0; i < cmlFile.size(); ++i)
+      std::string CMfile = CDMUtilities::readFile(this->CMakeLists->GetPath().c_str());
+
+      boost::regex expression("^\\h*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{LIBRARY_NAME\\}_LINK_LIBRARIES(([\\s]|#[^\\n]*\\n)+([\\$\\{\\}\\w\\d]+|\"(?:[^\"\\\\]|\\\\.)*\"))*([\\s]|#[^\\n]*\\n)*\\)");
+      std::string::const_iterator start, end;
+      start = CMfile.begin();
+      end = CMfile.end();
+      boost::match_results<std::string::const_iterator> what;
+      boost::match_flag_type flags = boost::match_default;
+      if(boost::regex_search(start, end, what, expression, flags))
         {
-          // if the element is a command and is a SET command
-          if (cmlFile[i].first == "command" && cmlFile[i].second[0] == "SET")
+
+          expression = boost::regex("^\\h*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{LIBRARY_NAME\\}_LINK_LIBRARIES");
+          std::string::const_iterator start1, end1;
+          start1 = what[0].first;
+          end1 = what[0].second;
+          boost::match_results<std::string::const_iterator> what1;
+          if(boost::regex_search(start1, end1, what1, expression, flags))
             {
-              // search first parameter
-              int pos = 1;
-              while (pos < cmlFile[i].second.size())
+              expression = boost::regex("(#[^\\n]*\\n|\\s*\\$\\{\\w+\\})");
+              std::string::const_iterator start2, end2;
+              start2 = what1[0].second;
+              end2 = what[0].second;
+              boost::match_results<std::string::const_iterator> what2;
+              while(boost::regex_search(start2, end2, what2, expression, flags))
                 {
-                  // see if it is ${LIBRARY_NAME}_LINK_LIBRARIES
-                  if (cmlFile[i].second[pos] == "${LIBRARY_NAME}_LINK_LIBRARIES")
-                    {
-                      pos++;
-                      // look for all the third party libraries included
-                      while (pos < cmlFile[i].second.size())
-                        {
-                          if (cmlFile[i].second[pos][0] == '$' && correspondence.find(cmlFile[i].second[pos]) != correspondence.end())
-                            {
-                              res[correspondence[cmlFile[i].second[pos]]] = true;
-                            }
-                          pos++;
-                        }
-                    }
-                  // if it is the first parameter but is not ${LIBRARY_NAME}_LINK_LIBRARIES then finish with this command
-                  else if (!isspace(cmlFile[i].second[pos][0]) && cmlFile[i].second[pos][0] != '#' && cmlFile[i].second[pos][0] != '(' && cmlFile[i].second[pos][0] != ')')
+                  if(what2.str()[0] != '#')
                     {
-                      break;
+                      std::string dete = what2.str();
+                      CDMUtilities::normalizeStr(dete);
+                      if(correspondence.find(dete) != correspondence.end())
+                        res[correspondence[dete]] = true;
                     }
-                  pos++;
+                  start2 = what2[0].second;
                 }
             }
         }

diff --git a/lib/creaDevManagerLib/modelCDMPackage.cpp b/lib/creaDevManagerLib/modelCDMPackage.cpp
index c6ea443d6d516e0e00b72c65cefe38f3c7f4ef79..147953b1f61e9e55f0e799af47398248ac7f548b 100644 (file)
--- a/lib/creaDevManagerLib/modelCDMPackage.cpp
+++ b/lib/creaDevManagerLib/modelCDMPackage.cpp
@@ -37,6 +37,7 @@
 #include <fstream>
 #include <sstream>
 #include <algorithm>
+#include <boost/regex.hpp>
 
 #include "creaWx.h"
 #include "wx/dir.h"
@@ -711,44 +712,31 @@ std::map<std::string, bool> modelCDMPackage::Get3rdPartyLibraries()
 
   if (this->HasCMakeLists())
     {
-      CDMUtilities::CMLFile cmlFile = CDMUtilities::readCMLFile(this->CMakeLists->GetPath().c_str());
-      // look at every syntax element
-      for (int i = 0; i < cmlFile.size(); ++i)
+      std::string CMfile = CDMUtilities::readFile(this->CMakeLists->GetPath().c_str());
+
+      boost::regex expression("^\\h*SET([\\s]|#[^\\n]*\\n)*\\(([\\s]|#[^\\n]*\\n)*\\$\\{BBTK_PACKAGE_NAME\\}_USE_\\w+\\s+ON");
+      std::string::const_iterator start, end;
+      start = CMfile.begin();
+      end = CMfile.end();
+      boost::match_results<std::string::const_iterator> what;
+      boost::match_flag_type flags = boost::match_default;
+      while(boost::regex_search(start, end, what, expression, flags))
         {
-          // if the element is a command and is a SET command
-          if (cmlFile[i].first == "command" && cmlFile[i].second[0] == "SET")
+          std::cout << what[0].str() << std::endl;
+          boost::regex expression1 = boost::regex("\\$\\{BBTK_PACKAGE_NAME\\}_USE_\\w+");
+          std::string::const_iterator start1, end1;
+          start1 = what[0].first;
+          end1 = what[0].second;
+          boost::match_results<std::string::const_iterator> what1;
+          if(boost::regex_search(start1, end1, what1, expression1, flags))
             {
-              // search first parameter
-              int pos = 1;
-              while (pos < cmlFile[i].second.size())
-                {
-                  if (!isspace(cmlFile[i].second[pos][0]) && cmlFile[i].second[pos][0] != '#' && cmlFile[i].second[pos][0] != '(' && cmlFile[i].second[pos][0] != ')')
-                    {
-                      break;
-                    }
-                  pos++;
-                }
-              // if the first parameter is a third party statement
-              if (pos < cmlFile[i].second.size() && correspondence.find(cmlFile[i].second[pos]) != correspondence.end())
-                {
-                  std::string foundLibrary = cmlFile[i].second[pos];
-                  // search for second parameter
-                  pos++;
-                  while (pos < cmlFile[i].second.size())
-                    {
-                      if (!isspace(cmlFile[i].second[pos][0]) && cmlFile[i].second[pos][0] != '#' && cmlFile[i].second[pos][0] != '(' && cmlFile[i].second[pos][0] != ')')
-                        {
-                          break;
-                        }
-                      pos++;
-                    }
-                  // if the second parameter is ON
-                  if (pos < cmlFile[i].second.size() && cmlFile[i].second[pos] == "ON")
-                    {
-                      res[correspondence[foundLibrary]] = true;
-                    }
-                }
+              std::string dete = what1.str();
+              CDMUtilities::normalizeStr(dete);
+              std::cout << dete << std::endl;
+              if(correspondence.find(dete) != correspondence.end())
+                res[correspondence[dete]] = true;
             }
+          start = what[0].second;
         }
     }
   return res;