Updating link properties format

Author: Neko-Box-Coder

DefaultYAMLs/DefaultScriptInfo.yaml

@@ -90,23 +90,23 @@ Dependencies:
 
     # (Optional if LibraryType is Header) Link properties of the dependency
     LinkProperties:
-        # Properties for searching the library binary for the profile
-        # You can also use "Default" if all compilers use the same values
-        "g++":
-            # The library names to be searched for when linking against the script. 
-            # Binaries with linkable extension that contains one of the names will be linked
-            SearchLibraryNames: ["MyLibrary"]
-            
-            # (Optional) The library names to be excluded from being searched.
-            # Works the same as SearchLibraryNames but will NOT be linked instead
-            ExcludeLibraryNames: []
-            
-            # The path (relative to the dependency folder) to be searched for the dependency binaries
-            SearchDirectories: ["./build"]
-            
-            # (Optional) Additional link flags for this dependency for each platform
-            AdditionalLinkOptions: 
-                Default: []
+        # Properties for searching the library binary for each platform
+        Default:
+            # Profile-specific properties
+            "g++":
+                # The library names to be searched for when linking against the script. 
+                # Binaries with linkable extension that contains one of the names will be linked
+                SearchLibraryNames: ["MyLibrary"]
+                
+                # (Optional) The library names to be excluded from being searched.
+                # Works the same as SearchLibraryNames but will NOT be linked instead
+                ExcludeLibraryNames: []
+                
+                # The path (relative to the dependency folder) to be searched for the dependency binaries
+                SearchDirectories: ["./build"]
+                
+                # (Optional) Additional link flags for this dependency
+                AdditionalLinkOptions: []
 
     # (Optional) Setup commands are run once when the dependency is populated
     Setup:

Include/runcpp2/Data/DependencyInfo.hpp

@@ -25,7 +25,7 @@ namespace runcpp2
                 DependencyLibraryType LibraryType;
                 std::vector<std::string> IncludePaths;
                 std::vector<std::string> AbsoluteIncludePaths;
-                std::unordered_map<ProfileName, DependencyLinkProperty> LinkProperties;
+                std::unordered_map<PlatformName, DependencyLinkProperty> LinkProperties;
                 std::unordered_map<PlatformName, DependencyCommands> Setup;
                 std::unordered_map<PlatformName, DependencyCommands> Cleanup;
                 std::unordered_map<PlatformName, DependencyCommands> Build;

Include/runcpp2/Data/DependencyLinkProperty.hpp

