[Tidy] Flatbuffer schema updates (#94)

- Segregated flatbuffer target.fbs to target.fbs and path.fbs
- Shifted to buildcc/schema directory instead of buildcc/lib/target/fbs directory

Author: coder137

buildcc/CMakeLists.txt

@@ -2,6 +2,9 @@
 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

buildcc/lib/target/CMakeLists.txt

@@ -6,9 +6,6 @@ if (${TESTING})
     add_subdirectory(test/target)
 endif()
 
-# Target flatc generator
-include(cmake/fbs_gen.cmake)
-
 # Target lib
 include(cmake/target.cmake)
 

buildcc/lib/target/cmake/fbs_gen.cmake

@@ -18,7 +18,7 @@ add_library(mock_target STATIC
 target_include_directories(mock_target PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/include
     ${CMAKE_CURRENT_SOURCE_DIR}/mock
-    ${CMAKE_CURRENT_BINARY_DIR}/generated
+    ${SCHEMA_BUILD_DIR}
 )
 
 target_compile_options(mock_target PUBLIC ${TEST_COMPILE_FLAGS} ${BUILD_COMPILE_FLAGS})

buildcc/lib/target/cmake/mock_target.cmake

@@ -32,7 +32,7 @@ if(${BUILDCC_BUILD_AS_SINGLE_LIB})
         $<INSTALL_INTERFACE:${BUILDCC_INSTALL_HEADER_PREFIX}>
     )
     target_include_directories(buildcc PRIVATE
-        ${CMAKE_CURRENT_BINARY_DIR}/generated
+        ${SCHEMA_BUILD_DIR}
     )
     add_dependencies(buildcc fbs_to_header)
 endif()
@@ -57,7 +57,7 @@ if(${BUILDCC_BUILD_AS_INTERFACE})
     )
 
     target_include_directories(target PRIVATE
-        ${CMAKE_CURRENT_BINARY_DIR}/generated
+        ${SCHEMA_BUILD_DIR}
     )
     target_compile_options(target PRIVATE ${BUILD_COMPILE_FLAGS})
     target_link_options(target PRIVATE ${BUILD_LINK_FLAGS})

buildcc/lib/target/cmake/target.cmake

@@ -0,0 +1,24 @@
+# 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}/target.fbs
+)
+set(FBS_GEN_FILES
+    ${SCHEMA_BUILD_DIR}/path_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}
+)

buildcc/schema/CMakeLists.txt

@@ -0,0 +1,20 @@
+// Copyright 2021 Niket Naidu. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace schema.internal;
+
+table Path {
+    pathname:string (key);
+    last_write_timestamp:uint64;
+}

buildcc/schema/path.fbs

@@ -12,12 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace schema.internal;
+include "path.fbs";
 
-table Path {
-    pathname:string (key);
-    last_write_timestamp:uint64;
-}
+namespace schema.internal;
 
 enum TargetType : byte {
     Executable,