Renaming SearchProperties to LinkProperties

Neko-Box-Coder · Neko-Box-Coder · commit e9ab86cb42a2 · 2024-03-14T21:39:42.000Z
diff --git a/DefaultYAMLs/DefaultScriptInfo.yaml b/DefaultYAMLs/DefaultScriptInfo.yaml
@@ -50,16 +50,21 @@ Dependencies:
     IncludePaths:
     -   "src/include"
     
-    # TODO: Maybe rename to LinkSearchProperties?
     # (Optional if Header type) Searchable properties of the dependency
-    SearchProperties:
+    LinkProperties:
         # Properties for searching the library binary for the profile
         "g++":
             # The library name to be searched for when linking against the script
             SearchLibraryNames: ["lib1"]
             
+            # TODO(NOW): Add option to exclude names
+            
             # The path (relative to the dependency folder) to be searched for the dependency binaries
             SearchDirectories: ["./build"]
+            
+            # TODO(NOW): Add additional link option?
+            
+
     
     # (Optional) List of setup commands for the supported platforms
     Setup:
diff --git a/DefaultYAMLs/ScriptInfoSchema.json b/DefaultYAMLs/ScriptInfoSchema.json
@@ -137,7 +137,7 @@
                         "items": { "type":"string" },
                         "description": "Paths to be added to include paths"
                     },
-                    "SearchProperties": 
+                    "LinkProperties": 
                     {
                         "type": "object",
                         "patternProperties":
@@ -200,7 +200,7 @@
                     "Platforms",
                     "Source",
                     "LibraryType", 
-                    "SearchProperties"
+                    "LinkProperties"
                 ],
                 "uniqueItems": true
             }
diff --git a/Include/runcpp2/Data/DependencyInfo.hpp b/Include/runcpp2/Data/DependencyInfo.hpp
@@ -3,7 +3,7 @@
 
 #include "runcpp2/Data/DependencyLibraryType.hpp"
 #include "runcpp2/Data/DependencySource.hpp"
-#include "runcpp2/Data/DependencySearchProperty.hpp"
+#include "runcpp2/Data/DependencyLinkProperty.hpp"
 #include "runcpp2/Data/DependencySetup.hpp"
 #include "runcpp2/Data/ParseCommon.hpp"
 
@@ -21,7 +21,7 @@ namespace runcpp2
             DependencyLibraryType LibraryType;
             std::vector<std::string> IncludePaths;
             std::vector<std::string> AbsoluteIncludePaths;
-            std::unordered_map<ProfileName, DependencySearchProperty> SearchProperties;
+            std::unordered_map<ProfileName, DependencyLinkProperty> LinkProperties;
             std::unordered_map<PlatformName, DependencySetup> Setup;
             
             bool ParseYAML_Node(YAML::Node& node);
diff --git a/Include/runcpp2/Data/DependencyLinkProperty.hpp b/Include/runcpp2/Data/DependencyLinkProperty.hpp
@@ -1,12 +1,12 @@
-#ifndef RUNCPP2_DATA_DEPENDENCY_SEARCH_PROPERTY_HPP
-#define RUNCPP2_DATA_DEPENDENCY_SEARCH_PROPERTY_HPP
+#ifndef RUNCPP2_DATA_DEPENDENCY_LINK_PROPERTY_HPP
+#define RUNCPP2_DATA_DEPENDENCY_LINK_PROPERTY_HPP
 
 #include "yaml-cpp/yaml.h"
 #include <string>
 
 namespace runcpp2
 {
-    class DependencySearchProperty
+    class DependencyLinkProperty
     {
         public:
             std::vector<std::string> SearchLibraryNames;
diff --git a/Src/runcpp2/Data/DependencyInfo.cpp b/Src/runcpp2/Data/DependencyInfo.cpp
@@ -14,7 +14,7 @@ bool runcpp2::DependencyInfo::ParseYAML_Node(YAML::Node& node)
         NodeRequirement("Source", YAML::NodeType::Map, true, false),
         NodeRequirement("LibraryType", YAML::NodeType::Scalar, true, false),
         NodeRequirement("IncludePaths", YAML::NodeType::Sequence, false, true),
-        NodeRequirement("SearchProperties", YAML::NodeType::Map, false, false),
+        NodeRequirement("LinkProperties", YAML::NodeType::Map, false, false),
         NodeRequirement("Setup", YAML::NodeType::Map, false, true)
     };
     
@@ -60,21 +60,21 @@ bool runcpp2::DependencyInfo::ParseYAML_Node(YAML::Node& node)
             IncludePaths.push_back(includePathsNode[i].as<std::string>());
     }
     
