Adding IncludePaths for script info

Author: Neko-Box-Coder

DefaultYAMLs/DefaultScriptInfo.yaml

@@ -57,13 +57,22 @@ OtherFilesToBeCompiled:
         DefaultProfile:
         -   "./AnotherSourceFile.cpp"
 
+# (Optional) Include paths (relative to script file path) for each platform and profile
+IncludePaths:
+    # Target Platform (DefaultPlatform, Windows, Linux, MacOS, or Unix)
+    DefaultPlatform:
+        # Target Profile (e.g., "g++", "clang++", "msvc", or "DefaultProfile" for any profile)
+        DefaultProfile:
+        -   "./include"
+        -   "./src/include"
+
 # (Optional) Define cross-compiler defines for each platform and profile.
 # Defines can be specified as just a name or as a name-value pair.
 Defines:
     # Target Platform (DefaultPlatform, Windows, Linux, MacOS, or Unix)
     DefaultPlatform:
         # Profile name (e.g., "g++", "clang++", "msvc", or "DefaultProfile" for any profile)
-        "DefaultProfile":
+        DefaultProfile:
         -   "EXAMPLE_DEFINE"              # Define without a value
         -   "VERSION_MAJOR=1"             # Define with a value
 

Examples/test.cpp

@@ -17,6 +17,11 @@ PassScriptPath: true
         "msvc":
         -   "./OtherSources/AnotherSourceFileMSVC.cpp"
 
+IncludePaths:
+    DefaultPlatform:
+        DefaultProfile:
+        -   "./OtherSources"
+
 Defines:
     DefaultPlatform:
         # Turns into `TEST_DEF=\"Test Define Working\"` in shell
@@ -104,11 +109,11 @@ PassScriptPath: true
 #include "System2.hpp"
 
 #if defined(__GNUC__)
-    #include "./OtherSources/AnotherSourceFileGcc.hpp"
+    #include "AnotherSourceFileGcc.hpp"
 #endif
 
 #if defined(_MSC_VER)
-    #include "./OtherSources/AnotherSourceFileMSVC.hpp"
+    #include "AnotherSourceFileMSVC.hpp"
 #endif
 
 #include <iostream>

Include/runcpp2/CompilingLinking.hpp

@@ -14,6 +14,7 @@ namespace runcpp2
                             const ghc::filesystem::path& scriptPath,
                             const std::vector<ghc::filesystem::path>& sourceFiles,
                             const std::vector<bool>& sourceHasCache,
+                            const std::vector<ghc::filesystem::path>& includePaths,
                             const Data::ScriptInfo& scriptInfo,
                             const std::vector<Data::DependencyInfo*>& availableDependencies,
                             const Data::Profile& profile,
@@ -25,6 +26,7 @@ namespace runcpp2
                                 const std::string& outputName,
                                 const std::vector<ghc::filesystem::path>& sourceFiles,
                                 const std::vector<bool>& sourceHasCache,
+                                const std::vector<ghc::filesystem::path>& includePaths,
                                 const Data::ScriptInfo& scriptInfo,
                                 const std::vector<Data::DependencyInfo*>& availableDependencies,
                                 const Data::Profile& profile,

Include/runcpp2/Data/ScriptInfo.hpp

@@ -27,6 +27,7 @@ namespace runcpp2
                 std::unordered_map<PlatformName, ProfilesFlagsOverride> OverrideLinkFlags;
 
                 std::unordered_map<PlatformName, ProfilesCompilesFiles> OtherFilesToBeCompiled;
+                std::unordered_map<PlatformName, ProfilesCompilesFiles> IncludePaths;
 
                 std::vector<DependencyInfo> Dependencies;
 

Include/runcpp2/PipelineSteps.hpp

@@ -105,6 +105,17 @@ namespace runcpp2
                                     const Data::Profile& profile,
                                     const std::unordered_map<CmdOptions, std::string>& currentOptions,
                                     ghc::filesystem::path& outTarget);
+    
+    bool GatherSourceFiles( const ghc::filesystem::path& absoluteScriptPath, 
+                            const Data::ScriptInfo& scriptInfo,
+                            const Data::Profile& currentProfile,
+                            std::vector<ghc::filesystem::path>& outSourcePaths);
+    
+    bool GatherIncludePaths(const ghc::filesystem::path& scriptDirectory, 
+                            const Data::ScriptInfo& scriptInfo,
+                            const Data::Profile& currentProfile,
+                            const std::vector<Data::DependencyInfo*>& dependencies,
+                            std::vector<ghc::filesystem::path>& outIncludePaths);
 }
 
 

