aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoriniklyaev <iniklyaev@yandex-team.com>2024-11-26 08:17:12 +0300
committeriniklyaev <iniklyaev@yandex-team.com>2024-11-26 08:34:13 +0300
commit089f940a27b620aafbd07b9dfc6dd97a26ef84bc (patch)
treeea9dd9f7aca035d9f6e40e2d53a939667dff7d84
parent1f2b45995b7d455fdc3867ac84d59f1287db804e (diff)
downloadydb-089f940a27b620aafbd07b9dfc6dd97a26ef84bc.tar.gz
fix PROTO_LIBRARY semantics
commit_hash:f870e4788a78fcc5aa8cef466752e58d32a99ca1
-rw-r--r--build/conf/proto.conf21
1 files changed, 14 insertions, 7 deletions
diff --git a/build/conf/proto.conf b/build/conf/proto.conf
index 17704bdfd08..c915dd1d7da 100644
--- a/build/conf/proto.conf
+++ b/build/conf/proto.conf
@@ -657,8 +657,6 @@ JAVA_PROTO_LIBRARY_SEM=$BUILD_PROTO_JAR_SEM $_GRADLE_EXPORT_PUBLISHING_SEM
module _CPP_PROTO : LIBRARY {
.ALLOWED=_EXPOSE LIST_PROTO
- # TODO(svidyuk): think about marker which forces semantics inheritance
- .SEM=CPP_PROTO_LIBRARY_SEM
FORCE_COVERAGE_DISABLED=yes
ENABLE(CPP_PROTO)
ENABLE(GEN_PROTO)
@@ -682,7 +680,6 @@ module _CPP_PROTO : LIBRARY {
module _JAVA_PROTO: EXTERNAL_JAVA_LIBRARY {
.EXTS=.jsrc
.ALLOWED=GRPC
- .SEM=JAVA_PROTO_LIBRARY_SEM
SET(PEERDIR_TAGS JAVA)
ENABLE(JAVA_PROTO)
DISABLE(_NEED_SBOM_INFO)
@@ -708,7 +705,6 @@ module _JAVA_PROTO: EXTERNAL_JAVA_LIBRARY {
module _PY_PROTO: PY2_LIBRARY {
.ALIASES=SRCS=PY_SRCS
.ALLOWED=OPTIMIZE_PY_PROTOS NO_OPTIMIZE_PY_PROTOS
- .SEM=IGNORED
SET(PEERDIR_TAGS PY2)
ENABLE(PY_PROTO)
DISABLE(_NEED_SBOM_INFO)
@@ -732,7 +728,6 @@ module _PY_PROTO: PY2_LIBRARY {
module _PY3_PROTO: PY3_LIBRARY {
.ALIASES=SRCS=PY_SRCS
.ALLOWED=OPTIMIZE_PY_PROTOS NO_OPTIMIZE_PY_PROTOS
- .SEM=IGNORED
SET(PEERDIR_TAGS PY3)
ENABLE(PY3_PROTO)
DISABLE(_NEED_SBOM_INFO)
@@ -755,7 +750,6 @@ module _PY3_PROTO: PY3_LIBRARY {
module _GO_PROTO: GO_LIBRARY {
.IGNORED=GENERATE_ENUM_SERIALIZATION GENERATE_ENUM_SERIALIZATION_WITH_HEADER YMAPS_SPROTO
- .SEM=IGNORED
SET(PEERDIR_TAGS GO)
ENABLE(GO_PROTO)
@@ -782,7 +776,6 @@ module _TS_PREPARE_DEPS: _PREPARE_DEPS_BASE {
module _DESC_PROTO: _BARE_UNIT {
.CMD=_PROTO_DESC_MERGE_CMD
- .SEM=IGNORED
.EXTS=.desc .rawproto
.NODE_TYPE=Library
.IGNORED=GENERATE_ENUM_SERIALIZATION GENERATE_ENUM_SERIALIZATION_WITH_HEADER YMAPS_SPROTO RESOURCE GO_PROTO_PLUGIN GRPC
@@ -831,24 +824,30 @@ module _DESC_PROTO: _BARE_UNIT {
### See: [GRPC()](#macro_GRPC), [OPTIMIZE_PY_PROTOS()](#macro_OPTIMIZE_PY_PROTOS), [INCLUDE_TAGS()](#macro_INCLUDE_TAGS), [EXCLUDE_TAGS()](#macro_EXCLUDE_TAGS)
multimodule PROTO_LIBRARY {
module CPP_PROTO: _CPP_PROTO {
+ # TODO(svidyuk): think about marker which forces semantics inheritance
+ .SEM=CPP_PROTO_LIBRARY_SEM
SET_APPEND(PEERDIR_TAGS CPP_PROTO)
}
module JAVA_PROTO: _JAVA_PROTO {
+ .SEM=JAVA_PROTO_LIBRARY_SEM
SET_APPEND(PEERDIR_TAGS JAVA_PROTO)
}
module PY_PROTO: _PY_PROTO {
+ .SEM=IGNORED
SET_APPEND(PEERDIR_TAGS PY_PROTO)
.PEERDIRSELF=CPP_PROTO
}
module PY3_PROTO: _PY3_PROTO {
+ .SEM=IGNORED
SET_APPEND(PEERDIR_TAGS PY3_PROTO)
.PEERDIRSELF=CPP_PROTO
}
module GO_PROTO: _GO_PROTO {
+ .SEM=IGNORED
SET_APPEND(PEERDIR_TAGS GO_PROTO)
}
@@ -867,6 +866,7 @@ multimodule PROTO_LIBRARY {
}
module DESC_PROTO: _DESC_PROTO {
+ .SEM=IGNORED
SET_APPEND(PEERDIR_TAGS DESC_PROTO)
}
}
@@ -902,28 +902,34 @@ module PROTO_REGISTRY: PROTO_DESCRIPTIONS {
### See: [PROTO_LIBRARY()](#module_PROTO_LIBRARY)
multimodule PROTO_SCHEMA {
module CPP_PROTO_FROM_SCHEMA: _CPP_PROTO {
+ # TODO(svidyuk): think about marker which forces semantics inheritance
+ .SEM=CPP_PROTO_LIBRARY_SEM
DISABLE(START_TARGET)
SET_APPEND(PEERDIR_TAGS CPP_PROTO CPP_PROTO_FROM_SCHEMA)
}
module JAVA_PROTO_FROM_SCHEMA: _JAVA_PROTO {
+ .SEM=JAVA_PROTO_LIBRARY_SEM
DISABLE(START_TARGET)
SET_APPEND(PEERDIR_TAGS JAVA_PROTO JAVA_PROTO_FROM_SCHEMA)
}
module PY_PROTO_FROM_SCHEMA: _PY_PROTO {
+ .SEM=IGNORED
.PEERDIRSELF=CPP_PROTO_FROM_SCHEMA
DISABLE(START_TARGET)
SET_APPEND(PEERDIR_TAGS PY_PROTO PY_PROTO_FROM_SCHEMA)
}
module PY3_PROTO_FROM_SCHEMA: _PY3_PROTO {
+ .SEM=IGNORED
.PEERDIRSELF=CPP_PROTO_FROM_SCHEMA
DISABLE(START_TARGET)
SET_APPEND(PEERDIR_TAGS PY3_PROTO PY3_PROTO_FROM_SCHEMA)
}
module GO_PROTO_FROM_SCHEMA: _GO_PROTO {
+ .SEM=IGNORED
DISABLE(START_TARGET)
SET_APPEND(PEERDIR_TAGS GO_PROTO GO_PROTO_FROM_SCHEMA)
}
@@ -945,6 +951,7 @@ multimodule PROTO_SCHEMA {
}
module DESC_PROTO_FROM_SCHEMA: _DESC_PROTO {
+ .SEM=IGNORED
DISABLE(START_TARGET)
SET_APPEND(PEERDIR_TAGS DESC_PROTO DESC_PROTO_FROM_SCHEMA)
}