@@ -13,13 +13,18 @@ namespace runcpp2
 {
     namespace Data
     {
+        struct ProfileLinkProperty
+        {
+            std::vector<std::string> SearchLibraryNames;
+            std::vector<std::string> SearchDirectories;
+            std::vector<std::string> ExcludeLibraryNames;
+            std::vector<std::string> AdditionalLinkOptions;
+        };
+
         class DependencyLinkProperty
         {
             public:
-                std::vector<std::string> SearchLibraryNames;
-                std::vector<std::string> SearchDirectories;
-                std::vector<std::string> ExcludeLibraryNames;
-                std::unordered_map<PlatformName, std::vector<std::string>> AdditionalLinkOptions;
+                std::unordered_map<ProfileName, ProfileLinkProperty> ProfileProperties;
 
                 bool ParseYAML_Node(ryml::ConstNodeRef& node);
                 std::string ToString(std::string indentation) const;

Src/runcpp2/CompilingLinking.cpp

@@ -759,10 +759,17 @@ bool runcpp2::CompileAndLinkScript( const ghc::filesystem::path& buildDir,
         std::vector<std::string> currentProfileNames;
         profile.GetNames(currentProfileNames);
 
+        if(!runcpp2::HasValueFromPlatformMap(availableDependencies.at(i)->LinkProperties))
+            continue;
+        
+        const runcpp2::Data::DependencyLinkProperty& linkProperty = 
+            *runcpp2::GetValueFromPlatformMap(availableDependencies.at(i)->LinkProperties);
+        
+        // Find the matching profile
         for(int j = 0; j < currentProfileNames.size(); ++j)
         {
-            if( availableDependencies.at(i)->LinkProperties.find(currentProfileNames.at(j)) != 
-                availableDependencies.at(i)->LinkProperties.end())
+            if( linkProperty.ProfileProperties.find(currentProfileNames.at(j)) != 
+                linkProperty.ProfileProperties.end())
             {
                 targetProfileName = currentProfileNames.at(j);
                 break;
@@ -772,17 +779,11 @@ bool runcpp2::CompileAndLinkScript( const ghc::filesystem::path& buildDir,
         if(targetProfileName.empty())
             continue;
 
-        const runcpp2::Data::DependencyLinkProperty& currentLinkProperty = 
-            availableDependencies.at(i)->LinkProperties.at(targetProfileName);
+        const runcpp2::Data::ProfileLinkProperty& profileLinkProperty = 
+            linkProperty.ProfileProperties.at(targetProfileName);
 
-        if(runcpp2::HasValueFromPlatformMap(currentLinkProperty.AdditionalLinkOptions))
-        {
-            const std::vector<std::string> additionalLinkOptions = 
-                *runcpp2::GetValueFromPlatformMap(currentLinkProperty.AdditionalLinkOptions);
-            
-            for(int k = 0; k < additionalLinkOptions.size(); ++k)
-                dependenciesLinkFlags += additionalLinkOptions.at(k) + " ";
-        }
+        for(const std::string& option : profileLinkProperty.AdditionalLinkOptions)
+            dependenciesLinkFlags += option + " ";
     }
 
     runcpp2::TrimRight(dependenciesLinkFlags);

Src/runcpp2/Data/DependencyInfo.cpp

@@ -67,21 +67,20 @@ bool runcpp2::Data::DependencyInfo::ParseYAML_Node(ryml::ConstNodeRef& node)
     {
         ryml::ConstNodeRef linkPropertiesNode = node["LinkProperties"];
 
-        for(auto it = linkPropertiesNode.begin(); it != linkPropertiesNode.end(); ++it)
-        
         for(int i = 0; i < linkPropertiesNode.num_children(); ++i)
         {
-            ProfileName profile = GetKey(linkPropertiesNode[i]);
-            ryml::ConstNodeRef currentPropertyNode = linkPropertiesNode[i];
+            PlatformName platform = GetKey(linkPropertiesNode[i]);
+            ryml::ConstNodeRef platformNode = linkPropertiesNode[i];
+            
+            //Insert an empty DependencyLinkProperty and get a reference to it
+            DependencyLinkProperty& linkProperty = LinkProperties[platform];
 
-            DependencyLinkProperty property;
-            if(!property.ParseYAML_Node(currentPropertyNode))
+            if(!linkProperty.ParseYAML_Node(platformNode))
             {
-                ssLOG_ERROR("DependencyInfo: Failed to parse SearchProperties");
+                ssLOG_ERROR("DependencyInfo: Failed to parse LinkProperties for platform " << 
+                            platform);
                 return false;
             }
-            
-            LinkProperties[profile] = property;
         }
     }
     else if(LibraryType != DependencyLibraryType::HEADER)

Src/runcpp2/Data/DependencyLinkProperty.cpp

@@ -9,52 +9,55 @@ bool runcpp2::Data::DependencyLinkProperty::ParseYAML_Node(ryml::ConstNodeRef& n
 
     if(!node.is_map())
     {
-        ssLOG_ERROR("DependencySearchProperty: Node is not a Map");
+        ssLOG_ERROR("DependencyLinkProperty: Node is not a Map");
         return false;
     }
 
-    std::vector<NodeRequirement> requirements =
+    for(int i = 0; i < node.num_children(); ++i)
     {
-        NodeRequirement("SearchLibraryNames", ryml::NodeType_e::SEQ, true, false),
-        NodeRequirement("SearchDirectories", ryml::NodeType_e::SEQ, true, false),
-        NodeRequirement("ExcludeLibraryNames", ryml::NodeType_e::SEQ, false, true),
-        NodeRequirement("AdditionalLinkOptions", ryml::NodeType_e::MAP, false, true)
-    };
-    
-    if(!CheckNodeRequirements(node, requirements))
-    {
-        ssLOG_ERROR("DependencySource: Failed to meet requirements");
-        return false;
-    }
-    
-    for(int i = 0; i < node["SearchLibraryNames"].num_children(); ++i)
-        SearchLibraryNames.push_back(GetValue(node["SearchLibraryNames"][i]));
-    
-    for(int i = 0; i < node["SearchDirectories"].num_children(); ++i)
-        SearchDirectories.push_back(GetValue(node["SearchDirectories"][i]));
-
-    for(int i = 0; i < node["ExcludeLibraryNames"].num_children(); ++i)
-        ExcludeLibraryNames.push_back(GetValue(node["ExcludeLibraryNames"][i]));
-
-    if(ExistAndHasChild(node, "AdditionalLinkOptions"))
-    {
-        ryml::ConstNodeRef additionalLinkNode = node["AdditionalLinkOptions"];
+        ProfileName profile = GetKey(node[i]);
+        ryml::ConstNodeRef profileNode = node[i];
+        
+        ProfileLinkProperty& property = ProfileProperties[profile];
+        
+        std::vector<NodeRequirement> requirements =
+        {
+            NodeRequirement("SearchLibraryNames", ryml::NodeType_e::SEQ, true, false),
+            NodeRequirement("SearchDirectories", ryml::NodeType_e::SEQ, true, false),
+            NodeRequirement("ExcludeLibraryNames", ryml::NodeType_e::SEQ, false, true),
+            NodeRequirement("AdditionalLinkOptions", ryml::NodeType_e::SEQ, false, true)
+        };
+        
+        if(!CheckNodeRequirements(profileNode, requirements))
+        {
+            ssLOG_ERROR("DependencyLinkProperty: Failed to meet requirements for profile " << 
+                        profile);
+            return false;
+        }
+        
+        for(int j = 0; j < profileNode["SearchLibraryNames"].num_children(); ++j)
+            property.SearchLibraryNames.push_back(GetValue(profileNode["SearchLibraryNames"][j]));
+        
+        for(int j = 0; j < profileNode["SearchDirectories"].num_children(); ++j)
+            property.SearchDirectories.push_back(GetValue(profileNode["SearchDirectories"][j]));
 
-        for(int i = 0; i < additionalLinkNode.num_children(); ++i)
+        if(ExistAndHasChild(profileNode, "ExcludeLibraryNames"))
         {
-            ryml::ConstNodeRef currentLinkNode = additionalLinkNode[i];
-            
-            if(!currentLinkNode.is_seq())
+            for(int j = 0; j < profileNode["ExcludeLibraryNames"].num_children(); ++j)
             {
-                ssLOG_ERROR("Sequence is expected for AdditionalLinkOptions at " << 
-                            GetKey(currentLinkNode));
+                property.ExcludeLibraryNames
+                        .push_back(GetValue(profileNode["ExcludeLibraryNames"][j]));
 
-                return false;
             }
-            
-            const std::string currentPlatform = GetKey(currentLinkNode);
-            for(int j = 0; j < currentLinkNode.num_children(); ++j)
-                AdditionalLinkOptions[currentPlatform].push_back(GetValue(currentLinkNode[j]));
+        }
+
+        if(ExistAndHasChild(profileNode, "AdditionalLinkOptions"))
+        {
+            for(int j = 0; j < profileNode["AdditionalLinkOptions"].num_children(); ++j)
+            {
+                property.AdditionalLinkOptions
+                        .push_back(GetValue(profileNode["AdditionalLinkOptions"][j]));
+            }
         }
     }
 
@@ -66,24 +69,33 @@ bool runcpp2::Data::DependencyLinkProperty::ParseYAML_Node(ryml::ConstNodeRef& n
 std::string runcpp2::Data::DependencyLinkProperty::ToString(std::string indentation) const
 {
     std::string out;
-    out += indentation + "SearchLibraryName: \n";
-    
-    for(int i = 0; i < SearchLibraryNames.size(); ++i)
-        out += indentation + "-   " + SearchLibraryNames[i] + "\n";
-    
-    out += indentation + "SearchDirectories: \n";
-    
-    for(int i = 0; i < SearchDirectories.size(); ++i)
-        out += indentation + "-   " + SearchDirectories[i] + "\n";
-    
-    out += indentation + "AdditionalLinkOptions: \n";
-    
-    for(auto it = AdditionalLinkOptions.begin(); it != AdditionalLinkOptions.end(); ++it)
+    for(const std::pair<const ProfileName, ProfileLinkProperty>& profilePair : ProfileProperties)
     {
-        out += indentation + "-   " + it->first + ":\n";
-        for(int i = 0; i < it->second.size(); ++i)
-            out += indentation + "    -   " + it->second[i] + "\n";
+        out += indentation + profilePair.first + ":\n";
+        const ProfileLinkProperty& property = profilePair.second;
+        
+        out += indentation + "    SearchLibraryNames:\n";
+        for(const std::string& name : property.SearchLibraryNames)
+            out += indentation + "    -   " + name + "\n";
+        
+        out += indentation + "    SearchDirectories:\n";
+        for(const std::string& dir : property.SearchDirectories)
+            out += indentation + "    -   " + dir + "\n";
+        
+        if(!property.ExcludeLibraryNames.empty())
+        {
+            out += indentation + "    ExcludeLibraryNames:\n";
+            for(const std::string& name : property.ExcludeLibraryNames)
+                out += indentation + "    -   " + name + "\n";
+        }
+        
+        if(!property.AdditionalLinkOptions.empty())
+        {
+            out += indentation + "    AdditionalLinkOptions:\n";
+            for(const std::string& option : property.AdditionalLinkOptions)
+                out += indentation + "    -   " + option + "\n";
+        }
     }
 
     return out;
-}
+}