Adding support for setup build and cleanup steps for dependency

Author: Neko-Box-Coder

CMakeLists.txt

@@ -79,7 +79,7 @@ add_executable(runcpp2
                         "${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/CompilingLinking.cpp"
                         "${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/ConfigParsing.cpp"
                         "${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/DefaultYAMLs.c"
-                        "${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/DependenciesSetupHelper.cpp"
+                        "${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/DependenciesHelper.cpp"
                         "${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/main.cpp"
                         "${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/ParseUtil.cpp"
                         "${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/PlatformUtil.cpp"

DefaultYAMLs/DefaultScriptInfo.yaml

@@ -19,6 +19,7 @@ RequiredProfiles:
 
 # (Optional) Override the default compile flags for each platform
 OverrideCompileFlags:
+    # Target Platform
     All:
         # Profile with the respective flags to override
         "g++":
@@ -31,6 +32,7 @@ OverrideCompileFlags:
 
 # (Optional) Override the default link flags for each platform
 OverrideLinkFlags:
+    # Target Platform
     All:
         # Profile with the respective flags to override
         "g++":
@@ -77,19 +79,29 @@ Dependencies:
             # (Optional) Additional link options for this dependency for each platform
             AdditionalLinkOptions: 
                 All: []
-
-    # TODO: Cleanup?
-
-    # TODO: Build?
-
 
-    # (Optional) List of setup commands for each platform
+    # (Optional) Setup commands are run once when the dependency is populated
     Setup:
+        # Target Platform
         All:
             # Setup shell commands for the specified profile. 
             # All commands are run in the dependency folder
             # You can also use "All" if all the compilers run the same setup commands
             "g++":
             -   "mkdir build"
+            
+    
+    # (Optional) Build commands are run every time before the script is being built
+    Build:
+        # Target Platform
+        All:
+            "g++":
             -   "cd build && cmake .."
             -   "cd build && cmake --build ."
+    
+    # (Optional) Cleanup commands are run when the reset option is present. Normally nothing needs
+    #            to be done since the dependency folder will be removed automatically.
+    # Cleanup:
+    #     Linux:
+    #         "g++":
+    #         -   "sudo apt purge MyLibrary"

Examples/test.cpp

@@ -18,17 +18,18 @@
             SearchDirectories: ["./build", "./build/Debug", "./build/Release"]
     Setup:
         Windows:
-            "msvc":
+            "All":
             -   "if not exist build mkdir build"
-            -   "cd build && cmake .. -DssLOG_BUILD_TYPE=SHARED"
-            -   "cd build && cmake --build . --config Release -j 16"
         Unix:
-            "g++":
+            "All":
             -   "mkdir -p build"
+    Build:
+        All:
+            "All":
             -   "cd build && cmake .. -DssLOG_BUILD_TYPE=SHARED"
             -   "cd build && cmake --build . --config Release -j 16"
 */
- 
+
 
 //#include "ssLogger/ssLogInit.hpp"
 

Include/runcpp2/DependenciesHelper.hpp

@@ -0,0 +1,44 @@
+#ifndef RUNCPP2_DEPENDENCIES_SETUP_HELPER_HPP
+#define RUNCPP2_DEPENDENCIES_SETUP_HELPER_HPP
+
+#include "runcpp2/Data/DependencyInfo.hpp"
+#include "runcpp2/Data/ScriptInfo.hpp"
+#include "runcpp2/Data/Profile.hpp"
+#include <vector>
+
+namespace runcpp2
+{
+    bool GetDependenciesPaths(  const std::vector<Data::DependencyInfo*>& availableDependencies,
+                                std::vector<std::string>& outCopiesPaths,
+                                std::vector<std::string>& outSourcesPaths,
+                                const std::string& scriptPath);
+    
+    bool IsDependencyAvailableForThisPlatform(const Data::DependencyInfo& dependency);
+    
+    bool CleanupDependencies(   const runcpp2::Data::Profile& profile,
+                                const std::string& scriptPath, 
+                                const Data::ScriptInfo& scriptInfo,
+                                const std::vector<Data::DependencyInfo*>& availableDependencies,
+                                const std::vector<std::string>& dependenciesLocalCopiesPaths);
+    
+    bool SetupDependencies( const runcpp2::Data::Profile& profile,
+                            const std::string& scriptPath, 
+                            const Data::ScriptInfo& scriptInfo,
+                            std::vector<Data::DependencyInfo*>& availableDependencies,
+                            const std::vector<std::string>& dependenciesLocalCopiesPaths,
+                            const std::vector<std::string>& dependenciesSourcePaths);
+
+    bool BuildDependencies( const runcpp2::Data::Profile& profile,
+                            const std::string& scriptPath, 
+                            const Data::ScriptInfo& scriptInfo,
+                            const std::vector<Data::DependencyInfo*>& availableDependencies,
+                            const std::vector<std::string>& dependenciesLocalCopiesPaths);
+
+    bool CopyDependenciesBinaries(  const std::string& scriptPath, 
+                                    const std::vector<Data::DependencyInfo*>& availableDependencies,
+                                    const std::vector<std::string>& dependenciesCopiesPaths,
+                                    const Data::Profile& profile,
+                                    std::vector<std::string>& outCopiedBinariesPaths);
+}
+
+#endif

Include/runcpp2/DependenciesSetupHelper.hpp

@@ -16,6 +16,7 @@ namespace runcpp2
         RESET_USER_CONFIG,
         EXECUTABLE,
         HELP,
+        REMOVE_DEPENDENCIES,
         COUNT
     };
 

Include/runcpp2/runcpp2.hpp

@@ -1,5 +1,5 @@
 #include "runcpp2/CompilingLinking.hpp"
-#include "runcpp2/DependenciesSetupHelper.hpp"
+#include "runcpp2/DependenciesHelper.hpp"
 #include "runcpp2/PlatformUtil.hpp"
 #include "runcpp2/StringUtil.hpp"
 #include "runcpp2/Data/ScriptInfo.hpp"
@@ -387,12 +387,12 @@ namespace
 
             for(int i = 0; i < copiedDependenciesBinariesPaths.size(); ++i)
             {
-                size_t extensionFoundIndex = copiedDependenciesBinariesPaths[i].find_last_of(".");
+                size_t extensionFoundIndex = copiedDependenciesBinariesPaths.at(i).find_last_of(".");
 
                 //Check if this is a file we can link
                 std::string extension;
                 if(extensionFoundIndex != std::string::npos)
-                    extension = copiedDependenciesBinariesPaths[i].substr(extensionFoundIndex);
+                    extension = copiedDependenciesBinariesPaths.at(i).substr(extensionFoundIndex);
 
                 using namespace runcpp2;
                 Data::DependencyLibraryType currentLinkType = Data::DependencyLibraryType::COUNT;
@@ -409,6 +409,9 @@ namespace
                     goto processLinkFile;
                 }
 
+                //TODO: Shared and static link file cannot be differentiated with just 
+                //      file extension because they are the same. We should pass the dependency in 
+                //      instead
                 if(!HasValueFromPlatformMap(profile.FilesTypes.SharedLinkFile.Extension))
                 {
                     ssLOG_WARNING(  "profile " << profile.Name << " missing extension for " <<