coder137 · coder137 · Feb 13, 2022 · Feb 13, 2022 · Feb 13, 2022 · Feb 13, 2022
diff --git a/bootstrap/src/build_buildcc.cpp b/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");

diff --git a/buildcc/CMakeLists.txt b/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)
 

diff --git a/buildcc/lib/target/cmake/common_target_src.cmake b/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

diff --git a/buildcc/lib/target/cmake/mock_target.cmake b/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)
diff --git a/buildcc/lib/target/cmake/target.cmake b/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()
diff --git a/buildcc/lib/target/include/target/api/target_getter.h b/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"
 

diff --git a/buildcc/lib/target/include/target/api/target_info_getter.h b/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"

diff --git a/buildcc/lib/target/include/target/common/util.h b/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 {
 

diff --git a/buildcc/lib/target/include/target/friend/compile_object.h b/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"

diff --git a/buildcc/lib/target/include/target/generator.h b/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 {

diff --git a/buildcc/lib/target/include/target/interface/builder_interface.h b/buildcc/lib/target/include/target/interface/builder_interface.h
@@ -23,7 +23,6 @@
 
 #include "env/assert_fatal.h"
 
-#include "target/common/path.h"
 #include "target/common/util.h"
 
 namespace buildcc::internal {

diff --git a/buildcc/lib/target/include/target/target.h b/buildcc/lib/target/include/target/target.h
@@ -35,16 +35,16 @@
 #include "target/target_info.h"
 
 // Common
-#include "target/common/target_type.h"
+#include "schema/target_type.h"
 
 // Friend
 #include "target/friend/compile_object.h"
 #include "target/friend/compile_pch.h"
 #include "target/friend/link_target.h"
 
 // Internal
-#include "target/common/path.h"
-#include "target/serialization/target_serialization.h"
+#include "schema/path.h"
+#include "schema/target_serialization.h"
 
 // Env
 #include "env/env.h"

diff --git a/buildcc/lib/target/include/target/target_info.h b/buildcc/lib/target/include/target/target_info.h
@@ -32,7 +32,7 @@
 #include "target/api/sync_api.h"
 #include "target/api/target_info_getter.h"
 
-#include "target/serialization/target_serialization.h"
+#include "schema/target_serialization.h"
 
 namespace buildcc {
 

diff --git a/buildcc/lib/target/src/common/target_config.cpp b/buildcc/lib/target/src/common/target_config.cpp
@@ -18,7 +18,7 @@
 
 #include "env/assert_fatal.h"
 
-#include "target/common/path.h"
+#include "schema/path.h"
 
 #include "fmt/format.h"
 

diff --git a/buildcc/lib/target/src/target/friend/compile_pch.cpp b/buildcc/lib/target/src/target/friend/compile_pch.cpp
@@ -16,7 +16,7 @@
 
 #include "target/friend/compile_pch.h"
 
-#include "target/common/path.h"
+#include "schema/path.h"
 #include "target/target.h"
 
 #include "env/util.h"

diff --git a/buildcc/lib/target/test/path/CMakeLists.txt b/buildcc/lib/target/test/path/CMakeLists.txt
@@ -10,7 +10,9 @@ target_include_directories(${TEST_NAME} PRIVATE
     ${CMAKE_CURRENT_BINARY_DIR}/generated
 )
 target_link_libraries(${TEST_NAME} PRIVATE
-    mock_env    
+    mock_env
+    mock_schema
+
     CppUTest
     CppUTestExt
     gcov

diff --git a/buildcc/lib/target/test/path/test_path.cpp b/buildcc/lib/target/test/path/test_path.cpp
@@ -1,5 +1,5 @@
 // Internal
-#include "target/common/path.h"
+#include "schema/path.h"
 
 #include "env/assert_fatal.h"
 

diff --git a/buildcc/lib/target/test/target/test_builder_interface.cpp b/buildcc/lib/target/test/target/test_builder_interface.cpp
@@ -1,6 +1,6 @@
 #include "target/interface/builder_interface.h"
 
-#include "target/common/path.h"
+#include "schema/path.h"
 
 // NOTE, Make sure all these includes are AFTER the system and header includes
 #include "CppUTest/CommandLineTestRunner.h"

diff --git a/buildcc/lib/target/test/target/test_serialization_interface.cpp b/buildcc/lib/target/test/target/test_serialization_interface.cpp
@@ -1,4 +1,4 @@
-#include "target/interface/serialization_interface.h"
+#include "schema/interface/serialization_interface.h"
 
 // NOTE, Make sure all these includes are AFTER the system and header includes
 #include "CppUTest/CommandLineTestRunner.h"

diff --git a/buildcc/lib/target/test/target/test_target_external_lib.cpp b/buildcc/lib/target/test/target/test_target_external_lib.cpp
@@ -7,7 +7,7 @@
 
 #include "target/target.h"
 
-#include "target/serialization/target_serialization.h"
+#include "schema/target_serialization.h"
 
 #include <iostream>
 #include <unistd.h>

diff --git a/buildcc/lib/target/test/target/test_target_flags.cpp b/buildcc/lib/target/test/target/test_target_flags.cpp
@@ -8,7 +8,7 @@
 #include "env/env.h"
 
 //
-#include "target/serialization/target_serialization.h"
+#include "schema/target_serialization.h"
 
 // Third Party
 

diff --git a/buildcc/lib/target/test/target/test_target_lib_dep.cpp b/buildcc/lib/target/test/target/test_target_lib_dep.cpp
@@ -9,7 +9,7 @@
 #include "target/target.h"
 
 //
-#include "target/serialization/target_serialization.h"
+#include "schema/target_serialization.h"
 
 #include <iostream>
 #include <unistd.h>

diff --git a/buildcc/plugins/src/buildcc_find.cpp b/buildcc/plugins/src/buildcc_find.cpp
@@ -23,7 +23,7 @@
 #include "env/host_os_util.h"
 #include "env/logging.h"
 
-#include "target/common/path.h"
+#include "schema/path.h"
 
 namespace {
 constexpr const char *const kEnvVarNotFound =

diff --git a/buildcc/schema/CMakeLists.txt b/buildcc/schema/CMakeLists.txt
@@ -1,26 +1,2 @@
-# Generate files
-set(SCHEMA_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/generated CACHE PATH "Generate path of flatbuffer schema")
-
-set(FBS_FILES 
-    ${CMAKE_CURRENT_SOURCE_DIR}/path.fbs
-    ${CMAKE_CURRENT_SOURCE_DIR}/generator.fbs
-    ${CMAKE_CURRENT_SOURCE_DIR}/target.fbs
-)
-set(FBS_GEN_FILES
-    ${SCHEMA_BUILD_DIR}/path_generated.h
-    ${SCHEMA_BUILD_DIR}/generator_generated.h
-    ${SCHEMA_BUILD_DIR}/target_generated.h
-)
-set(FBS_GEN_OPTIONS 
-    -I ${CMAKE_CURRENT_SOURCE_DIR}
-    --gen-object-api
-)
-
-add_custom_command(OUTPUT ${FBS_GEN_FILES}
-    COMMAND flatc -o ${SCHEMA_BUILD_DIR} ${FBS_GEN_OPTIONS} --cpp ${FBS_FILES}
-    DEPENDS flatc ${FBS_FILES}
-)
-
-add_custom_target(fbs_to_header
-    DEPENDS ${FBS_GEN_FILES}
-)
+include(cmake/schema_generate.cmake)
+include(cmake/schema.cmake)