Src/Tests/Data/ScriptInfoTest.cpp

@@ -37,6 +37,10 @@ int main(int argc, char** argv)
                         MSVC:
                         -   src/extra.cpp
                         -   src/debug.cpp
+                IncludePaths:
+                    Windows:
+                        MSVC:
+                        -   include
                 Defines:
                     Windows:
                         MSVC:
@@ -152,12 +156,21 @@ int main(int argc, char** argv)
         //Verify OtherFilesToBeCompiled
         ssTEST_OUTPUT_SETUP
         (
-            const std::vector<ghc::filesystem::path>& msvcFiles = 
+            const std::vector<ghc::filesystem::path>& msvcCompileFiles = 
                 scriptInfo.OtherFilesToBeCompiled.at("Windows").CompilesFiles.at("MSVC");
         );
-        ssTEST_OUTPUT_ASSERT("MSVC files count", msvcFiles.size() == 2);
-        ssTEST_OUTPUT_ASSERT("MSVC first file", msvcFiles.at(0) == "src/extra.cpp");
+        ssTEST_OUTPUT_ASSERT("MSVC files count", msvcCompileFiles.size() == 2);
+        ssTEST_OUTPUT_ASSERT("MSVC first file", msvcCompileFiles.at(0) == "src/extra.cpp");
 
