Moving local functions to cpp, adding TODOs

Author: Neko-Box-Coder

CMakeLists.txt

@@ -21,6 +21,7 @@ add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/filesystem")
 # =========================================================================
 # Generate yaml files as c
 # =========================================================================
+# TODO(NOW): Use target instead 
 if(RUNCPP2_UPDATE_DEFAULT_YAMLS)
     add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/Embed2C")
     include("${CMAKE_CURRENT_LIST_DIR}/External/Embed2C/embedFile.cmake")

DefaultYAMLs/DefaultCompilerProfiles.yaml

@@ -79,6 +79,10 @@ CompilerProfiles:
             # {LinkFlags}, {OutputFile}, {ObjectFile} will be replaced accordingly
             OutputPart: "{LinkFlags} -o {OutputFile} {ObjectFile}"
 
+            # TODO(NOW):    If the thing we want to link is libabc.a (or .so)
+            #               -l either accepts -labc or -l:abc.a
+            
             # Syntax for linking each dependency. 
+            # TODO(NOW): Rename to {DependencyFile}
             # {DependencyName} will be replaced accordingly
-            DependenciesPart: "-l{DependencyName}"
+            DependenciesPart: "-l:{DependencyName}"

Include/runcpp2/runcpp2.hpp

@@ -16,8 +16,6 @@ namespace runcpp2
         COUNT
     };
 
-    bool CreateRuncpp2ScriptDirectory(const std::string& scriptPath);
-
     //--------------------------------------------
     //Running
     //--------------------------------------------
@@ -26,9 +24,6 @@ namespace runcpp2
                     const std::string& configPreferredProfile,
                     const std::unordered_map<CmdOptions, std::string> currentOptions,
                     const std::vector<std::string>& runArgs);
-
-
-
 }
 
 

Src/runcpp2/CompilerProfileHelper.cpp

@@ -63,8 +63,10 @@ namespace
                                     const std::string& scriptPath)
     {
         std::string scriptExtension = ghc::filesystem::path(scriptPath).extension().string();
+        if(!scriptExtension.empty())
+            scriptExtension.erase(0, 1);
 
-        if(profile.FileExtensions.find(scriptExtension.substr(1)) == profile.FileExtensions.end())
+        if(profile.FileExtensions.find(scriptExtension) == profile.FileExtensions.end())
             return false;
 
         if(!scriptInfo.Language.empty())

Src/runcpp2/CompilingLinking.cpp

@@ -172,6 +172,7 @@ namespace
         if(statusCode != 0)
         {
             ssLOG_ERROR("Compile command returned with non-zero status code: " << statusCode);
+            ssLOG_BASE(output.data());
             return false;
         }
 
@@ -328,6 +329,7 @@ namespace
         if(statusCode != 0)
         {
             ssLOG_ERROR("Link command returned with non-zero status code: " << statusCode);
+            ssLOG_BASE(output.data());
             return false;
         }
 

Src/runcpp2/DependenciesSetupHelper.cpp

@@ -265,6 +265,8 @@ namespace
                 System2CommandInfo setupCommandInfo;
                 SYSTEM2_RESULT result = System2Run(setupCommand.c_str(), &setupCommandInfo);
 
+                ssLOG_INFO("Running setup command: " << setupCommand);
+                
                 if(result != SYSTEM2_RESULT_SUCCESS)
                 {
                     ssLOG_ERROR("Failed to run setup command with result: " << result);
@@ -302,6 +304,8 @@ namespace
                     ssLOG_ERROR("Output: " << output);
                     return false;
                 }
+                
+                ssLOG_INFO("Output: " << output);
             }
         }
 
@@ -560,14 +564,14 @@ bool runcpp2::CopyDependenciesBinaries( const std::string& scriptPath,
         if(scriptInfo.Dependencies.at(i).LibraryType == DependencyLibraryType::HEADER)
             return true;
 
-        const DependencySearchProperty& searchProperty = scriptInfo .Dependencies
+        const DependencyLinkProperty& searchProperty = scriptInfo .Dependencies
                                                                     .at(i)
-                                                                    .SearchProperties
+                                                                    .LinkProperties
                                                                     .at(profile.Name);
 
         //Get the Search path and search library name
-        if( scriptInfo.Dependencies.at(i).SearchProperties.find(profile.Name) == 
-            scriptInfo.Dependencies.at(i).SearchProperties.end())
+        if( scriptInfo.Dependencies.at(i).LinkProperties.find(profile.Name) == 
+            scriptInfo.Dependencies.at(i).LinkProperties.end())
         {
             ssLOG_ERROR("Search properties for dependency " << scriptInfo.Dependencies.at(i).Name <<
                         " is missing profile " << profile.Name);
@@ -583,8 +587,11 @@ 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 = scriptDirectory + "/" + currentSearchDirectory;
+                    currentSearchDirectory = dependenciesCopiesPaths[i] + "/" + currentSearchDirectory;
 
                 std::error_code _;
                 if( !ghc::filesystem::exists(currentSearchDirectory, _) || 
@@ -601,6 +608,10 @@ bool runcpp2::CopyDependenciesBinaries( const std::string& scriptPath,
 
                     std::string currentFileName = it.path().stem().string();
                     std::string currentExtension = it.path().extension().string();
+                    if(!currentExtension.empty())
+                        currentExtension.erase(0, 1);
+                    
+                    ssLOG_DEBUG("currentFileName: " << currentFileName);
 
                     //TODO: Make it not case sensitive?
                     bool nameMatched = false;
@@ -624,14 +635,18 @@ bool runcpp2::CopyDependenciesBinaries( const std::string& scriptPath,
                     if(!extensionMatched)
                         continue;
 
-                    if(!ghc::filesystem::copy_file( it.path(), 
-                                                    runcpp2ScriptDir, 
-                                                    ghc::filesystem::copy_options::overwrite_existing,  
-                                                    _))
+                    std::error_code copyErrorCode;
+                    ghc::filesystem::copy(  it.path(), 
+                                            runcpp2ScriptDir, 
+                                            ghc::filesystem::copy_options::overwrite_existing,  
+                                            copyErrorCode);
+                    
+                    if(copyErrorCode)
                     {
                         ssLOG_ERROR("Failed to copy file from " << it.path().string() << 
                                     " to " << runcpp2ScriptDir);
 
+                        ssLOG_ERROR("Error: " << copyErrorCode.message());
                         return false;
                     }
 

Src/runcpp2/main.cpp

@@ -26,6 +26,8 @@ int main(int argc, char* argv[])
         return 1;
     }
 
+    
+    
     std::unordered_map<std::string, runcpp2::CmdOptions> optionsMap =
     {
         {"--setup", runcpp2::CmdOptions::SETUP}