aboutsummaryrefslogtreecommitdiffstats
path: root/build/conf/proto.conf
diff options
context:
space:
mode:
authorsomov <somov@yandex-team.com>2024-08-19 22:55:28 +0300
committersomov <somov@yandex-team.com>2024-08-19 23:16:58 +0300
commit397a82f8ab18a1a8a252dcb9b5420720a316677c (patch)
tree2613076970cdf8ec9b687578207f6220f84a2004 /build/conf/proto.conf
parent1eaba9d271d7f990fd5a17e492b5c41e6b144c48 (diff)
downloadydb-397a82f8ab18a1a8a252dcb9b5420720a316677c.tar.gz
Fix LIST_PROTO dependency on incorrect properties passing between main and additional outputs
bb4a52dc41ed160f50f9dece539dbd788be97430
Diffstat (limited to 'build/conf/proto.conf')
-rw-r--r--build/conf/proto.conf7
1 files changed, 6 insertions, 1 deletions
diff --git a/build/conf/proto.conf b/build/conf/proto.conf
index 6bacb350e0..ab01c024b1 100644
--- a/build/conf/proto.conf
+++ b/build/conf/proto.conf
@@ -634,10 +634,15 @@ macro _GENERATE_PY_EVS_INTERNAL(FILES...) {
###
### TODO: proper implementation needed
macro LIST_PROTO(TO="files.proto", Files...) {
- .CMD=$YMAKE_PYTHON3 ${input:"build/scripts/list.py"} ${Files} ${input;hide:Files} ${stdout;output;noauto:TO} ${output_include;from_input;hide:Files} && $YMAKE_PYTHON ${input:"build/scripts/touch.py"} ${output;noext;suf=.pb.h:TO}
+ .CMD=$YMAKE_PYTHON3 ${input:"build/scripts/list.py"} ${Files} ${input;hide:Files} ${stdout;output;noauto:TO} ${output_include;from_input;hide:Files}
+ _COMPILE_LIST_PROTO(${TO})
_EXPOSE(${TO})
}
+macro _COMPILE_LIST_PROTO(SRC) {
+ .CMD=$YMAKE_PYTHON ${input:"build/scripts/touch.py"} ${input;hide:SRC} ${output;noext;suf=.pb.h:SRC}
+}
+
# tag:proto
macro _PROTO_DESC_RAWPROTO_CMD(File) {
.CMD=${cwd;rootdir;input:File} $YMAKE_PYTHON3 ${input:"build/scripts/desc_rawproto_wrapper.py"} --desc-output ${output;suf=.desc:File} --rawproto-output ${output;norel;suf=.${_MODDIR_HASH}.rawproto:File} --proto-file ${input;rootrel:File} -- $PROTOC -I=./$PROTO_NAMESPACE -I=$ARCADIA_ROOT/$PROTO_NAMESPACE ${pre=-I=:_PROTO__INCLUDE} -I=$ARCADIA_BUILD_ROOT -I=$PROTOBUF_INCLUDE_PATH --include_source_info $_PROTOC_FLAGS ${hide:PROTO_FAKEID}