diff options
| author | mikhnenko <mikhnenko@yandex-team.com> | 2024-06-28 10:17:39 +0300 |
|---|---|---|
| committer | mikhnenko <mikhnenko@yandex-team.com> | 2024-06-28 10:30:32 +0300 |
| commit | 5a08c58407a4c97834972d705c6fa311c42b8915 (patch) | |
| tree | a63562126a7490b03d30ff3957858336a4e1e4d4 /build | |
| parent | 086037f0e52ca51a16006e38176329da14801002 (diff) | |
| download | ydb-5a08c58407a4c97834972d705c6fa311c42b8915.tar.gz | |
Use protoc_old for perl
32ffef9bfd0386d73c6e0ac8887829e4e0056d08
Diffstat (limited to 'build')
| -rw-r--r-- | build/conf/proto.conf | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/build/conf/proto.conf b/build/conf/proto.conf index 96ae17212a..7f543ecc03 100644 --- a/build/conf/proto.conf +++ b/build/conf/proto.conf @@ -1,8 +1,10 @@ # tag:tool-specific tag:proto PROTOC=${tool:"contrib/tools/protoc"} +PROTOC_OLD=${tool:"contrib/tools/protoc_old"} + PY_PROTOC=${tool:"contrib/tools/protoc"} when ($PYTHON2 == "yes") { - PY_PROTOC=${tool:"contrib/tools/protoc_old"} + PY_PROTOC=${PROTOC_OLD} } JAVA_PROTOC=${tool:"build/platform/java/protoc"} @@ -16,6 +18,7 @@ otherwise { PROTOC_STYLEGUIDE_OUT=--cpp_styleguide_out=$ARCADIA_BUILD_ROOT/$PROTO_NAMESPACE PROTOC_PLUGIN_STYLEGUIDE=--plugin=protoc-gen-cpp_styleguide=${tool:"contrib/tools/protoc/plugins/cpp_styleguide"} PROTOBUF_PATH=${ARCADIA_ROOT}/contrib/libs/protobuf/src + PROTOBUF_OLD_PATH=${ARCADIA_ROOT}/contrib/libs/protobuf_old/src DEFAULT_PROTOC_TOOLS=${hide;tool:"contrib/tools/protoc/bin"} ${hide;tool:"contrib/tools/protoc/plugins/cpp_styleguide"} } USE_VANILLA_PROTOC=no @@ -509,7 +512,7 @@ macro _JAVA_PROTO_CMD(File) { ### Generate Perl code from protobuf. ### In order to use this macro one should predict all outputs protoc will emit from input_proto file and enlist those as outputs. macro XS_PROTO(File, Dir, Outputs...) { - .CMD=$PROTOC -I=${ARCADIA_ROOT}/${Dir} ${pre=-I=:_PROTO__INCLUDE} -I=${ARCADIA_ROOT} -I=${PROTOBUF_PATH} --perlxs_out=${BINDIR} $_PROTOC_FLAGS ${input:File} ${hide;output:Outputs} ${induced_deps=h+cpp;hide;nopath;noext;suf=.pb.h:File} ${hide:PROTO_FAKEID} + .CMD=${PROTOC_OLD} -I=${ARCADIA_ROOT}/${Dir} ${pre=-I=:_PROTO__INCLUDE} -I=${ARCADIA_ROOT} -I=${PROTOBUF_OLD_PATH} --perlxs_out=${BINDIR} $_PROTOC_FLAGS ${input:File} ${hide;output:Outputs} ${induced_deps=h+cpp;hide;nopath;noext;suf=.pb.h:File} ${hide:PROTO_FAKEID} PEERDIR(${Dir}) ADDINCL(${ARCADIA_BUILD_ROOT}/${Dir}) } |