+        //Verify IncludePaths
+        ssTEST_OUTPUT_SETUP
+        (
+            const std::vector<ghc::filesystem::path>& msvcIncludeFiles = 
+                scriptInfo.IncludePaths.at("Windows").CompilesFiles.at("MSVC");
+        );
+        ssTEST_OUTPUT_ASSERT("IncludePaths count", msvcIncludeFiles.size() == 1);
+        ssTEST_OUTPUT_ASSERT("IncludePaths first path", msvcIncludeFiles.at(0) == "include");
+
         //Verify Defines
         ssTEST_OUTPUT_SETUP
         (

Src/runcpp2/CompilingLinking.cpp

@@ -69,6 +69,7 @@ namespace
     bool CompileScript( const ghc::filesystem::path& buildDir,
                         const ghc::filesystem::path& scriptPath,
                         const std::vector<ghc::filesystem::path>& sourceFiles,
+                        const std::vector<ghc::filesystem::path>& includePaths,
                         const runcpp2::Data::ScriptInfo& scriptInfo,
                         const std::vector<runcpp2::Data::DependencyInfo*>& availableDependencies,
                         const runcpp2::Data::Profile& profile,
@@ -100,18 +101,11 @@ namespace
             substitutionMapTemplate["{CompileFlags}"] = {compileFlags};
         }
 
-        //Include Directories
+        //Add script and dependency include paths
+        for(const ghc::filesystem::path& includePath : includePaths)
         {
-            for(int i = 0; i < availableDependencies.size(); ++i)
-            {
-                for(int j = 0; j < availableDependencies.at(i)->AbsoluteIncludePaths.size(); ++j)
-                {
-                    const std::string& currentIncludePath = 
-                        availableDependencies.at(i)->AbsoluteIncludePaths.at(j);
-                    
-                    substitutionMapTemplate["{IncludeDirectoryPath}"].push_back(currentIncludePath);
-                }
-            }
+            std::string processedInclude = runcpp2::ProcessPath(includePath.string());
+            substitutionMapTemplate["{IncludeDirectoryPath}"].push_back(processedInclude);
         }
 
         // Add defines
@@ -643,6 +637,7 @@ bool runcpp2::CompileScriptOnly(const ghc::filesystem::path& buildDir,
                                 const ghc::filesystem::path& scriptPath,
                                 const std::vector<ghc::filesystem::path>& sourceFiles,
                                 const std::vector<bool>& sourceHasCache,
+                                const std::vector<ghc::filesystem::path>& includePaths,
                                 const Data::ScriptInfo& scriptInfo,
                                 const std::vector<Data::DependencyInfo*>& availableDependencies,
                                 const Data::Profile& profile,
@@ -667,6 +662,7 @@ bool runcpp2::CompileScriptOnly(const ghc::filesystem::path& buildDir,
     if(!CompileScript(  buildDir,
                         scriptPath,
                         sourceFilesNeededToCompile, 
+                        includePaths,
                         scriptInfo, 
                         availableDependencies, 
                         profile, 
@@ -685,6 +681,7 @@ bool runcpp2::CompileAndLinkScript( const ghc::filesystem::path& buildDir,
                                     const std::string& outputName,
                                     const std::vector<ghc::filesystem::path>& sourceFiles,
                                     const std::vector<bool>& sourceHasCache,
+                                    const std::vector<ghc::filesystem::path>& includePaths,
                                     const Data::ScriptInfo& scriptInfo,
                                     const std::vector<Data::DependencyInfo*>& availableDependencies,
                                     const Data::Profile& profile,
@@ -711,6 +708,7 @@ bool runcpp2::CompileAndLinkScript( const ghc::filesystem::path& buildDir,
     if(!CompileScript(  buildDir,
                         scriptPath,
                         sourceFilesNeededToCompile, 
+                        includePaths,
                         scriptInfo, 
                         availableDependencies, 
                         profile, 

Src/runcpp2/Data/ScriptInfo.cpp

@@ -17,6 +17,7 @@ bool runcpp2::Data::ScriptInfo::ParseYAML_Node(ryml::ConstNodeRef& node)
         NodeRequirement("OverrideCompileFlags", ryml::NodeType_e::MAP, false, true),
         NodeRequirement("OverrideLinkFlags", ryml::NodeType_e::MAP, false, true),
         NodeRequirement("OtherFilesToBeCompiled", ryml::NodeType_e::MAP, false, true),
+        NodeRequirement("IncludePaths", ryml::NodeType_e::MAP, false, true),
         NodeRequirement("Dependencies", ryml::NodeType_e::SEQ, false, true),
         NodeRequirement("Defines", ryml::NodeType_e::MAP, false, true),
         NodeRequirement("Setup", ryml::NodeType_e::MAP, false, true),
@@ -126,6 +127,23 @@ bool runcpp2::Data::ScriptInfo::ParseYAML_Node(ryml::ConstNodeRef& node)
             OtherFilesToBeCompiled[platform] = compilesFiles;
         }
     }
+
+    if(ExistAndHasChild(node, "IncludePaths"))
+    {
+        for(int i = 0; i < node["IncludePaths"].num_children(); ++i)
+        {
+            ProfilesCompilesFiles includePaths;
+            ryml::ConstNodeRef currentProfileMapNode = node["IncludePaths"][i];
+            PlatformName platform = GetKey(currentProfileMapNode);
+            
+            if(!includePaths.ParseYAML_Node(currentProfileMapNode))
+            {
+                ssLOG_ERROR("ScriptInfo: Failed to parse IncludePaths.");
+                return false;
+            }
+            IncludePaths[platform] = includePaths;
+        }
+    }
 
     if(ExistAndHasChild(node, "Dependencies"))
     {
@@ -290,6 +308,16 @@ std::string runcpp2::Data::ScriptInfo::ToString(std::string indentation) const
             out += it->second.ToString(indentation + "        ");
         }
     }
+
+    if(!IncludePaths.empty())
+    {
+        out += indentation + "IncludePaths:\n";
+        for(auto it = IncludePaths.begin(); it != IncludePaths.end(); ++it)
+        {
+            out += indentation + "    " + it->first + ":\n";
+            out += it->second.ToString(indentation + "        ");
+        }
+    }
 
     if(!Dependencies.empty())
     {
@@ -365,6 +393,7 @@ bool runcpp2::Data::ScriptInfo::Equals(const ScriptInfo& other) const
         OverrideCompileFlags.size() != other.OverrideCompileFlags.size() ||
         OverrideLinkFlags.size() != other.OverrideLinkFlags.size() ||
         OtherFilesToBeCompiled.size() != other.OtherFilesToBeCompiled.size() ||
+        IncludePaths.size() != other.IncludePaths.size() ||
         Dependencies.size() != other.Dependencies.size() ||
         Defines.size() != other.Defines.size() ||
         Setup.size() != other.Setup.size() ||
@@ -412,6 +441,15 @@ bool runcpp2::Data::ScriptInfo::Equals(const ScriptInfo& other) const
         }
     }
 
+    for(const auto& it : IncludePaths)
+    {
+        if( other.IncludePaths.count(it.first) == 0 || 
+            !other.IncludePaths.at(it.first).Equals(it.second))
+        {
+            return false;
+        }
+    }
+
     for(size_t i = 0; i < Dependencies.size(); ++i)
     {
         if(!Dependencies[i].Equals(other.Dependencies[i]))