aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthegeorg <thegeorg@yandex-team.com>2024-03-14 20:55:05 +0300
committerthegeorg <thegeorg@yandex-team.com>2024-03-14 21:10:46 +0300
commit26e02c5dc8553fac303eaf519dbf07009e988054 (patch)
tree4c66b440a321d50414f007d79869cc821382cfee
parent20558465ef042e98bd7fc06465d68425bf46ac58 (diff)
downloadydb-26e02c5dc8553fac303eaf519dbf07009e988054.tar.gz
Move PROTO2FBS macro definition to fbs.conf
3945b2ea03f4e67eec89091644aa88f4e7f7cacc
-rw-r--r--build/conf/fbs.conf8
-rw-r--r--build/conf/proto.conf8
2 files changed, 8 insertions, 8 deletions
diff --git a/build/conf/fbs.conf b/build/conf/fbs.conf
index a46a5b390c..1d04c139a5 100644
--- a/build/conf/fbs.conf
+++ b/build/conf/fbs.conf
@@ -143,6 +143,14 @@ macro FBS_CMD(SRC, SRCFLAGS...) {
.SEM=$_FBS_CMDLINE
}
+# tag:proto tag:fbs
+### @usage: PROTO2FBS(InputProto)
+###
+### Produce flatbuf schema out of protobuf description.
+macro PROTO2FBS(File) {
+ .CMD=${cwd:BINDIR} $FLATC -I . -I ${ARCADIA_ROOT} --proto ${input:File} ${output;hide;norel;noext:File.fbs} ${kv;hide:"p FBS"} ${kv;hide:"pc yellow"} && $MOVE_FILE ${BINDIR}/${nopath;noext:File.fbs} ${output;norel;noext:File.fbs}
+}
+
_CPP_FLATC_CMDLINE=$_CPP_FLATC_CMD($SRC $SRCFLAGS)
_CPP_FLATC64_CMDLINE=$_CPP_FLATC64_CMD($SRC $SRCFLAGS)
_JAVA_FLATC_CMDLINE=$_JAVA_FLATC_CMD($SRC $SRCFLAGS)
diff --git a/build/conf/proto.conf b/build/conf/proto.conf
index e368b332bb..bfd140a94c 100644
--- a/build/conf/proto.conf
+++ b/build/conf/proto.conf
@@ -494,14 +494,6 @@ macro XS_PROTO(File, Dir, Outputs...) {
ADDINCL(${ARCADIA_BUILD_ROOT}/${Dir})
}
-# tag:proto tag:fbs
-### @usage: PROTO2FBS(InputProto)
-###
-### Produce flatbuf schema out of protobuf description.
-macro PROTO2FBS(File) {
- .CMD=${cwd:BINDIR} $FLATC -I . -I ${ARCADIA_ROOT} --proto ${input:File} ${output;hide;norel;noext:File.fbs} ${kv;hide:"p FBS"} ${kv;hide:"pc yellow"} && $MOVE_FILE ${BINDIR}/${nopath;noext:File.fbs} ${output;norel;noext:File.fbs}
-}
-
# tag:proto tag:python-specific
when ($PY_PROTOS_FOR == "yes") {
PEERDIR+=contrib/libs/protobuf/python