Просмотр исходного кода

Completely remove traces of prebuilt contrib/tools/flatc
ab468c13a4ddf617e8b43c98d237c329fc5ece20

thegeorg 8 месяцев назад
Родитель
Сommit
a7a899404c

+ 1 - 1
build/conf/fbs.conf

@@ -1,4 +1,4 @@
-FLATC=contrib/tools/flatc
+FLATC=contrib/libs/flatbuffers/flatc
 FLATC64=contrib/tools/flatc64
 FLATC64=contrib/tools/flatc64
 
 
 # tag:fbs
 # tag:fbs

+ 1 - 1
build/export_generators/cmake/cmake/fbs.cmake

@@ -1,7 +1,7 @@
 include(common)
 include(common)
 
 
 function(target_fbs_source Tgt Key Src)
 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})
     file(RELATIVE_PATH fbsRel ${PROJECT_SOURCE_DIR} ${Src})
     get_filename_component(OutputBase ${fbsRel} NAME_WLE)
     get_filename_component(OutputBase ${fbsRel} NAME_WLE)

+ 8 - 1
contrib/libs/flatbuffers/flatc/ya.make

@@ -1,11 +1,17 @@
 # Generated by devtools/yamaker.
 # Generated by devtools/yamaker.
 
 
-LIBRARY()
+PROGRAM()
 
 
 LICENSE(Apache-2.0)
 LICENSE(Apache-2.0)
 
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 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(
 PEERDIR(
     contrib/restricted/abseil-cpp/absl/base
     contrib/restricted/abseil-cpp/absl/base
 )
 )
@@ -41,6 +47,7 @@ SRCS(
     src/file_name_saving_file_manager.cpp
     src/file_name_saving_file_manager.cpp
     src/file_writer.cpp
     src/file_writer.cpp
     src/flatc.cpp
     src/flatc.cpp
+    src/flatc_main.cpp
     src/idl_gen_binary.cpp
     src/idl_gen_binary.cpp
     src/idl_gen_cpp.cpp
     src/idl_gen_cpp.cpp
     src/idl_gen_cpp_yandex_maps_iter.cpp
     src/idl_gen_cpp_yandex_maps_iter.cpp

+ 0 - 27
contrib/tools/flatc/ya.make

@@ -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()