diff options
| author | snermolaev <snermolaev@yandex-team.com> | 2024-04-02 15:16:38 +0300 |
|---|---|---|
| committer | snermolaev <snermolaev@yandex-team.com> | 2024-04-02 15:30:50 +0300 |
| commit | 98436e6d4a1d133fd7446b9155db93c24801eda5 (patch) | |
| tree | 2ba852263d788c96b91bb0679b97e21e2b04929d | |
| parent | 12d0dc6f411e930adac85e026f10633474892b39 (diff) | |
| download | ydb-98436e6d4a1d133fd7446b9155db93c24801eda5.tar.gz | |
Revert commit rXXXXXX, move CPP_PROTO_* defaults out of _BASE_UNIT
a085c139e249fb9fc88c704d88b9a69ce94ddae1
| -rw-r--r-- | build/conf/proto.conf | 10 | ||||
| -rw-r--r-- | build/ymake.core.conf | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/build/conf/proto.conf b/build/conf/proto.conf index 58a6c486d1..486b32f106 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=${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_CMDLINE= CPP_PROTO_OPTS= -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_OUTS= +CPP_PROTO_OUTS_SEM= 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=${hide;output;norel:File.pb.cc} ${hide;output;norel:File.pb.h} -CPP_EV_OUTS_SEM=${hide;output;norel:File.pb.h} +CPP_EV_OUTS= +CPP_EV_OUTS_SEM= # tag:proto tag:python-specific PY_PROTO_OPTS= diff --git a/build/ymake.core.conf b/build/ymake.core.conf index 1f00c3addd..e510837db3 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -593,6 +593,12 @@ 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 |