diff options
author | dimdim11 <dimdim11@yandex-team.com> | 2024-10-31 21:51:21 +0300 |
---|---|---|
committer | dimdim11 <dimdim11@yandex-team.com> | 2024-10-31 22:03:45 +0300 |
commit | f64b0cd7277f85a74db6779d47ac97402a1a8d3a (patch) | |
tree | d70ed22a497a4ea41e7eb32b439dc28578af9b33 /build/conf/proto.conf | |
parent | a8db0cfec0cde38349acbc4c25e77616871ea57a (diff) | |
download | ydb-f64b0cd7277f85a74db6779d47ac97402a1a8d3a.tar.gz |
Remove old unused semantics
Remove old unused semantics
commit_hash:9ed6a97c5cb0053b219ad128adb86091ae29ca82
Diffstat (limited to 'build/conf/proto.conf')
-rw-r--r-- | build/conf/proto.conf | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/build/conf/proto.conf b/build/conf/proto.conf index 0f906cabab..09a4aaeae5 100644 --- a/build/conf/proto.conf +++ b/build/conf/proto.conf @@ -195,7 +195,7 @@ macro JAVA_PROTO_PLUGIN(NAME, TOOL, DEPS[]) { } macro _ADD_SEM_PROP_IF_NON_EMPTY(Prop, Args...) { - .SEM=${pre=&& set_target_property $Prop :Args} ${pre=&& target_properties-ITEM && target_properties-name $Prop && target_properties-value :Args} + .SEM=${pre=&& target_properties-ITEM && target_properties-name $Prop && target_properties-value :Args} } # tag:proto tag:java-specific @@ -210,9 +210,8 @@ macro WITH_KOTLIN_GRPC() { # tag:proto tag:cpp-specific macro _ADD_CPP_PROTO_OUT(Suf) { - .SEM=append_target_property PROTOC_EXTRA_OUTS $Suf ${hide;output;suf=.o:Suf} $_ADD_SEM_PROP_IF_NON_EMPTY(PROTO_NAMESPACE $PROTO_NAMESPACE) SET_APPEND(CPP_PROTO_OUTS \${output;norel;nopath;noext;suf=$Suf:File}) - SET_APPEND(PROTOC_EXTRA_OUTS_SEM && protoc_extra_outs $Suf) + SET_APPEND(PROTOC_EXTRA_OUTS_SEM && protoc_extra_outs $Suf \${hide;output;suf=.o:Suf} \$_ADD_SEM_PROP_IF_NON_EMPTY(PROTO_NAMESPACE $PROTO_NAMESPACE)) # XXX fix variable expansion in plugins SET(CPP_PROTO_SUFFIXES $CPP_PROTO_SUFFIXES $Suf) @@ -228,7 +227,7 @@ CPP_PROTOBUF_PEERS= ### Define protoc plugin for C++ with given Name that emits code into regular outputs ### using Tool. Extra dependencies are passed via DEPS. macro CPP_PROTO_PLUGIN0(NAME, TOOL, DEPS[], EXTRA_OUT_FLAG="") { - .SEM=target_proto_plugin $NAME ${tool;rootrel:TOOL} ${hide;output;suf=.fake.o:NAME} && target_macroses-ITEM && target_macroses-macro target_proto_plugin && target_macroses-args $NAME ${tool;rootrel:TOOL} ${hide;output;suf=.fake.o:NAME} + .SEM=target_macroses-ITEM && target_macroses-macro target_proto_plugin && target_macroses-args $NAME ${tool;rootrel:TOOL} ${hide;output;suf=.fake.o:NAME} SET_APPEND(CPP_PROTO_OPTS $_PROTO_PLUGIN_ARGS_BASE($NAME $TOOL $EXTRA_OUT_FLAG)) # XXX fix variable expansion in plugins @@ -387,15 +386,11 @@ macro YT_ORM_PROTO_YSON(OUT_OPTS[], Files...) { } -_SEM_CPP_PROTO_CMD=target_proto_messages PRIVATE ${input:File} \ - && target_options-privates-ITEM && target_options-privates-option target_proto_messages && target_options-privates-args ${input:File} \ +_SEM_CPP_PROTO_CMD=target_options-privates-ITEM && target_options-privates-option target_proto_messages && target_options-privates-args ${input:File} \ $CPP_PROTO_OUTS_SEM ${hide;output;suf=${OBJ_SUF}.pb.o:File} $DEFAULT_PROTOC_TOOLS \ $PROTOC_EXTRA_OUTS_SEM \ - && set_global_flags COMMON_PROTOC_FLAGS \ && platform_vars-COMMON_PROTOC_FLAGS "" \ - && target_proto_outs --cpp_out=$ARCADIA_BUILD_ROOT/$PROTO_NAMESPACE $PROTOC_STYLEGUIDE_OUT \ && target_macroses-ITEM && target_macroses-macro target_proto_outs && target_macroses-args --cpp_out=$ARCADIA_BUILD_ROOT/$PROTO_NAMESPACE $PROTOC_STYLEGUIDE_OUT \ - && target_proto_addincls ./$PROTO_NAMESPACE $ARCADIA_ROOT/$PROTO_NAMESPACE ${_PROTO__INCLUDE} $ARCADIA_BUILD_ROOT $PROTOBUF_INCLUDE_PATH \ && target_macroses-ITEM && target_macroses-macro target_proto_addincls && target_macroses-args ./$PROTO_NAMESPACE $ARCADIA_ROOT/$PROTO_NAMESPACE ${_PROTO__INCLUDE} $ARCADIA_BUILD_ROOT $PROTOBUF_INCLUDE_PATH # tag:proto @@ -411,14 +406,10 @@ macro _CPP_VANILLA_PROTO_CMD(File) { .PEERDIR=contrib/libs/protobuf_std } -_SEM_CPP_EV_CMD=target_ev_messages PRIVATE ${input:File} \ - && target_options-privates-ITEM && target_options-privates-option target_ev_messages && target_options-privates-args ${input:File} \ +_SEM_CPP_EV_CMD=target_options-privates-ITEM && target_options-privates-option target_ev_messages && target_options-privates-args ${input:File} \ $CPP_EV_OUTS_SEM ${hide;output;suf=${OBJ_SUF}.pb.o:File} ${hide;tool:"tools/event2cpp/bin"} $DEFAULT_PROTOC_TOOLS \ - && set_global_flags COMMON_PROTOC_FLAGS \ && platform_vars-COMMON_PROTOC_FLAGS "" \ - && target_proto_outs --cpp_out=$ARCADIA_BUILD_ROOT/$PROTO_NAMESPACE $PROTOC_STYLEGUIDE_OUT --event2cpp_out=$ARCADIA_BUILD_ROOT/$PROTO_NAMESPACE \ && target_macroses-ITEM && target_macroses-macro target_proto_outs && target_macroses-args --cpp_out=$ARCADIA_BUILD_ROOT/$PROTO_NAMESPACE $PROTOC_STYLEGUIDE_OUT --event2cpp_out=$ARCADIA_BUILD_ROOT/$PROTO_NAMESPACE \ - && target_proto_addincls ./$PROTO_NAMESPACE $ARCADIA_ROOT/$PROTO_NAMESPACE ${_PROTO__INCLUDE} $ARCADIA_BUILD_ROOT $PROTOBUF_INCLUDE_PATH $ARCADIA_ROOT/library/cpp/eventlog \ && target_macroses-ITEM && target_macroses-macro target_proto_addincls && target_macroses-args ./$PROTO_NAMESPACE $ARCADIA_ROOT/$PROTO_NAMESPACE ${_PROTO__INCLUDE} $ARCADIA_BUILD_ROOT $PROTOBUF_INCLUDE_PATH $ARCADIA_ROOT/library/cpp/eventlog # tag:proto |