diff options
| author | snermolaev <snermolaev@yandex-team.com> | 2024-04-02 07:08:14 +0300 |
|---|---|---|
| committer | snermolaev <snermolaev@yandex-team.com> | 2024-04-02 08:40:35 +0300 |
| commit | 684e82fbc9d5073fba728084e9354785dad7b7cd (patch) | |
| tree | 767b3a4e203125801ba4346aea14c33b2f2d4aec | |
| parent | 5a03f8e5fc801f68416b514e870dada26cb53fb3 (diff) | |
| download | ydb-684e82fbc9d5073fba728084e9354785dad7b7cd.tar.gz | |
move CPP_PROTO_* defaults out of _BASE_UNIT
b91b2a81548319e4e79c9704a3162e91d3a6a8c5
| -rw-r--r-- | build/conf/proto.conf | 10 | ||||
| -rw-r--r-- | build/ymake.core.conf | 6 |
2 files changed, 5 insertions, 11 deletions
diff --git a/build/conf/proto.conf b/build/conf/proto.conf index 486b32f106..58a6c486d1 100644 --- a/build/conf/proto.conf +++ b/build/conf/proto.conf @@ -24,18 +24,18 @@ GEN_PY_PROTOS=$YMAKE_PYTHON ${input:"build/scripts/gen_py_protos.py"} --py_ver $ # tag:proto tag:cpp-specific PROTO_HEADER_EXTS=.pb.h -CPP_PROTO_CMDLINE= +CPP_PROTO_CMDLINE=${cwd;rootdir;input:File} $PROTOC -I=./$PROTO_NAMESPACE -I=$ARCADIA_ROOT/$PROTO_NAMESPACE ${pre=-I=:_PROTO__INCLUDE} -I=$ARCADIA_BUILD_ROOT -I=$PROTOBUF_PATH --cpp_out=${CPP_PROTO_PLUGINS}$ARCADIA_BUILD_ROOT/$PROTO_NAMESPACE $_PROTOC_FLAGS $PROTOC_STYLEGUIDE_OUT $PROTOC_PLUGIN_STYLEGUIDE ${main;input;rootrel:File} ${hide:PROTO_FAKEID} CPP_PROTO_OPTS= -CPP_PROTO_OUTS= -CPP_PROTO_OUTS_SEM= +CPP_PROTO_OUTS=${hide;output;norel;nopath;noext:File.pb.cc} ${output;main;hide;norel;nopath;noext:File.pb.h} +CPP_PROTO_OUTS_SEM=${output;main;hide;norel;nopath;noext:File.pb.h} CPP_PROTO_SUFFIXES=.pb.h .pb.cc CPP_PROTO_PLUGINS= CPP_PROTO_NO_DBGINFO=no # tag:proto tag:cpp-specific CPP_EV_OPTS=--plugin=protoc-gen-event2cpp=${tool:"tools/event2cpp"} --event2cpp_out=$ARCADIA_BUILD_ROOT -I=$ARCADIA_ROOT/library/cpp/eventlog -CPP_EV_OUTS= -CPP_EV_OUTS_SEM= +CPP_EV_OUTS=${hide;output;norel:File.pb.cc} ${hide;output;norel:File.pb.h} +CPP_EV_OUTS_SEM=${hide;output;norel:File.pb.h} # tag:proto tag:python-specific PY_PROTO_OPTS= diff --git a/build/ymake.core.conf b/build/ymake.core.conf index e510837db3..1f00c3addd 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -593,12 +593,6 @@ module _BASE_UNIT: _BARE_UNIT { PEERDIR_TAGS=CPP_PROTO CPP_FBS CPP_ROSMSG H_IDL PY2 PY2_NATIVE YQL_UDF_STATIC __EMPTY__ RESOURCE_LIB DLL_LIB - CPP_PROTO_CMDLINE=${cwd;rootdir;input:File} $PROTOC -I=./$PROTO_NAMESPACE -I=$ARCADIA_ROOT/$PROTO_NAMESPACE ${pre=-I=:_PROTO__INCLUDE} -I=$ARCADIA_BUILD_ROOT -I=$PROTOBUF_PATH --cpp_out=${CPP_PROTO_PLUGINS}$ARCADIA_BUILD_ROOT/$PROTO_NAMESPACE $_PROTOC_FLAGS $PROTOC_STYLEGUIDE_OUT $PROTOC_PLUGIN_STYLEGUIDE ${input;rootrel:File} ${hide:PROTO_FAKEID} - CPP_PROTO_OUTS+=${hide;output;norel;nopath;noext:File.pb.cc} ${output;main;hide;norel;nopath;noext:File.pb.h} - CPP_PROTO_OUTS_SEM+=${output;main;hide;norel;nopath;noext:File.pb.h} - CPP_EV_OUTS+=${hide;output;norel:File.pb.cc} ${hide;output;norel:File.pb.h} - CPP_EV_OUTS_SEM+=${hide;output;norel:File.pb.h} - when ($SWIG_LANG == "perl") { _SWIG_CMD=$_SWIG_PERL_CMD _SWIG_PEERDIR=contrib/tools/swig/Lib/perl5 build/platform/perl |