Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit2dedb35

Browse files
authored
Serialization common (#193)
1 parent99bcad0 commit2dedb35

File tree

38 files changed

+193
-113
lines changed

38 files changed

+193
-113
lines changed

‎bootstrap/src/build_buildcc.cpp‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,13 @@ void buildcc_cb(BaseTarget &target, const BaseGenerator &schema_gen,
5353
target.AddIncludeDir("lib/env/include");
5454
target.GlobHeaders("lib/env/include/env");
5555

56+
// SCHEMA
57+
target.GlobSources("schema/src");
58+
target.AddIncludeDir("schema/include");
59+
target.GlobHeaders("schema/include/schema");
60+
target.GlobHeaders("schema/include/schema/interface");
61+
target.GlobHeaders("schema/include/schema/private");
62+
5663
// TOOLCHAIN
5764
target.GlobSources("lib/toolchain/src/api");
5865
target.AddIncludeDir("lib/toolchain/include");
@@ -72,8 +79,6 @@ void buildcc_cb(BaseTarget &target, const BaseGenerator &schema_gen,
7279
target.GlobHeaders("lib/target/include/target/common");
7380
target.GlobHeaders("lib/target/include/target/friend");
7481
target.GlobHeaders("lib/target/include/target/interface");
75-
target.GlobHeaders("lib/target/include/target/private");
76-
target.GlobHeaders("lib/target/include/target/serialization");
7782

7883
// ARGS
7984
target.GlobSources("lib/args/src");

‎buildcc/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
set(BUILDCC_INSTALL_LIB_PREFIX"lib/cmake")
33
set(BUILDCC_INSTALL_HEADER_PREFIX"include/buildcc")
44

5-
# Flatbuffers schema
6-
add_subdirectory(schema)
7-
85
if(${BUILDCC_BUILD_AS_SINGLE_LIB})
96
add_library(buildccSTATIC
107
buildcc.h
@@ -31,6 +28,9 @@ if(${BUILDCC_BUILD_AS_SINGLE_LIB})
3128
endif()
3229
endif()
3330

31+
# Flatbuffers schema
32+
add_subdirectory(schema)
33+
3434
# Environment
3535
add_subdirectory(lib/env)
3636

‎buildcc/lib/target/cmake/common_target_src.cmake‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
11
set(COMMON_TARGET_SRCS
22
# Interfaces
33
include/target/interface/builder_interface.h
4-
include/target/interface/serialization_interface.h
54

65
# Common
76
src/common/target_config.cpp
87
src/common/target_state.cpp
9-
include/target/common/target_file_ext.h
108
include/target/common/target_config.h
119
include/target/common/target_state.h
10+
include/target/common/target_file_ext.h
1211
include/target/common/target_env.h
13-
include/target/common/target_type.h
1412

1513
src/common/util.cpp
1614
include/target/common/util.h
1715

18-
include/target/common/path.h
19-
2016
# API
2117
src/api/source_api.cpp
2218
src/api/include_api.cpp
@@ -39,10 +35,6 @@ set(COMMON_TARGET_SRCS
3935
include/target/api/target_info_getter.h
4036
include/target/api/target_getter.h
4137

42-
# Base Generator
43-
src/generator/generator_serialization.cpp
44-
include/target/serialization/generator_serialization.h
45-
4638
# Generator
4739
src/generator/generator.cpp
4840
include/target/generator.h
@@ -55,10 +47,6 @@ set(COMMON_TARGET_SRCS
5547
include/target/friend/compile_object.h
5648
include/target/friend/link_target.h
5749

58-
# Base Target
59-
src/target/target_serialization.cpp
60-
include/target/serialization/target_serialization.h
61-
6250
# Target
6351
src/target/target.cpp
6452
src/target/build.cpp

‎buildcc/lib/target/cmake/mock_target.cmake‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,14 @@ add_library(mock_target STATIC
1414
target_include_directories(mock_targetPUBLIC
1515
${CMAKE_CURRENT_SOURCE_DIR}/include
1616
${CMAKE_CURRENT_SOURCE_DIR}/mock
17-
${SCHEMA_BUILD_DIR}
1817
)
1918

2019
target_compile_options(mock_targetPUBLIC${TEST_COMPILE_FLAGS}${BUILD_COMPILE_FLAGS})
2120
target_link_options(mock_targetPUBLIC${TEST_LINK_FLAGS}${BUILD_LINK_FLAGS})
2221
target_link_libraries(mock_targetPUBLIC
23-
flatbuffers_header_only
2422
Taskflow
2523

24+
mock_schema
2625
mock_toolchain
2726

2827
CppUTest
@@ -36,5 +35,3 @@ if (${MINGW})
3635
message(WARNING"-Wl,--allow-multiple-definition for MINGW")
3736
target_link_options(mock_targetPUBLIC -Wl,--allow-multiple-definition)
3837
endif()
39-
40-
add_dependencies(mock_target fbs_to_header)

‎buildcc/lib/target/cmake/target.cmake‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ if(${BUILDCC_BUILD_AS_SINGLE_LIB})
1616
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
1717
$<INSTALL_INTERFACE:${BUILDCC_INSTALL_HEADER_PREFIX}>
1818
)
19-
target_include_directories(buildccPRIVATE
20-
${SCHEMA_BUILD_DIR}
21-
)
22-
add_dependencies(buildcc fbs_to_header)
2319
endif()
2420

2521
if(${BUILDCC_BUILD_AS_INTERFACE})
@@ -32,15 +28,10 @@ if(${BUILDCC_BUILD_AS_INTERFACE})
3228
$<INSTALL_INTERFACE:${BUILDCC_INSTALL_HEADER_PREFIX}>
3329
)
3430
target_link_libraries(targetPUBLIC
31+
schema
3532
toolchain
36-
flatbuffers_header_only
3733
Taskflow
3834
)
39-
40-
target_include_directories(targetPRIVATE
41-
${SCHEMA_BUILD_DIR}
42-
)
4335
target_compile_options(targetPRIVATE${BUILD_COMPILE_FLAGS})
4436
target_link_options(targetPRIVATE${BUILD_LINK_FLAGS})
45-
add_dependencies(target fbs_to_header)
4637
endif()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include<filesystem>
2121
#include<string>
2222

23-
#include"target/common/target_type.h"
23+
#include"schema/target_type.h"
2424

2525
#include"toolchain/toolchain.h"
2626

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#ifndef TARGET_API_TARGET_INFO_GETTER_H_
1818
#defineTARGET_API_TARGET_INFO_GETTER_H_
1919

20-
#include"target/common/path.h"
20+
#include"schema/path.h"
2121

2222
#include"target/common/target_config.h"
2323
#include"target/common/target_state.h"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include<string>
2121
#include<vector>
2222

23-
#include"target/common/path.h"
23+
#include"schema/path.h"
2424

2525
namespacebuildcc::internal {
2626

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#include<filesystem>
2121

22-
#include"target/common/path.h"
22+
#include"schema/path.h"
2323

2424
#include"taskflow/core/task.hpp"
2525
#include"taskflow/taskflow.hpp"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232

3333
#include"target/interface/builder_interface.h"
3434

35-
#include"target/serialization/generator_serialization.h"
35+
#include"schema/generator_serialization.h"
36+
#include"schema/path.h"
3637

37-
#include"target/common/path.h"
3838
#include"target/common/target_env.h"
3939

4040
namespacebuildcc {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp