diff options
| author | snermolaev <snermolaev@yandex-team.com> | 2024-07-30 09:44:35 +0300 |
|---|---|---|
| committer | snermolaev <snermolaev@yandex-team.com> | 2024-07-30 09:58:52 +0300 |
| commit | 997c68115bc1c9dd2fce5a6a6f8eae92ad628df7 (patch) | |
| tree | db8d58768e1d4332c772eeb41c4b51faa913aa90 /build/conf | |
| parent | 704143d4c8c957833b5188e17e3ad4bfe89c64fc (diff) | |
| download | ydb-997c68115bc1c9dd2fce5a6a6f8eae92ad628df7.tar.gz | |
Revert commit rXXXXXX, collect .proto files by PROTO_DESCRIPTIONS
b9f5656ae46daedf9083c3721d8cb31a02b1c4c7
Diffstat (limited to 'build/conf')
| -rw-r--r-- | build/conf/proto.conf | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/build/conf/proto.conf b/build/conf/proto.conf index 30263d68a0..d68ec651d3 100644 --- a/build/conf/proto.conf +++ b/build/conf/proto.conf @@ -639,12 +639,12 @@ macro LIST_PROTO(TO="files.proto", Files...) { } # 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=.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} +macro _PROTO_DESC_CMD(File) { + .CMD=${cwd;rootdir;input:File} $PROTOC -I=./$PROTO_NAMESPACE -I=$ARCADIA_ROOT/$PROTO_NAMESPACE ${pre=-I=:_PROTO__INCLUDE} -I=$ARCADIA_BUILD_ROOT -I=$PROTOBUF_INCLUDE_PATH --descriptor_set_out=${output;suf=.desc:File} --include_source_info $_PROTOC_FLAGS ${input;rootrel:File} ${hide:PROTO_FAKEID} } -_PROTO_DESC_MERGE_CMD=$YMAKE_PYTHON3 ${input:"build/scripts/merge_files.py"} $TARGET ${ext=.desc:AUTO_INPUT} ${kv;hide:"p PD"} ${kv;hide:"pc light-cyan"} && ${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON3 ${input:"build/scripts/collect_rawproto.py"} --output ${output;suf=.protosrc:REALPRJNAME} ${rootrel;ext=.rawproto:AUTO_INPUT} -_PROTO_DESC_MERGE_PEERS_CMD=$YMAKE_PYTHON3 ${input:"build/scripts/merge_files.py"} $TARGET $PEERS ${ext=.protodesc:SRCS_GLOBAL} ${kv;hide:"p PD"} ${kv;hide:"pc light-cyan"} && ${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON3 ${input:"build/scripts/merge_protosrc.py"} --output ${output;suf=.tar:REALPRJNAME} ${rootrel:PEERS} +_PROTO_DESC_MERGE_CMD=$YMAKE_PYTHON ${input:"build/scripts/merge_files.py"} $TARGET $AUTO_INPUT ${kv;hide:"p PD"} ${kv;hide:"pc light-cyan"} +_PROTO_DESC_MERGE_PEERS_CMD=$YMAKE_PYTHON ${input:"build/scripts/merge_files.py"} $TARGET $PEERS ${ext=.protodesc:SRCS_GLOBAL} ${kv;hide:"p PD"} ${kv;hide:"pc light-cyan"} NEED_GOOGLE_PROTO_PEERDIRS=yes @@ -807,7 +807,7 @@ multimodule PROTO_LIBRARY { module DESC_PROTO: _BARE_UNIT { .CMD=_PROTO_DESC_MERGE_CMD .SEM=IGNORED - .EXTS=.desc .rawproto + .EXTS=.desc .NODE_TYPE=Library .IGNORED=GENERATE_ENUM_SERIALIZATION GENERATE_ENUM_SERIALIZATION_WITH_HEADER YMAPS_SPROTO RESOURCE GO_PROTO_PLUGIN GRPC @@ -869,6 +869,6 @@ _CPP_PROTO_EVLOG_CMDLINE=$_CPP_PROTO_EVLOG_CMD($SRC) _CPP_VANILLA_PROTO_CMDLINE=$_CPP_VANILLA_PROTO_CMD($SRC) _JAVA_EVLOG_CMDLINE=$_JAVA_EVLOG_CMD($SRC) _JAVA_PROTO_CMDLINE=$_JAVA_PROTO_CMD($SRC) -_PROTO_DESC_CMDLINE=$_PROTO_DESC_RAWPROTO_CMD($SRC) +_PROTO_DESC_CMDLINE=$_PROTO_DESC_CMD($SRC) _PY_EVLOG_CMDLINE=$_PY_EVLOG_CMD($SRC) _PY_PROTO_CMDLINE=$_PY_PROTO_CMD($SRC) |