Fixing records not being updated in certain conditions

Author: Neko-Box-Coder

Src/runcpp2/runcpp2.cpp

@@ -352,6 +352,13 @@ runcpp2::CheckSourcesNeedUpdate(    const std::string& scriptPath,
 
     //Initialize BuildsManager and IncludeManager
     ghc::filesystem::path configDir = GetConfigFilePath();
+    configDir = configDir.parent_path();
+    if(!ghc::filesystem::is_directory(configDir, e))
+    {
+        ssLOG_FATAL("Unexpected path for config directory: " << configDir.string());
+        return PipelineResult::INVALID_CONFIG_PATH;
+    }
+    
     ghc::filesystem::path buildDir;
     BuildsManager buildsManager("/tmp");
     IncludeManager includeManager;
@@ -581,27 +588,7 @@ runcpp2::StartPipeline( const std::string& scriptPath,
         ghc::filesystem::file_time_type finalObjectWriteTime;
 
         if(currentOptions.count(runcpp2::CmdOptions::RESET_CACHE) > 0 || recompileNeeded)
-        {
             sourceHasCache = std::vector<bool>(sourceFiles.size(), false);
-            
-            //Update the include records
-            {
-                runcpp2::SourceIncludeMap sourcesIncludes;
-                if(!runcpp2::GatherFilesIncludes(sourceFiles, includePaths, sourcesIncludes))
-                    return PipelineResult::UNEXPECTED_FAILURE;
-                
-                for(auto it = sourcesIncludes.cbegin(); it != sourcesIncludes.cend(); ++it)
-                {
-                    ssLOG_DEBUG("Updating include record for " << it->first);
-                    if(!includeManager.WriteIncludeRecord(  ghc::filesystem::path(it->first),
-                                                            it->second))
-                    {
-                        ssLOG_ERROR("Failed to write include record for " << it->first);
-                        return PipelineResult::UNEXPECTED_FAILURE;
-                    }
-                }
-            }
-        }
         else if(!HasCompiledCache(  absoluteScriptPath,
                                     sourceFiles, 
                                     buildDir, 
@@ -616,6 +603,34 @@ runcpp2::StartPipeline( const std::string& scriptPath,
             return PipelineResult::UNEXPECTED_FAILURE;
         }
 
+        //Update the include records
+        {
+            runcpp2::SourceIncludeMap sourcesIncludes;
+            if(!runcpp2::GatherFilesIncludes(sourceFiles, includePaths, sourcesIncludes))
+                return PipelineResult::UNEXPECTED_FAILURE;
+            
+            for(int i = 0; i < sourceFiles.size(); ++i)
+            {
+                ssLOG_DEBUG("Updating include record for " << sourceFiles.at(i).string());
+                if(!sourceHasCache.at(i))
+                {
+                    if(sourcesIncludes.count(sourceFiles.at(i)) == 0)
+                    {
+                        ssLOG_WARNING("Includes not gathered for " << sourceFiles.at(i).string());
+                        continue;
+                    }
+                    
+                    if(!includeManager.WriteIncludeRecord(  sourceFiles.at(i),
+                                                            sourcesIncludes.at(sourceFiles.at(i))))
+                    {
+                        ssLOG_ERROR("Failed to write include record for " << 
+                                    sourceFiles.at(i).string());
+                        return PipelineResult::UNEXPECTED_FAILURE;
+                    }
+                }
+            }
+        }
+        
         std::vector<std::string> linkFilesPaths;
         SeparateDependencyFiles(profiles.at(profileIndex).FilesTypes, 
                                 gatheredBinariesPaths,