From c76106c22d7e333b13710b30d4ae3205d123bfef Mon Sep 17 00:00:00 2001
From: dimdim11 <dimdim11@yandex-team.com>
Date: Tue, 23 Apr 2024 06:00:00 +0300
Subject: Remove final in cpp pb.h/cc by outputs list

Remove final in cpp pb.h/cc by outputs list
1307ef1d33bab92f478e7a4d213c08bf6691ebd5
---
 build/ymake.core.conf | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'build/ymake.core.conf')

diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 025d3ae1f9..133c9f7eca 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -594,10 +594,13 @@ module _BASE_UNIT: _BARE_UNIT {
 
     PEERDIR_TAGS=CPP_PROTO CPP_FBS CPP_ROS 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_WRAPPER_BASE=$YMAKE_PYTHON3 ${input:"build/scripts/cpp_proto_wrapper.py"}
+    _CPP_PROTO_CMDLINE_BASE=${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 ${hide:PROTO_FAKEID} ${input;rootrel:File}
+    CPP_PROTO_CMDLINE=$_CPP_PROTO_WRAPPER_BASE --outputs $CPP_PROTO_OUTS -- $_CPP_PROTO_CMDLINE_BASE
+    CPP_PROTO_OUTS+=${output;norel;nopath;noext:File.pb.cc} ${output;main;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_CMDLINE=$_CPP_PROTO_WRAPPER_BASE --outputs $CPP_EV_OUTS -- $_CPP_PROTO_CMDLINE_BASE
+    CPP_EV_OUTS+=${output;norel:File.pb.cc} ${output;norel:File.pb.h}
     CPP_EV_OUTS_SEM+=${hide;output;norel:File.pb.h}
 
     when ($SWIG_LANG == "perl") {
@@ -639,7 +642,7 @@ module _BASE_UNIT: _BARE_UNIT {
         }
         when ($PROTOC_TRANSITIVE_HEADERS == "no") {
             CPP_PROTO_PLUGINS=transitive_pb_h=false:${CPP_PROTO_PLUGINS}
-            CPP_PROTO_OUTS+=${output;main;hide;norel;nopath;noext:File.deps.pb.h}
+            CPP_PROTO_OUTS+=${output;main;norel;nopath;noext:File.deps.pb.h}
         }
     }
 
-- 
cgit v1.2.3