Merge pull request #63 from Neko-Box-Coder/RemoveRYML

Remove all usage of ryml, updating DSResult

Author: Neko-Box-Coder

.gitmodules

@@ -13,9 +13,6 @@
 [submodule "System2"]
 	path = External/System2
 	url = https://github.com/Neko-Box-Coder/System2.git
-[submodule "rapidyaml"]
-	path = External/rapidyaml
-	url = https://github.com/biojppm/rapidyaml.git
 [submodule "dylib"]
 	path = External/dylib
 	url = https://github.com/martin-olivier/dylib.git

CMakeLists.txt

@@ -98,10 +98,6 @@ message("RUNCPP2_PROJECT_VERSION: ${RUNCPP2_PROJECT_VERSION}")
 # endif()
 
 add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/ssLogger")
-
-set(RYML_DEFAULT_CALLBACK_USES_EXCEPTIONS ON CACHE BOOL "" FORCE)
-add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/rapidyaml")
-
 add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/filesystem")
 add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/System2")
 add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/dylib")
@@ -214,7 +210,7 @@ set(RUNCPP2_SOURCE_FILES    "${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/Data/Profile.
 add_library(runcpp2Lib STATIC ${RUNCPP2_SOURCE_FILES})
 
 set(RUNCPP2_PRIVATE_LINK_LIBS ssLogger System2 CppOverride dylib)
-set(RUNCPP2_PUBLIC_LINK_LIBS ghc_filesystem ryml::ryml mpark_variant MacroPowerToys string-view-lite yaml DSResult)
+set(RUNCPP2_PUBLIC_LINK_LIBS ghc_filesystem mpark_variant MacroPowerToys string-view-lite yaml DSResult)
 
 target_include_directories(runcpp2Lib PUBLIC "${CMAKE_CURRENT_LIST_DIR}/Include")
 target_link_libraries(runcpp2Lib PRIVATE ${RUNCPP2_PRIVATE_LINK_LIBS})

External/DSResult

@@ -30,7 +30,6 @@ namespace runcpp2
             std::unordered_map<PlatformName, ProfilesCommands> Build;
             std::unordered_map<PlatformName, FilesToCopyInfo> FilesToCopy;
 
-            bool ParseYAML_Node(ryml::ConstNodeRef node);
             bool ParseYAML_Node(YAML::ConstNodePtr node);
 
             std::string ToString(std::string indentation) const;

External/rapidyaml

@@ -25,12 +25,8 @@ namespace runcpp2
             public:
                 std::unordered_map<ProfileName, ProfileLinkProperty> ProfileProperties;
 
-                bool ParseYAML_Node(ryml::ConstNodeRef node);
                 bool ParseYAML_Node(YAML::ConstNodePtr node);
 
-                bool ParseYAML_NodeWithProfile(ryml::ConstNodeRef node, ProfileName profile);
-                bool IsYAML_NodeParsableAsDefault(ryml::ConstNodeRef node) const;
-                
                 bool ParseYAML_NodeWithProfile_LibYaml(YAML::ConstNodePtr node, ProfileName profile);
                 bool IsYAML_NodeParsableAsDefault_LibYaml(YAML::ConstNodePtr node) const;
 

Include/runcpp2/Data/DependencyInfo.hpp

@@ -21,7 +21,6 @@ namespace runcpp2
                 ghc::filesystem::path ImportPath;
                 std::vector<std::shared_ptr<DependencySource>> ImportedSources;
 
-                bool ParseYAML_Node(ryml::ConstNodeRef node);
                 bool ParseYAML_Node(YAML::ConstNodePtr node);
                 std::string ToString(std::string indentation) const;
                 bool Equals(const DependencySource& other) const;

Include/runcpp2/Data/DependencyLinkProperty.hpp

@@ -15,7 +15,6 @@ namespace runcpp2
             std::unordered_map<PlatformName, std::string> Prefix;
             std::unordered_map<PlatformName, std::string> Extension;
 
-            bool ParseYAML_Node(ryml::ConstNodeRef node);
             bool ParseYAML_Node(YAML::ConstNodePtr node);
 
             std::string ToString(std::string indentation) const;

Include/runcpp2/Data/DependencySource.hpp

@@ -16,12 +16,8 @@ namespace runcpp2
         {
             std::unordered_map<ProfileName, std::vector<std::string>> ProfileFiles;
 
-            bool ParseYAML_Node(ryml::ConstNodeRef node);
             bool ParseYAML_Node(YAML::ConstNodePtr node);
 
-            bool ParseYAML_NodeWithProfile(ryml::ConstNodeRef node, ProfileName profile);
-            bool IsYAML_NodeParsableAsDefault(ryml::ConstNodeRef node) const;
-            
             bool ParseYAML_NodeWithProfile_LibYaml(YAML::ConstNodePtr node, ProfileName profile);
             bool IsYAML_NodeParsableAsDefault_LibYaml(YAML::ConstNodePtr node) const;
 

Include/runcpp2/Data/FileProperties.hpp

@@ -17,7 +17,6 @@ namespace runcpp2
             FileProperties StaticLinkFile;
             FileProperties DebugSymbolFile;
 
-            bool ParseYAML_Node(ryml::ConstNodeRef node);
             bool ParseYAML_Node(YAML::ConstNodePtr node);
 
             std::string ToString(std::string indentation) const;