Fix duplicate ware command on windows

* fixed function searching in folder to exclude folders
* added handling of pragma once for file header in stylecheck

Author: Arthoni

cmake/OpenFLUIDTestScript.cmake

@@ -219,7 +219,7 @@ MESSAGE("TEST command: ${CMD}")
 EXECUTE_PROCESS(COMMAND ${CMD}
                 RESULT_VARIABLE CMD_RESULT)
 IF(CMD_RESULT)
-  MESSAGE(FATAL_ERROR "Test error")
+  MESSAGE(FATAL_ERROR "Test error: ${CMD_RESULT}")
 ENDIF()
 
 

resources/tools/ofsrc-stylecheck.py

@@ -382,15 +382,16 @@ def checkHeaderGuard(self, Filename, Content):
 
                     ExpectedGuardName = '__OPENFLUID_'+MiddlePart+LastPart+'__'
 
-
         if ExpectedGuardName:
-            Result = re.search( r'#ifndef '+re.escape(ExpectedGuardName)+'\s*\n#define '+re.escape(ExpectedGuardName), Content)
-            if not Result:
-                self.addProblem('HGRD',Filename,1,'missing or malformed header guard definition (expected',ExpectedGuardName+')')
-
-            Result = re.search( r'#endif /\* '+re.escape(ExpectedGuardName)+ r' \*/\s*\n', Content)
-            if not Result:
-                self.addProblem('HGRD',Filename,1,'missing or malformed header guard closing')
+            ResultPragma = re.search( r'#pragma once', Content)
+            if not ResultPragma:
+                Result = re.search( r'#ifndef '+re.escape(ExpectedGuardName)+'\s*\n#define '+re.escape(ExpectedGuardName), Content)
+                if not Result:
+                    self.addProblem('HGRD',Filename,1,'missing or malformed header guard definition (expected',ExpectedGuardName+')')
+
+                Result = re.search( r'#endif /\* '+re.escape(ExpectedGuardName)+ r' \*/\s*\n', Content)
+                if not Result:
+                    self.addProblem('HGRD',Filename,1,'missing or malformed header guard closing')
 
 
 

src/openfluid/tools/StringHelpers.cpp

@@ -142,18 +142,21 @@ std::map<std::string, std::set<std::size_t>> searchInFolder(std::string Folder,
   for (const auto& E : std::filesystem::recursive_directory_iterator{Folder})
   {
     const openfluid::tools::Path FileObj = openfluid::tools::Path::fromStdPath(E.path());
-    const std::string FileContent = openfluid::tools::Filesystem::readFile(FileObj);
-    auto It = FileContent.find(String);
-
-    while (It != std::string::npos)
+    if (FileObj.isFile())
     {
-      const std::string PathString = E.path().string();
-      if (OccurencesPosByFile.find(PathString) == OccurencesPosByFile.end())
+      const std::string FileContent = openfluid::tools::Filesystem::readFile(FileObj);
+      auto It = FileContent.find(String);
+
+      while (It != std::string::npos)
       {
-        OccurencesPosByFile[PathString] = {};
+        const std::string PathString = E.path().string();
+        if (OccurencesPosByFile.find(PathString) == OccurencesPosByFile.end())
+        {
+          OccurencesPosByFile[PathString] = {};
+        }
+        OccurencesPosByFile[PathString].insert(It);
+        It = FileContent.find(String, It+String.size());
       }
-      OccurencesPosByFile[PathString].insert(It);
-      It = FileContent.find(String, It+String.size());
     }
   }
   return OccurencesPosByFile;

src/openfluid/waresdev/WareSrcFactory.cpp

@@ -387,8 +387,8 @@ void replaceInFolder(std::string Folder, std::string PreviousWareId, std::string
     // ignore .git folder and '_' prefixed folders
     const auto WareIdPos = std::find(PathParts.begin(), PathParts.end(), NewWareId);
     bool IgnoredSubDir = false;
-    for(auto It = WareIdPos; It <= PathParts.end(); It++ )
-    {
+    for(auto It = WareIdPos; It < PathParts.end(); It++ )
+    { 
       if ((*It)[0] == '_')
       {
         IgnoredSubDir = true;