Merge branch 'master' into SpecificDefault

Neko-Box-Coder · Neko-Box-Coder · commit 86df61ed242a · 2024-11-04T12:45:24.000Z
diff --git a/External/ssTest b/External/ssTest
@@ -1 +1 @@
-Subproject commit 48c09f832826639efc4712f2f8aefb0facccbac6
+Subproject commit abe87d23fef7d8819df5f7127ef69818e523245d
diff --git a/Include/runcpp2/Data/DependencyCommands.hpp b/Include/runcpp2/Data/DependencyCommands.hpp
@@ -2,8 +2,8 @@
 #define RUNCPP2_DATA_DEPENDENCY_COMMANDS_HPP
 
 #include "runcpp2/Data/ParseCommon.hpp"
+#include "runcpp2/YamlLib.hpp"
 
-#include "ryml.hpp"
 #include <string>
 #include <unordered_map>
 #include <vector>
diff --git a/Include/runcpp2/Data/DependencyInfo.hpp b/Include/runcpp2/Data/DependencyInfo.hpp
@@ -7,7 +7,7 @@
 #include "runcpp2/Data/DependencyCommands.hpp"
 #include "runcpp2/Data/ParseCommon.hpp"
 #include "runcpp2/Data/FilesToCopyInfo.hpp"
-#include "ryml.hpp"
+#include "runcpp2/YamlLib.hpp"
 
 #include <string>
 #include <unordered_set>
diff --git a/Include/runcpp2/Data/DependencyLinkProperty.hpp b/Include/runcpp2/Data/DependencyLinkProperty.hpp
@@ -2,8 +2,7 @@
 #define RUNCPP2_DATA_DEPENDENCY_LINK_PROPERTY_HPP
 
 #include "runcpp2/Data/ParseCommon.hpp"
-
-#include "ryml.hpp"
+#include "runcpp2/YamlLib.hpp"
 
 #include <vector>
 #include <unordered_map>
diff --git a/Include/runcpp2/Data/DependencySource.hpp b/Include/runcpp2/Data/DependencySource.hpp
@@ -2,7 +2,8 @@
 #define RUNCPP2_DATA_DEPENDENCY_SOURCE_HPP
 
 #include "runcpp2/Data/DependencySourceType.hpp"
-#include "ryml.hpp"
+#include "runcpp2/YamlLib.hpp"
+
 #include <string>
 
 namespace runcpp2
diff --git a/Include/runcpp2/Data/FileProperties.hpp b/Include/runcpp2/Data/FileProperties.hpp
@@ -2,8 +2,8 @@
 #define RUNCPP2_DATA_FILE_PROPERTIES_HPP
 
 #include "runcpp2/Data/ParseCommon.hpp"
+#include "runcpp2/YamlLib.hpp"
 
-#include "ryml.hpp"
 #include <unordered_map>
 
 namespace runcpp2
diff --git a/Include/runcpp2/Data/FilesToCopyInfo.hpp b/Include/runcpp2/Data/FilesToCopyInfo.hpp
@@ -2,7 +2,8 @@
 #define RUNCPP2_DATA_FILES_TO_COPY_INFO_HPP
 
 #include "runcpp2/Data/ParseCommon.hpp"
-#include "ryml.hpp"
+#include "runcpp2/YamlLib.hpp"
+
 #include <unordered_map>
 #include <vector>
 #include <string>
diff --git a/Include/runcpp2/Data/FilesTypesInfo.hpp b/Include/runcpp2/Data/FilesTypesInfo.hpp
@@ -3,7 +3,7 @@
 
 #include "runcpp2/Data/FileProperties.hpp"
 #include "runcpp2/Data/ParseCommon.hpp"
