Adding debug logs and renaming variables

Author: Neko-Box-Coder

Src/runcpp2/CompilingLinking.cpp

@@ -14,6 +14,8 @@ namespace
                         bool compileAsExecutable,
                         std::string& outScriptObjectFilePath)
     {
+        ssLOG_FUNC_DEBUG();
+        
         std::string scriptDirectory = ghc::filesystem::path(scriptPath).parent_path().string();
         std::string scriptName = ghc::filesystem::path(scriptPath).stem().string();
         std::string runcpp2ScriptDir = runcpp2::ProcessPath(scriptDirectory + "/.runcpp2");
@@ -236,6 +238,8 @@ namespace
                     bool linkAsExecutable,
                     const std::string& exeExt)
     {
+        ssLOG_FUNC_DEBUG();
+        
         std::string scriptName = ghc::filesystem::path(scriptPath).stem().string();
         std::string linkCommand;
 
@@ -409,19 +413,19 @@ namespace
 
         for(int i = 0; i < copiedDependenciesBinariesPaths.size(); ++i)
         {
-            size_t foundIndex = copiedDependenciesBinariesPaths[i].find_last_of(".");
+            size_t extensionFoundIndex = copiedDependenciesBinariesPaths[i].find_last_of(".");
 
-            if( foundIndex == std::string::npos &&
+            if( extensionFoundIndex == std::string::npos &&
                 !runcpp2::GetValueFromPlatformMap(profile.SharedLinkFile.Extension)->empty() &&
                 !runcpp2::GetValueFromPlatformMap(profile.StaticLinkFile.Extension)->empty())
             {
                 continue;
             }
 
             //Check if this is a file we can link
-            if(foundIndex != std::string::npos)
+            if(extensionFoundIndex != std::string::npos)
             {
-                std::string extension = copiedDependenciesBinariesPaths[i].substr(foundIndex);
+                std::string extension = copiedDependenciesBinariesPaths[i].substr(extensionFoundIndex);
 
                 if( extension != *runcpp2::GetValueFromPlatformMap(profile.SharedLinkFile.Extension) &&
                     extension != *runcpp2::GetValueFromPlatformMap(profile.StaticLinkFile.Extension))
@@ -611,4 +615,4 @@ bool runcpp2::CompileAndLinkScript( const std::string& scriptPath,
     }
 
     return true;
-}
+}

Src/runcpp2/DependenciesSetupHelper.cpp

@@ -526,12 +526,12 @@ bool runcpp2::CopyDependenciesBinaries( const std::string& scriptPath,
                 std::string currentSearchLibraryName = searchProperty.SearchLibraryNames.at(j);
                 std::string currentSearchDirectory = searchProperty.SearchDirectories.at(k);
 
-                ssLOG_DEBUG("currentSearchDirectory: " << currentSearchDirectory);
-                ssLOG_DEBUG("currentSearchLibraryName: " << currentSearchLibraryName);
-            
                 if(!ghc::filesystem::path(currentSearchDirectory).is_absolute())
                     currentSearchDirectory = dependenciesCopiesPaths[i] + "/" + currentSearchDirectory;
 
+                ssLOG_DEBUG("currentSearchDirectory: " << currentSearchDirectory);
+                ssLOG_DEBUG("currentSearchLibraryName: " << currentSearchLibraryName);
+            
                 std::error_code _;
                 if( !ghc::filesystem::exists(currentSearchDirectory, _) || 
                     !ghc::filesystem::is_directory(currentSearchDirectory, _))