Trying to fix stale files not updated again

Author: Neko-Box-Coder

Examples/test.cpp

@@ -136,7 +136,7 @@ int main(int argc, char* argv[])
     #else
         auto re = System2CppRun("ls -lah", commandInfo);
     #endif
-    System2CppGetCommandReturnValueSync(commandInfo, returnCode);
+    System2CppGetCommandReturnValueSync(commandInfo, returnCode, false);
 
     for(int i = 0; i < argc; ++i)
         std::cout << "Arg" << i << ": " << argv[i] << std::endl;

Examples/test_static.cpp

@@ -136,7 +136,7 @@ int main(int argc, char* argv[])
     #else
         auto re = System2CppRun("ls -lah", commandInfo);
     #endif
-    System2CppGetCommandReturnValueSync(commandInfo, returnCode);
+    System2CppGetCommandReturnValueSync(commandInfo, returnCode, false);
 
     for(int i = 0; i < argc; ++i)
         std::cout << "Arg" << i << ": " << argv[i] << std::endl;

Include/runcpp2/PipelineSteps.hpp

@@ -134,6 +134,7 @@ namespace runcpp2
     using SourceIncludeMap = std::unordered_map<std::string, std::vector<ghc::filesystem::path>>;
 
     bool GatherFilesIncludes(   const std::vector<ghc::filesystem::path>& sourceFiles,
+                                const std::vector<bool>& sourceHasCache,
                                 const std::vector<ghc::filesystem::path>& includePaths,
                                 SourceIncludeMap& outSourceIncludes);
 }

Src/runcpp2/IncludeManager.cpp

@@ -115,6 +115,9 @@ namespace runcpp2
         std::error_code e;
         ghc::filesystem::file_time_type sourceTime = ghc::filesystem::last_write_time(sourceFile, e);
 
+        ssLOG_DEBUG("sourceTime: " << sourceTime.time_since_epoch().count());
+        ssLOG_DEBUG("recordTime: " << recordTime.time_since_epoch().count());
+        
         if(sourceTime > recordTime)
         {
             ssLOG_DEBUG("Source file newer than include record");

Src/runcpp2/PipelineSteps.cpp

@@ -1267,17 +1267,29 @@ bool runcpp2::GatherIncludePaths(   const ghc::filesystem::path& scriptDirectory
 }
 
 bool runcpp2::GatherFilesIncludes(  const std::vector<ghc::filesystem::path>& sourceFiles,
+                                    const std::vector<bool>& sourceHasCache,
                                     const std::vector<ghc::filesystem::path>& includePaths,
                                     SourceIncludeMap& outSourceIncludes)
 {
     ssLOG_FUNC_INFO();
     INTERNAL_RUNCPP2_SAFE_START();
 
+    if(sourceFiles.size() != sourceHasCache.size())
+    {
+        ssLOG_ERROR("Size of sourceFiles and sourceHasCache not matching");
+        return false;
+    }
+    
     outSourceIncludes.clear();
-    std::unordered_set<std::string> visitedFiles;
 
-    for(const ghc::filesystem::path& source : sourceFiles)
+    for(int i = 0; i < sourceFiles.size(); ++i)
     {
+        if(sourceHasCache.at(i))
+            continue;
+        
+        const ghc::filesystem::path& source = sourceFiles.at(i);
+        
+        std::unordered_set<std::string> visitedFiles;
         ssLOG_INFO("Gathering includes for " << source.string());
 
         std::vector<ghc::filesystem::path>& currentIncludes = outSourceIncludes[source.string()];

Src/runcpp2/runcpp2.cpp

@@ -120,6 +120,15 @@ namespace
                 bool useCache = currentObjectWriteTime > currentSourceWriteTime &&
                                 currentObjectWriteTime > currentIncludeWriteTime &&
                                 !outdatedIncludeRecord;
+                
+                ssLOG_DEBUG("currentObjectWriteTime: " << 
+                            currentObjectWriteTime.time_since_epoch().count());
+                ssLOG_DEBUG("currentSourceWriteTime: " << 
+                            currentSourceWriteTime.time_since_epoch().count());
+                ssLOG_DEBUG("currentIncludeWriteTime: " << 
+                            currentIncludeWriteTime.time_since_epoch().count());
+                ssLOG_DEBUG("outdatedIncludeRecord: " << outdatedIncludeRecord);
+                
                 if(useCache)
                 {
                     ssLOG_INFO("Using cache for " << sourceFiles.at(i).string());
@@ -578,14 +587,14 @@ runcpp2::StartPipeline( const std::string& scriptPath,
         }
 
         runcpp2::SourceIncludeMap sourcesIncludes;
-        if(!runcpp2::GatherFilesIncludes(sourceFiles, includePaths, sourcesIncludes))
+        if(!runcpp2::GatherFilesIncludes(sourceFiles, sourceHasCache, 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))
             {
+                ssLOG_DEBUG("Updating include record for " << sourceFiles.at(i).string());
                 if(sourcesIncludes.count(sourceFiles.at(i)) == 0)
                 {
                     ssLOG_WARNING(  "Includes not gathered for " << 
@@ -607,6 +616,8 @@ runcpp2::StartPipeline( const std::string& scriptPath,
                     return PipelineResult::UNEXPECTED_FAILURE;
                 }
             }
+            else
+                ssLOG_DEBUG("Include record for " << sourceFiles.at(i).string() << " is up to date");
         }
 
         std::vector<std::string> linkFilesPaths;