-#include "ryml.hpp"
+#include "runcpp2/YamlLib.hpp"
 
 namespace runcpp2
 {
diff --git a/Include/runcpp2/Data/FlagsOverrideInfo.hpp b/Include/runcpp2/Data/FlagsOverrideInfo.hpp
@@ -1,7 +1,7 @@
 #ifndef RUNCPP2_DATA_FLAGS_OVERRIDE_INFO_HPP
 #define RUNCPP2_DATA_FLAGS_OVERRIDE_INFO_HPP
 
-#include "ryml.hpp"
+#include "runcpp2/YamlLib.hpp"
 #include <string>
 
 namespace runcpp2
diff --git a/Include/runcpp2/Data/Profile.hpp b/Include/runcpp2/Data/Profile.hpp
@@ -4,8 +4,7 @@
 #include "runcpp2/Data/ParseCommon.hpp"
 #include "runcpp2/Data/FilesTypesInfo.hpp"
 #include "runcpp2/Data/StageInfo.hpp"
-
-#include "ryml.hpp"
+#include "runcpp2/YamlLib.hpp"
 
 #include <string>
 #include <unordered_map>
diff --git a/Include/runcpp2/Data/ProfilesCompilesFiles.hpp b/Include/runcpp2/Data/ProfilesCompilesFiles.hpp
@@ -3,10 +3,11 @@
 
 #include "runcpp2/Data/ParseCommon.hpp"
 
+#include "runcpp2/YamlLib.hpp"
+
 #define NOMINMAX 1
 #include "ghc/filesystem.hpp"
 
-#include "ryml.hpp"
 #include <unordered_map>
 
 namespace runcpp2
diff --git a/Include/runcpp2/Data/ProfilesDefines.hpp b/Include/runcpp2/Data/ProfilesDefines.hpp
@@ -2,7 +2,8 @@
 #define RUNCPP2_DATA_PROFILES_DEFINES_HPP
 
 #include "runcpp2/Data/ParseCommon.hpp"
-#include "ryml.hpp"
+#include "runcpp2/YamlLib.hpp"
+
 #include <unordered_map>
 #include <vector>
 #include <string>
diff --git a/Include/runcpp2/Data/StageInfo.hpp b/Include/runcpp2/Data/StageInfo.hpp
@@ -2,7 +2,7 @@
 #define RUNCPP2_DATA_STAGE_INFO_HPP
 
 #include "runcpp2/Data/ParseCommon.hpp"
-#include "ryml.hpp"
+#include "runcpp2/YamlLib.hpp"
 
 #include <vector>
 #include <string>
diff --git a/Include/runcpp2/ParseUtil.hpp b/Include/runcpp2/ParseUtil.hpp
@@ -1,7 +1,7 @@
 #ifndef RUNCPP2_PARSE_UTIL_HPP
 #define RUNCPP2_PARSE_UTIL_HPP
 
-#include "ryml.hpp"
+#include "runcpp2/YamlLib.hpp"
 
 #include <vector>
 
diff --git a/Include/runcpp2/YamlLib.hpp b/Include/runcpp2/YamlLib.hpp
@@ -0,0 +1,7 @@
+#ifndef RUNCPP2_YAML_LIB_HPP
+#define RUNCPP2_YAML_LIB_HPP
+
+#include "c4/std/string.hpp"
+#include "ryml.hpp"
+
+#endif
diff --git a/Src/Tests/Data/DependencyCommandsTest.cpp b/Src/Tests/Data/DependencyCommandsTest.cpp
@@ -1,7 +1,6 @@
 #include "runcpp2/Data/DependencyCommands.hpp"
 #include "ssTest.hpp"
-#include "ryml.hpp"
-#include "c4/std/string.hpp"
+#include "runcpp2/YamlLib.hpp"
 #include "runcpp2/runcpp2.hpp"
 
 int main(int argc, char** argv)
diff --git a/Src/Tests/Data/DependencyInfoTest.cpp b/Src/Tests/Data/DependencyInfoTest.cpp
@@ -1,7 +1,6 @@
 #include "runcpp2/Data/DependencyInfo.hpp"
 #include "ssTest.hpp"
-#include "ryml.hpp"
-#include "c4/std/string.hpp"
+#include "runcpp2/YamlLib.hpp"
 #include "runcpp2/runcpp2.hpp"
 
 int main(int argc, char** argv)
diff --git a/Src/Tests/Data/DependencyLinkPropertyTest.cpp b/Src/Tests/Data/DependencyLinkPropertyTest.cpp
@@ -1,7 +1,6 @@
 #include "runcpp2/Data/DependencyLinkProperty.hpp"
 #include "ssTest.hpp"
-#include "ryml.hpp"
-#include "c4/std/string.hpp"
+#include "runcpp2/YamlLib.hpp"
 #include "runcpp2/runcpp2.hpp"
 
 int main(int argc, char** argv)
diff --git a/Src/Tests/Data/DependencySourceTest.cpp b/Src/Tests/Data/DependencySourceTest.cpp
@@ -1,7 +1,6 @@
 #include "runcpp2/Data/DependencySource.hpp"
 #include "ssTest.hpp"
-#include "ryml.hpp"
-#include "c4/std/string.hpp"
+#include "runcpp2/YamlLib.hpp"
 #include "runcpp2/runcpp2.hpp"
 
 int main(int argc, char** argv)
diff --git a/Src/Tests/Data/FilePropertiesTest.cpp b/Src/Tests/Data/FilePropertiesTest.cpp
@@ -1,8 +1,7 @@
 #include "runcpp2/Data/FileProperties.hpp"
 #include "ssTest.hpp"
-#include "ryml.hpp"
-#include "c4/std/string.hpp"
 #include "runcpp2/runcpp2.hpp"
+#include "runcpp2/YamlLib.hpp"
 
 int main(int argc, char** argv)
 {
diff --git a/Src/Tests/Data/FilesToCopyInfoTest.cpp b/Src/Tests/Data/FilesToCopyInfoTest.cpp
@@ -1,7 +1,6 @@
 #include "runcpp2/Data/FilesToCopyInfo.hpp"
 #include "ssTest.hpp"
-#include "ryml.hpp"
-#include "c4/std/string.hpp"
+#include "runcpp2/YamlLib.hpp"
 #include "runcpp2/runcpp2.hpp"
 
 int main(int argc, char** argv)
diff --git a/Src/Tests/Data/FilesTypesInfoTest.cpp b/Src/Tests/Data/FilesTypesInfoTest.cpp
@@ -1,7 +1,6 @@
 #include "runcpp2/Data/FilesTypesInfo.hpp"
 #include "ssTest.hpp"
-#include "ryml.hpp"
-#include "c4/std/string.hpp"
+#include "runcpp2/YamlLib.hpp"
 #include "runcpp2/runcpp2.hpp"
 
 int main(int argc, char** argv)
diff --git a/Src/Tests/Data/FlagsOverrideInfoTest.cpp b/Src/Tests/Data/FlagsOverrideInfoTest.cpp
@@ -1,7 +1,6 @@
 #include "runcpp2/Data/FlagsOverrideInfo.hpp"
 #include "ssTest.hpp"
-#include "ryml.hpp"
-#include "c4/std/string.hpp"
+#include "runcpp2/YamlLib.hpp"
 #include "runcpp2/runcpp2.hpp"
 
 int main(int argc, char** argv)
diff --git a/Src/Tests/Data/ProfileTest.cpp b/Src/Tests/Data/ProfileTest.cpp
@@ -1,8 +1,7 @@
 #include "runcpp2/Data/Profile.hpp"
 #include "ssTest.hpp"
-#include "ryml.hpp"
-#include "c4/std/string.hpp"
 #include "runcpp2/runcpp2.hpp"
+#include "runcpp2/YamlLib.hpp"
 
 int main(int argc, char** argv)
 {
diff --git a/Src/Tests/Data/ProfilesCompilesFilesTest.cpp b/Src/Tests/Data/ProfilesCompilesFilesTest.cpp
@@ -1,7 +1,6 @@
 #include "runcpp2/Data/ProfilesCompilesFiles.hpp"
 #include "ssTest.hpp"
-#include "ryml.hpp"
-#include "c4/std/string.hpp"
+#include "runcpp2/YamlLib.hpp"
 #include "runcpp2/runcpp2.hpp"
 
 int main(int argc, char** argv)
diff --git a/Src/Tests/Data/ProfilesDefinesTest.cpp b/Src/Tests/Data/ProfilesDefinesTest.cpp
@@ -1,7 +1,6 @@
 #include "runcpp2/Data/ProfilesDefines.hpp"
 #include "ssTest.hpp"
-#include "ryml.hpp"
-#include "c4/std/string.hpp"
+#include "runcpp2/YamlLib.hpp"
 #include "runcpp2/runcpp2.hpp"
 
 int main(int argc, char** argv)
diff --git a/Src/Tests/Data/ProfilesFlagsOverrideTest.cpp b/Src/Tests/Data/ProfilesFlagsOverrideTest.cpp
@@ -1,7 +1,6 @@
 #include "runcpp2/Data/ProfilesFlagsOverride.hpp"
 #include "ssTest.hpp"
-#include "ryml.hpp"
-#include "c4/std/string.hpp"
+#include "runcpp2/YamlLib.hpp"
 #include "runcpp2/runcpp2.hpp"
 
 int main(int argc, char** argv)
diff --git a/Src/Tests/Data/ScriptInfoTest.cpp b/Src/Tests/Data/ScriptInfoTest.cpp
@@ -1,7 +1,6 @@
 #include "runcpp2/Data/ScriptInfo.hpp"
 #include "ssTest.hpp"
-#include "ryml.hpp"
-#include "c4/std/string.hpp"
+#include "runcpp2/YamlLib.hpp"
 #include "runcpp2/runcpp2.hpp"
 
 int main(int argc, char** argv)
diff --git a/Src/Tests/Data/StageInfoTest.cpp b/Src/Tests/Data/StageInfoTest.cpp
@@ -1,7 +1,6 @@
 #include "runcpp2/Data/StageInfo.hpp"
 #include "ssTest.hpp"
-#include "ryml.hpp"
-#include "c4/std/string.hpp"
+#include "runcpp2/YamlLib.hpp"
 #include "runcpp2/runcpp2.hpp"
 
 int main(int argc, char** argv)
diff --git a/Src/runcpp2/ConfigParsing.cpp b/Src/runcpp2/ConfigParsing.cpp
@@ -1,8 +1,7 @@
 #include "runcpp2/ConfigParsing.hpp"
 #include "runcpp2/ParseUtil.hpp"
+#include "runcpp2/YamlLib.hpp"
 
-#include "ryml.hpp"
-#include "c4/std/string.hpp"
 #include "cfgpath.h"
 #include "ghc/filesystem.hpp"
 #include "ssLogger/ssLog.hpp"

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`#include "runcpp2/Data/FileProperties.hpp"`
`5`	`5`	`#include "runcpp2/Data/ParseCommon.hpp"`
`6`		`-#include "ryml.hpp"`
	`6`	`+#include "runcpp2/YamlLib.hpp"`
`7`	`7`
`8`	`8`	`namespace runcpp2`
`9`	`9`	`{`