diff options
| author | snermolaev <snermolaev@yandex-team.com> | 2024-03-29 09:33:27 +0300 |
|---|---|---|
| committer | snermolaev <snermolaev@yandex-team.com> | 2024-03-29 09:46:40 +0300 |
| commit | 96aeada1ca0f152abaa79537e03d75a4e4af94f3 (patch) | |
| tree | e2f0308408d46015c6dc624acb26644c965bb209 /build/conf/proto.conf | |
| parent | bc252a2deca02a342c35fcee243369a761c4f3d4 (diff) | |
| download | ydb-96aeada1ca0f152abaa79537e03d75a4e4af94f3.tar.gz | |
py2/py3
480434cd022569bd885a5446b39f15db14f8a6fe
Diffstat (limited to 'build/conf/proto.conf')
| -rw-r--r-- | build/conf/proto.conf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/conf/proto.conf b/build/conf/proto.conf index bfd140a94c..486b32f106 100644 --- a/build/conf/proto.conf +++ b/build/conf/proto.conf @@ -20,7 +20,7 @@ BUILD_PROTO_AS_EVLOG=no PROTO_NAMESPACE= # tag:proto tag:python-specific -GEN_PY_PROTOS=$YMAKE_PYTHON ${input:"build/scripts/gen_py_protos.py"} +GEN_PY_PROTOS=$YMAKE_PYTHON ${input:"build/scripts/gen_py_protos.py"} --py_ver ${_PYTHON_VER} # tag:proto tag:cpp-specific PROTO_HEADER_EXTS=.pb.h @@ -136,7 +136,7 @@ macro _PROTO_PLUGIN_ARGS_BASE(Name, Tool, OutParm...) { # tag:proto tag:python-specific macro _ADD_PY_PROTO_OUT(Suf) { SET_APPEND(PY_PROTO_OUTS \${output;hide;noauto;norel;nopath;noext;suf=$Suf:File}) - SET_APPEND(PY_PROTO_OUTS_INTERNAL \${output;hide;noauto;norel;nopath;noext;suf=__int__$Suf:File} \${hide;kv:"ext_out_name_for_\${nopath;noext;suf=__int__$Suf:File} \${nopath;noext;suf=$Suf:File}"}) + SET_APPEND(PY_PROTO_OUTS_INTERNAL \${output;hide;noauto;norel;nopath;noext;suf=__int${_PYTHON_VER}__$Suf:File} \${hide;kv:"ext_out_name_for_\${nopath;noext;suf=__int${_PYTHON_VER}__$Suf:File} \${nopath;noext;suf=$Suf:File}"}) # XXX fix variable expansion in plugins SET(PY_PROTO_SUFFIXES $PY_PROTO_SUFFIXES $Suf) } @@ -441,7 +441,7 @@ macro _PY_PROTO_CMD(File) { # tag:proto tag:python-specific macro _PY_PROTO_CMD_INTERNAL(File) { - .CMD=${cwd;rootdir;input:File} $GEN_PY_PROTOS --suffixes $PY_PROTO_SUFFIXES $PY_PROTO_MYPY_SUFFIX --input ${input;rootrel:File} --ns /$PROTO_NAMESPACE -- $_PY_PROTO_CMD_BASE($File __int___pb2.py $PY_PROTO_OPTS $PY_PROTO_OUTS_INTERNAL ${hide;kv:"ext_out_name_for_${nopath;noext;suf=__int___pb2.py:File} ${nopath;noext;suf=_pb2.py:File}"} $PY_PROTO_MYPY_PLUGIN_INTERNAL) + .CMD=${cwd;rootdir;input:File} $GEN_PY_PROTOS --suffixes $PY_PROTO_SUFFIXES $PY_PROTO_MYPY_SUFFIX --input ${input;rootrel:File} --ns /$PROTO_NAMESPACE -- $_PY_PROTO_CMD_BASE($File __int${_PYTHON_VER}___pb2.py $PY_PROTO_OPTS $PY_PROTO_OUTS_INTERNAL ${hide;kv:"ext_out_name_for_${nopath;noext;suf=__int${_PYTHON_VER}___pb2.py:File} ${nopath;noext;suf=_pb2.py:File}"} $PY_PROTO_MYPY_PLUGIN_INTERNAL) } # tag:proto tag:java-specific @@ -512,7 +512,7 @@ macro _PY_EVLOG_CMD(File) { # tag:python-specific tag:proto macro _PY_EVLOG_CMD_INTERNAL(File) { - .CMD=${cwd;rootdir;input:File} $GEN_PY_PROTOS --suffixes $PY_EVLOG_SUFFIXES --input ${input;rootrel:File} --ns /$PROTO_NAMESPACE -- $_PY_EVLOG_CMD_BASE($File __int___ev_pb2.py ${hide;kv:"ext_out_name_for_${nopath;noext;suf=__int___ev_pb2.py:File} ${nopath;noext;suf=_ev_pb2.py:File}"}) + .CMD=${cwd;rootdir;input:File} $GEN_PY_PROTOS --suffixes $PY_EVLOG_SUFFIXES --input ${input;rootrel:File} --ns /$PROTO_NAMESPACE -- $_PY_EVLOG_CMD_BASE($File __int${_PYTHON_VER}___ev_pb2.py ${hide;kv:"ext_out_name_for_${nopath;noext;suf=__int${_PYTHON_VER}___ev_pb2.py:File} ${nopath;noext;suf=_ev_pb2.py:File}"}) } # tag:java-specific tag:proto |