diff options
| author | thegeorg <thegeorg@yandex-team.com> | 2024-07-03 11:48:56 +0300 |
|---|---|---|
| committer | thegeorg <thegeorg@yandex-team.com> | 2024-07-03 12:09:14 +0300 |
| commit | a7a899404c9de550eaa43da37981c62eb1d94acf (patch) | |
| tree | 93a60fc041723cb59b19c8ffe3a35e43698e0e50 | |
| parent | 39d250fef8dcae08909455af4373f9ebf65700e0 (diff) | |
| download | ydb-a7a899404c9de550eaa43da37981c62eb1d94acf.tar.gz | |
Completely remove traces of prebuilt contrib/tools/flatc
ab468c13a4ddf617e8b43c98d237c329fc5ece20
| -rw-r--r-- | build/conf/fbs.conf | 2 | ||||
| -rw-r--r-- | build/export_generators/cmake/cmake/fbs.cmake | 2 | ||||
| -rw-r--r-- | contrib/libs/flatbuffers/flatc/ya.make | 9 | ||||
| -rw-r--r-- | contrib/tools/flatc/ya.make | 27 |
4 files changed, 10 insertions, 30 deletions
diff --git a/build/conf/fbs.conf b/build/conf/fbs.conf index adb8cb8504..657d30d728 100644 --- a/build/conf/fbs.conf +++ b/build/conf/fbs.conf @@ -1,4 +1,4 @@ -FLATC=contrib/tools/flatc +FLATC=contrib/libs/flatbuffers/flatc FLATC64=contrib/tools/flatc64 # tag:fbs diff --git a/build/export_generators/cmake/cmake/fbs.cmake b/build/export_generators/cmake/cmake/fbs.cmake index 986983d5f3..22e8f0d413 100644 --- a/build/export_generators/cmake/cmake/fbs.cmake +++ b/build/export_generators/cmake/cmake/fbs.cmake @@ -1,7 +1,7 @@ include(common) function(target_fbs_source Tgt Key Src) - get_built_tool_path(flatc_bin flatc_dependency contrib/tools/flatc flatc) + get_built_tool_path(flatc_bin flatc_dependency contrib/libs/flatbuffers/flatc flatc) file(RELATIVE_PATH fbsRel ${PROJECT_SOURCE_DIR} ${Src}) get_filename_component(OutputBase ${fbsRel} NAME_WLE) diff --git a/contrib/libs/flatbuffers/flatc/ya.make b/contrib/libs/flatbuffers/flatc/ya.make index 1b01423fab..cd479e9a2c 100644 --- a/contrib/libs/flatbuffers/flatc/ya.make +++ b/contrib/libs/flatbuffers/flatc/ya.make @@ -1,11 +1,17 @@ # Generated by devtools/yamaker. -LIBRARY() +PROGRAM() LICENSE(Apache-2.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) +INDUCED_DEPS( + h + ${ARCADIA_ROOT}/contrib/libs/flatbuffers/include/flatbuffers/flatbuffers.h + ${ARCADIA_ROOT}/contrib/libs/flatbuffers/include/flatbuffers/flatbuffers_iter.h +) + PEERDIR( contrib/restricted/abseil-cpp/absl/base ) @@ -41,6 +47,7 @@ SRCS( src/file_name_saving_file_manager.cpp src/file_writer.cpp src/flatc.cpp + src/flatc_main.cpp src/idl_gen_binary.cpp src/idl_gen_cpp.cpp src/idl_gen_cpp_yandex_maps_iter.cpp diff --git a/contrib/tools/flatc/ya.make b/contrib/tools/flatc/ya.make deleted file mode 100644 index d7d57f05a9..0000000000 --- a/contrib/tools/flatc/ya.make +++ /dev/null @@ -1,27 +0,0 @@ -PROGRAM(flatc) - -INDUCED_DEPS( - h - ${ARCADIA_ROOT}/contrib/libs/flatbuffers/include/flatbuffers/flatbuffers.h - ${ARCADIA_ROOT}/contrib/libs/flatbuffers/include/flatbuffers/flatbuffers_iter.h -) - -NO_UTIL() - -ADDINCL( - contrib/libs/flatbuffers/include -) - -PEERDIR( - contrib/libs/flatbuffers/flatc -) - -SRCDIR( - contrib/libs/flatbuffers/src -) - -SRCS( - flatc_main.cpp -) - -END() |