Including libyaml as part of unity build

Author: Neko-Box-Coder

CMakeLists.txt

@@ -112,7 +112,9 @@ set(DS_USE_DEBUG_BREAK ON)
 add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/DSResult")
 
 set(BUILD_TESTING ON)
-add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/libyaml")
+# add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/libyaml")
+add_library(libyaml INTERFACE)
+target_include_directories(libyaml INTERFACE "${CMAKE_CURRENT_LIST_DIR}/External/libyaml/include")
 set(BUILD_TESTING OFF)
 
 # NOTE: Just include the file. Can't add subdirectory since it install stuff
@@ -183,7 +185,7 @@ set(RUNCPP2_SOURCE_FILES "${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/runcpp2.cpp")
 add_library(runcpp2Lib INTERFACE)
 
 set(RUNCPP2_PRIVATE_LINK_LIBS ssLogger System2 CppOverride dylib)
-set(RUNCPP2_PUBLIC_LINK_LIBS ghc_filesystem mpark_variant MacroPowerToys string-view-lite yaml DSResult)
+set(RUNCPP2_PUBLIC_LINK_LIBS ghc_filesystem mpark_variant MacroPowerToys string-view-lite libyaml DSResult)
 target_include_directories(runcpp2Lib INTERFACE "${CMAKE_CURRENT_LIST_DIR}/Include" 
                                                 "${CMAKE_CURRENT_LIST_DIR}/Src")
 target_link_libraries(runcpp2Lib INTERFACE ${RUNCPP2_PRIVATE_LINK_LIBS})

Include/runcpp2/Data/ScriptInfo.hpp

@@ -10,7 +10,6 @@
 #include "runcpp2/ParseUtil.hpp"
 #include "runcpp2/Data/ParseCommon.hpp"
 #include "runcpp2/LibYAML_Wrapper.hpp"
-#include "runcpp2/YamlLib.hpp"
 
 #undef RUNCPP2_CURRENT_CLASS_NAME
 #define RUNCPP2_CURRENT_CLASS_NAME ScriptInfo

Include/runcpp2/YamlLib.hpp

@@ -30,6 +30,8 @@
 #include <system_error>
 #include <unordered_map>
 
+//NOTE: #include "runcpp2/LibYamlImpl.cpp" at the end
+
 //Use for SetDllDirectory
 #if defined(_WIN32)
     #ifndef WIN32_LEAN_AND_MEAN
@@ -910,4 +912,6 @@ namespace runcpp2
     }
 }
 
+#include "runcpp2/LibYamlImpl.cpp"
+
 #endif

Include/runcpp2/runcpp2.hpp

@@ -4,6 +4,9 @@
 #include "ssLogger/ssLog.hpp"
 #include "MacroPowerToys.h"
 
+//NOTE: #include "runcpp2/DefaultYAMLs.c" at the end
+//NOTE: #include "runcpp2/LibYamlImpl.cpp" at the end
+
 CO_DECLARE_INSTANCE(OverrideInstance);
 
 #define INTERNAL_RUNCPP2_UNDEF_MOCKS 1
@@ -607,3 +610,4 @@ int main(int argc, char** argv)
 }
 
 #include "runcpp2/DefaultYAMLs.c"
+#include "runcpp2/LibYamlImpl.cpp"

Src/Tests/ConfigParsingTest.cpp

@@ -1,5 +1,5 @@
 #include "runcpp2/Data/DependencyInfo.hpp"
-#include "runcpp2/YamlLib.hpp"
+#include "runcpp2/LibYAML_Wrapper.hpp"
 #include "runcpp2/runcpp2.hpp"
 #include "runcpp2/DeferUtil.hpp"
 #include "ssLogger/ssLog.hpp"

Src/Tests/Data/DependencyInfoTest.cpp

@@ -1,5 +1,5 @@
 #include "runcpp2/Data/DependencySource.hpp"
-#include "runcpp2/YamlLib.hpp"
+#include "runcpp2/LibYAML_Wrapper.hpp"
 #include "runcpp2/runcpp2.hpp"
 #include "runcpp2/DeferUtil.hpp"
 #include "ssLogger/ssLog.hpp"

Src/Tests/Data/DependencySourceTest.cpp

@@ -1,6 +1,6 @@
 #include "runcpp2/Data/Profile.hpp"
 #include "runcpp2/runcpp2.hpp"
-#include "runcpp2/YamlLib.hpp"
+#include "runcpp2/LibYAML_Wrapper.hpp"
 #include "runcpp2/DeferUtil.hpp"
 #include "ssLogger/ssLog.hpp"
 

Src/Tests/Data/ProfileTest.cpp

@@ -1,5 +1,5 @@
 #include "runcpp2/Data/ScriptInfo.hpp"
-#include "runcpp2/YamlLib.hpp"
+#include "runcpp2/LibYAML_Wrapper.hpp"
 #include "runcpp2/runcpp2.hpp"
 #include "runcpp2/DeferUtil.hpp"
 #include "ssLogger/ssLog.hpp"

Src/Tests/Data/ScriptInfoTest.cpp

@@ -0,0 +1,17 @@
+//libyaml implementations
+extern "C" {
+    #define YAML_STR(x) #x
+    #define YAML_VERSION_MAJOR 0
+    #define YAML_VERSION_MINOR 2
+    #define YAML_VERSION_PATCH 5
+    #define YAML_VERSION_STRING YAML_STR(YAML_VERSION_MAJOR) "." YAML_STR(YAML_VERSION_MINOR) "." YAML_STR(YAML_VERSION_PATCH)
+    
+    #include "../src/api.c"
+    #include "../src/dumper.c"
+    #include "../src/emitter.c"
+    #include "../src/loader.c"
+    #include "../src/parser.c"
+    #include "../src/reader.c"
+    #include "../src/scanner.c"
+    #include "../src/writer.c"
+}