Serialization common (#193)

Author: coder137

bootstrap/src/build_buildcc.cpp

@@ -53,6 +53,13 @@ void buildcc_cb(BaseTarget &target, const BaseGenerator &schema_gen,
   target.AddIncludeDir("lib/env/include");
   target.GlobHeaders("lib/env/include/env");
 
+  // SCHEMA
+  target.GlobSources("schema/src");
+  target.AddIncludeDir("schema/include");
+  target.GlobHeaders("schema/include/schema");
+  target.GlobHeaders("schema/include/schema/interface");
+  target.GlobHeaders("schema/include/schema/private");
+
   // TOOLCHAIN
   target.GlobSources("lib/toolchain/src/api");
   target.AddIncludeDir("lib/toolchain/include");
@@ -72,8 +79,6 @@ void buildcc_cb(BaseTarget &target, const BaseGenerator &schema_gen,
   target.GlobHeaders("lib/target/include/target/common");
   target.GlobHeaders("lib/target/include/target/friend");
   target.GlobHeaders("lib/target/include/target/interface");
-  target.GlobHeaders("lib/target/include/target/private");
-  target.GlobHeaders("lib/target/include/target/serialization");
 
   // ARGS
   target.GlobSources("lib/args/src");

buildcc/CMakeLists.txt

@@ -2,9 +2,6 @@
 set(BUILDCC_INSTALL_LIB_PREFIX "lib/cmake")
 set(BUILDCC_INSTALL_HEADER_PREFIX "include/buildcc")
 
-# Flatbuffers schema
-add_subdirectory(schema)
-
 if(${BUILDCC_BUILD_AS_SINGLE_LIB})
     add_library(buildcc STATIC
         buildcc.h
@@ -31,6 +28,9 @@ if(${BUILDCC_BUILD_AS_SINGLE_LIB})
     endif()
 endif()
 
+# Flatbuffers schema
+add_subdirectory(schema)
+
 # Environment
 add_subdirectory(lib/env)
 

buildcc/lib/target/cmake/common_target_src.cmake

@@ -1,22 +1,18 @@
 set(COMMON_TARGET_SRCS 
     # Interfaces
     include/target/interface/builder_interface.h
-    include/target/interface/serialization_interface.h
 
     # Common
     src/common/target_config.cpp
     src/common/target_state.cpp
-    include/target/common/target_file_ext.h
     include/target/common/target_config.h
     include/target/common/target_state.h
+    include/target/common/target_file_ext.h
     include/target/common/target_env.h
-    include/target/common/target_type.h
 
     src/common/util.cpp
     include/target/common/util.h
 
-    include/target/common/path.h
-
     # API
     src/api/source_api.cpp
     src/api/include_api.cpp
@@ -39,10 +35,6 @@ set(COMMON_TARGET_SRCS
     include/target/api/target_info_getter.h
     include/target/api/target_getter.h
 
-    # Base Generator
-    src/generator/generator_serialization.cpp
-    include/target/serialization/generator_serialization.h
-
     # Generator
     src/generator/generator.cpp
     include/target/generator.h
@@ -55,10 +47,6 @@ set(COMMON_TARGET_SRCS
     include/target/friend/compile_object.h
     include/target/friend/link_target.h
 
-    # Base Target
-    src/target/target_serialization.cpp
-    include/target/serialization/target_serialization.h
-
     # Target
     src/target/target.cpp
     src/target/build.cpp

buildcc/lib/target/cmake/mock_target.cmake

@@ -14,15 +14,14 @@ add_library(mock_target STATIC
 target_include_directories(mock_target PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/include
     ${CMAKE_CURRENT_SOURCE_DIR}/mock
-    ${SCHEMA_BUILD_DIR}
 )
 
 target_compile_options(mock_target PUBLIC ${TEST_COMPILE_FLAGS} ${BUILD_COMPILE_FLAGS})
 target_link_options(mock_target PUBLIC ${TEST_LINK_FLAGS} ${BUILD_LINK_FLAGS})
 target_link_libraries(mock_target PUBLIC 
-    flatbuffers_header_only
     Taskflow
 
+    mock_schema
     mock_toolchain
 
     CppUTest
@@ -36,5 +35,3 @@ if (${MINGW})
     message(WARNING "-Wl,--allow-multiple-definition for MINGW")
     target_link_options(mock_target PUBLIC -Wl,--allow-multiple-definition)
 endif()
-
-add_dependencies(mock_target fbs_to_header)

buildcc/lib/target/cmake/target.cmake

@@ -16,10 +16,6 @@ if(${BUILDCC_BUILD_AS_SINGLE_LIB})
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
         $<INSTALL_INTERFACE:${BUILDCC_INSTALL_HEADER_PREFIX}>
     )
-    target_include_directories(buildcc PRIVATE
-        ${SCHEMA_BUILD_DIR}
-    )
-    add_dependencies(buildcc fbs_to_header)
 endif()
 
 if(${BUILDCC_BUILD_AS_INTERFACE})
@@ -32,15 +28,10 @@ if(${BUILDCC_BUILD_AS_INTERFACE})
         $<INSTALL_INTERFACE:${BUILDCC_INSTALL_HEADER_PREFIX}>
     )
     target_link_libraries(target PUBLIC 
+        schema
         toolchain
-        flatbuffers_header_only
         Taskflow
     )
-
-    target_include_directories(target PRIVATE
-        ${SCHEMA_BUILD_DIR}
-    )
     target_compile_options(target PRIVATE ${BUILD_COMPILE_FLAGS})
     target_link_options(target PRIVATE ${BUILD_LINK_FLAGS})
-    add_dependencies(target fbs_to_header)
 endif()

buildcc/lib/target/include/target/api/target_getter.h

@@ -20,7 +20,7 @@
 #include <filesystem>
 #include <string>
 
-#include "target/common/target_type.h"
+#include "schema/target_type.h"
 
 #include "toolchain/toolchain.h"
 

buildcc/lib/target/include/target/api/target_info_getter.h

@@ -17,7 +17,7 @@
 #ifndef TARGET_API_TARGET_INFO_GETTER_H_
 #define TARGET_API_TARGET_INFO_GETTER_H_
 
-#include "target/common/path.h"
+#include "schema/path.h"
 
 #include "target/common/target_config.h"
 #include "target/common/target_state.h"

buildcc/lib/target/include/target/common/util.h

@@ -20,7 +20,7 @@
 #include <string>
 #include <vector>
 
-#include "target/common/path.h"
+#include "schema/path.h"
 
 namespace buildcc::internal {
 

buildcc/lib/target/include/target/friend/compile_object.h

@@ -19,7 +19,7 @@
 
 #include <filesystem>
 
-#include "target/common/path.h"
+#include "schema/path.h"
 
 #include "taskflow/core/task.hpp"
 #include "taskflow/taskflow.hpp"

buildcc/lib/target/include/target/generator.h

@@ -32,9 +32,9 @@
 
 #include "target/interface/builder_interface.h"
 
-#include "target/serialization/generator_serialization.h"
+#include "schema/generator_serialization.h"
+#include "schema/path.h"
 
-#include "target/common/path.h"
 #include "target/common/target_env.h"
 
 namespace buildcc {