Ignore version extension

Author: Neko-Box-Coder

Include/runcpp2/PlatformUtil.hpp

@@ -9,6 +9,14 @@
 #include <unordered_map>
 #include <vector>
 
+namespace ghc
+{
+    namespace filesystem
+    {
+        class path;
+    }
+}
+
 namespace runcpp2
 {
     std::string ProcessPath(const std::string& path);
@@ -55,6 +63,8 @@ namespace runcpp2
 
         return nullptr;
     }
+    
+    std::string GetFileExtensionWithoutVersion(const ghc::filesystem::path& path);
 }
 
 #endif

Src/runcpp2/CompilingLinking.cpp

@@ -406,11 +406,10 @@ namespace
             for(int i = 0; i < objectsFilesPaths.size(); ++i)
             {
                 ssLOG_DEBUG("Trying to link " << objectsFilesPaths.at(i));
+                using namespace runcpp2;
 
                 //Check if this is a file we can link
-                std::string extension = objectsFilesPaths.at(i).extension();
-                
-                using namespace runcpp2;
+                std::string extension = GetFileExtensionWithoutVersion(objectsFilesPaths.at(i));
                 Data::DependencyLibraryType currentLinkType = Data::DependencyLibraryType::COUNT;
 
                 if(!HasValueFromPlatformMap(profile.FilesTypes.ObjectLinkFile.Extension))

Src/runcpp2/DependenciesHelper.cpp

@@ -637,7 +637,7 @@ bool runcpp2::GatherDependenciesBinaries(   const std::vector<Data::DependencyIn
                         continue;
 
                     std::string currentFileName = it.path().stem().string();
-                    std::string currentExtension = it.path().extension().string();
+                    std::string currentExtension = runcpp2::GetFileExtensionWithoutVersion(it.path());
 
                     ssLOG_DEBUG("currentFileName: " << currentFileName);
                     ssLOG_DEBUG("currentExtension: " << currentExtension);

Src/runcpp2/PlatformUtil.cpp

@@ -1,7 +1,9 @@
 #include "runcpp2/PlatformUtil.hpp"
 
 #include "ssLogger/ssLog.hpp"
+#include "ghc/filesystem.hpp"
 #include <stdio.h>
+#include <cctype>
 
 namespace
 {
@@ -156,3 +158,26 @@ bool runcpp2::RunCommandAndGetOutput(   const std::string& command,
         return message;
     }
 #endif
+
+std::string runcpp2::GetFileExtensionWithoutVersion(const ghc::filesystem::path& path)
+{
+    std::string filename = path.filename().string();
+    bool inNumericPart = true;
+    int lastDotPos = filename.length();
+    
+    for(int i = filename.length() - 1; i >= 0; --i)
+    {
+        if(filename[i] == '.')
+        {
+            if(!inNumericPart)
+                return filename.substr(i, lastDotPos - i);
+            
+            inNumericPart = true;
+            lastDotPos = i;
+        }
+        else if(!std::isdigit(filename[i]))
+            inNumericPart = false;
+    }
+    
+    return "";
+}

Src/runcpp2/runcpp2.cpp

@@ -905,7 +905,7 @@ runcpp2::StartPipeline( const std::string& scriptPath,
         for(int i = 0; i < gatheredBinariesPaths.size(); ++i)
         {
             ghc::filesystem::path filePath(gatheredBinariesPaths.at(i));
-            std::string extension = filePath.extension().string();
+            std::string extension = runcpp2::GetFileExtensionWithoutVersion(filePath);
 
             //Check if the file is a link file based on its extension
             if(linkExtensions.find(extension) != linkExtensions.end())