-    if(node["SearchProperties"])
+    if(node["LinkProperties"])
     {
-        YAML::Node searchPropertiesNode = node["SearchProperties"];
+        YAML::Node linkPropertiesNode = node["LinkProperties"];
         
-        for(auto it = searchPropertiesNode.begin(); it != searchPropertiesNode.end(); ++it)
+        for(auto it = linkPropertiesNode.begin(); it != linkPropertiesNode.end(); ++it)
         {
             ProfileName profile = it->first.as<ProfileName>();
-            DependencySearchProperty property;
+            DependencyLinkProperty property;
             if(!property.ParseYAML_Node(it->second))
             {
                 ssLOG_ERROR("DependencyInfo: Failed to parse SearchProperties");
                 return false;
             }
             
-            SearchProperties[profile] = property;
+            LinkProperties[profile] = property;
         }
     }
     
@@ -125,8 +125,8 @@ std::string runcpp2::DependencyInfo::ToString(std::string indentation) const
     for(auto it = IncludePaths.begin(); it != IncludePaths.end(); ++it)
         out += indentation + "    -   " + *it + "\n";
     
-    out += indentation + "    SearchProperties:\n";
-    for(auto it = SearchProperties.begin(); it != SearchProperties.end(); ++it)
+    out += indentation + "    LinkProperties:\n";
+    for(auto it = LinkProperties.begin(); it != LinkProperties.end(); ++it)
     {
         out += indentation + "        " + it->first + ":\n";
         out += it->second.ToString(indentation + "            ");
diff --git a/Src/runcpp2/Data/DependencyLinkProperty.cpp b/Src/runcpp2/Data/DependencyLinkProperty.cpp
@@ -1,9 +1,9 @@
-#include "runcpp2/Data/DependencySearchProperty.hpp"
+#include "runcpp2/Data/DependencyLinkProperty.hpp"
 #include "runcpp2/Data/ParseCommon.hpp"
 #include "runcpp2/ParseUtil.hpp"
 #include "ssLogger/ssLog.hpp"
 
-bool runcpp2::DependencySearchProperty::ParseYAML_Node(YAML::Node& node)
+bool runcpp2::DependencyLinkProperty::ParseYAML_Node(YAML::Node& node)
 {
     INTERNAL_RUNCPP2_SAFE_START();
     
@@ -36,7 +36,7 @@ bool runcpp2::DependencySearchProperty::ParseYAML_Node(YAML::Node& node)
     INTERNAL_RUNCPP2_SAFE_CATCH_RETURN(false);
 }
 
-std::string runcpp2::DependencySearchProperty::ToString(std::string indentation) const
+std::string runcpp2::DependencyLinkProperty::ToString(std::string indentation) const
 {
     std::string out;
     out += indentation + "SearchLibraryName: \n";

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`		`-#ifndef RUNCPP2_DATA_DEPENDENCY_SEARCH_PROPERTY_HPP`
`2`		`-#define RUNCPP2_DATA_DEPENDENCY_SEARCH_PROPERTY_HPP`
	`1`	`+#ifndef RUNCPP2_DATA_DEPENDENCY_LINK_PROPERTY_HPP`
	`2`	`+#define RUNCPP2_DATA_DEPENDENCY_LINK_PROPERTY_HPP`
`3`	`3`
`4`	`4`	`#include "yaml-cpp/yaml.h"`
`5`	`5`	`#include <string>`
`6`	`6`
`7`	`7`	`namespace runcpp2`
`8`	`8`	`{`
`9`		`- class DependencySearchProperty`
	`9`	`+ class DependencyLinkProperty`
`10`	`10`	`{`
`11`	`11`	`public:`
`12`	`12`	`std::vector<std::string> SearchLibraryNames;`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ bool runcpp2::DependencyInfo::ParseYAML_Node(YAML::Node& node)`
`14`	`14`	`NodeRequirement("Source", YAML::NodeType::Map, true, false),`
`15`	`15`	`NodeRequirement("LibraryType", YAML::NodeType::Scalar, true, false),`
`16`	`16`	`NodeRequirement("IncludePaths", YAML::NodeType::Sequence, false, true),`
`17`		`- NodeRequirement("SearchProperties", YAML::NodeType::Map, false, false),`
	`17`	`+ NodeRequirement("LinkProperties", YAML::NodeType::Map, false, false),`
`18`	`18`	`NodeRequirement("Setup", YAML::NodeType::Map, false, true)`
`19`	`19`	`};`
`20`	`20`
`@@ -60,21 +60,21 @@ bool runcpp2::DependencyInfo::ParseYAML_Node(YAML::Node& node)`
`60`	`60`	`IncludePaths.push_back(includePathsNode[i].as<std::string>());`
`61`	`61`	`}`
`62`	`62`
`63`		`- if(node["SearchProperties"])`
	`63`	`+ if(node["LinkProperties"])`
`64`	`64`	`{`
`65`		`- YAML::Node searchPropertiesNode = node["SearchProperties"];`
	`65`	`+ YAML::Node linkPropertiesNode = node["LinkProperties"];`
`66`	`66`
`67`		`- for(auto it = searchPropertiesNode.begin(); it != searchPropertiesNode.end(); ++it)`
	`67`	`+ for(auto it = linkPropertiesNode.begin(); it != linkPropertiesNode.end(); ++it)`
`68`	`68`	`{`
`69`	`69`	`ProfileName profile = it->first.as<ProfileName>();`
`70`		`- DependencySearchProperty property;`
	`70`	`+ DependencyLinkProperty property;`
`71`	`71`	`if(!property.ParseYAML_Node(it->second))`
`72`	`72`	`{`
`73`	`73`	`ssLOG_ERROR("DependencyInfo: Failed to parse SearchProperties");`
`74`	`74`	`return false;`
`75`	`75`	`}`
`76`	`76`
`77`		`- SearchProperties[profile] = property;`
	`77`	`+ LinkProperties[profile] = property;`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`
`@@ -125,8 +125,8 @@ std::string runcpp2::DependencyInfo::ToString(std::string indentation) const`
`125`	`125`	`for(auto it = IncludePaths.begin(); it != IncludePaths.end(); ++it)`
`126`	`126`	`out += indentation + " - " + *it + "\n";`
`127`	`127`
`128`		`- out += indentation + " SearchProperties:\n";`
`129`		`- for(auto it = SearchProperties.begin(); it != SearchProperties.end(); ++it)`
	`128`	`+ out += indentation + " LinkProperties:\n";`
	`129`	`+ for(auto it = LinkProperties.begin(); it != LinkProperties.end(); ++it)`
`130`	`130`	`{`
`131`	`131`	`out += indentation + " " + it->first + ":\n";`
`132`	`132`	`out += it->second.ToString(indentation + " ");`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`		`-#include "runcpp2/Data/DependencySearchProperty.hpp"`
	`1`	`+#include "runcpp2/Data/DependencyLinkProperty.hpp"`
`2`	`2`	`#include "runcpp2/Data/ParseCommon.hpp"`
`3`	`3`	`#include "runcpp2/ParseUtil.hpp"`
`4`	`4`	`#include "ssLogger/ssLog.hpp"`
`5`	`5`
`6`		`-bool runcpp2::DependencySearchProperty::ParseYAML_Node(YAML::Node& node)`
	`6`	`+bool runcpp2::DependencyLinkProperty::ParseYAML_Node(YAML::Node& node)`
`7`	`7`	`{`
`8`	`8`	`INTERNAL_RUNCPP2_SAFE_START();`
`9`	`9`
`@@ -36,7 +36,7 @@ bool runcpp2::DependencySearchProperty::ParseYAML_Node(YAML::Node& node)`
`36`	`36`	`INTERNAL_RUNCPP2_SAFE_CATCH_RETURN(false);`
`37`	`37`	`}`
`38`	`38`
`39`		`-std::string runcpp2::DependencySearchProperty::ToString(std::string indentation) const`
	`39`	`+std::string runcpp2::DependencyLinkProperty::ToString(std::string indentation) const`
`40`	`40`	`{`
`41`	`41`	`std::string out;`
`42`	`42`	`out += indentation + "SearchLibraryName: \n";`