Skip to content

Commit 089f940

Browse files
committed
fix PROTO_LIBRARY semantics
commit_hash:f870e4788a78fcc5aa8cef466752e58d32a99ca1
1 parent 1f2b459 commit 089f940

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

build/conf/proto.conf

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -657,8 +657,6 @@ JAVA_PROTO_LIBRARY_SEM=$BUILD_PROTO_JAR_SEM $_GRADLE_EXPORT_PUBLISHING_SEM
657657

658658
module _CPP_PROTO : LIBRARY {
659659
.ALLOWED=_EXPOSE LIST_PROTO
660-
# TODO(svidyuk): think about marker which forces semantics inheritance
661-
.SEM=CPP_PROTO_LIBRARY_SEM
662660
FORCE_COVERAGE_DISABLED=yes
663661
ENABLE(CPP_PROTO)
664662
ENABLE(GEN_PROTO)
@@ -682,7 +680,6 @@ module _CPP_PROTO : LIBRARY {
682680
module _JAVA_PROTO: EXTERNAL_JAVA_LIBRARY {
683681
.EXTS=.jsrc
684682
.ALLOWED=GRPC
685-
.SEM=JAVA_PROTO_LIBRARY_SEM
686683
SET(PEERDIR_TAGS JAVA)
687684
ENABLE(JAVA_PROTO)
688685
DISABLE(_NEED_SBOM_INFO)
@@ -708,7 +705,6 @@ module _JAVA_PROTO: EXTERNAL_JAVA_LIBRARY {
708705
module _PY_PROTO: PY2_LIBRARY {
709706
.ALIASES=SRCS=PY_SRCS
710707
.ALLOWED=OPTIMIZE_PY_PROTOS NO_OPTIMIZE_PY_PROTOS
711-
.SEM=IGNORED
712708
SET(PEERDIR_TAGS PY2)
713709
ENABLE(PY_PROTO)
714710
DISABLE(_NEED_SBOM_INFO)
@@ -732,7 +728,6 @@ module _PY_PROTO: PY2_LIBRARY {
732728
module _PY3_PROTO: PY3_LIBRARY {
733729
.ALIASES=SRCS=PY_SRCS
734730
.ALLOWED=OPTIMIZE_PY_PROTOS NO_OPTIMIZE_PY_PROTOS
735-
.SEM=IGNORED
736731
SET(PEERDIR_TAGS PY3)
737732
ENABLE(PY3_PROTO)
738733
DISABLE(_NEED_SBOM_INFO)
@@ -755,7 +750,6 @@ module _PY3_PROTO: PY3_LIBRARY {
755750

756751
module _GO_PROTO: GO_LIBRARY {
757752
.IGNORED=GENERATE_ENUM_SERIALIZATION GENERATE_ENUM_SERIALIZATION_WITH_HEADER YMAPS_SPROTO
758-
.SEM=IGNORED
759753
SET(PEERDIR_TAGS GO)
760754
ENABLE(GO_PROTO)
761755

@@ -782,7 +776,6 @@ module _TS_PREPARE_DEPS: _PREPARE_DEPS_BASE {
782776

783777
module _DESC_PROTO: _BARE_UNIT {
784778
.CMD=_PROTO_DESC_MERGE_CMD
785-
.SEM=IGNORED
786779
.EXTS=.desc .rawproto
787780
.NODE_TYPE=Library
788781
.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 {
831824
### See: [GRPC()](#macro_GRPC), [OPTIMIZE_PY_PROTOS()](#macro_OPTIMIZE_PY_PROTOS), [INCLUDE_TAGS()](#macro_INCLUDE_TAGS), [EXCLUDE_TAGS()](#macro_EXCLUDE_TAGS)
832825
multimodule PROTO_LIBRARY {
833826
module CPP_PROTO: _CPP_PROTO {
827+
# TODO(svidyuk): think about marker which forces semantics inheritance
828+
.SEM=CPP_PROTO_LIBRARY_SEM
834829
SET_APPEND(PEERDIR_TAGS CPP_PROTO)
835830
}
836831

837832
module JAVA_PROTO: _JAVA_PROTO {
833+
.SEM=JAVA_PROTO_LIBRARY_SEM
838834
SET_APPEND(PEERDIR_TAGS JAVA_PROTO)
839835
}
840836

841837
module PY_PROTO: _PY_PROTO {
838+
.SEM=IGNORED
842839
SET_APPEND(PEERDIR_TAGS PY_PROTO)
843840
.PEERDIRSELF=CPP_PROTO
844841
}
845842

846843
module PY3_PROTO: _PY3_PROTO {
844+
.SEM=IGNORED
847845
SET_APPEND(PEERDIR_TAGS PY3_PROTO)
848846
.PEERDIRSELF=CPP_PROTO
849847
}
850848

851849
module GO_PROTO: _GO_PROTO {
850+
.SEM=IGNORED
852851
SET_APPEND(PEERDIR_TAGS GO_PROTO)
853852
}
854853

@@ -867,6 +866,7 @@ multimodule PROTO_LIBRARY {
867866
}
868867

869868
module DESC_PROTO: _DESC_PROTO {
869+
.SEM=IGNORED
870870
SET_APPEND(PEERDIR_TAGS DESC_PROTO)
871871
}
872872
}
@@ -902,28 +902,34 @@ module PROTO_REGISTRY: PROTO_DESCRIPTIONS {
902902
### See: [PROTO_LIBRARY()](#module_PROTO_LIBRARY)
903903
multimodule PROTO_SCHEMA {
904904
module CPP_PROTO_FROM_SCHEMA: _CPP_PROTO {
905+
# TODO(svidyuk): think about marker which forces semantics inheritance
906+
.SEM=CPP_PROTO_LIBRARY_SEM
905907
DISABLE(START_TARGET)
906908
SET_APPEND(PEERDIR_TAGS CPP_PROTO CPP_PROTO_FROM_SCHEMA)
907909
}
908910

909911
module JAVA_PROTO_FROM_SCHEMA: _JAVA_PROTO {
912+
.SEM=JAVA_PROTO_LIBRARY_SEM
910913
DISABLE(START_TARGET)
911914
SET_APPEND(PEERDIR_TAGS JAVA_PROTO JAVA_PROTO_FROM_SCHEMA)
912915
}
913916

914917
module PY_PROTO_FROM_SCHEMA: _PY_PROTO {
918+
.SEM=IGNORED
915919
.PEERDIRSELF=CPP_PROTO_FROM_SCHEMA
916920
DISABLE(START_TARGET)
917921
SET_APPEND(PEERDIR_TAGS PY_PROTO PY_PROTO_FROM_SCHEMA)
918922
}
919923

920924
module PY3_PROTO_FROM_SCHEMA: _PY3_PROTO {
925+
.SEM=IGNORED
921926
.PEERDIRSELF=CPP_PROTO_FROM_SCHEMA
922927
DISABLE(START_TARGET)
923928
SET_APPEND(PEERDIR_TAGS PY3_PROTO PY3_PROTO_FROM_SCHEMA)
924929
}
925930

926931
module GO_PROTO_FROM_SCHEMA: _GO_PROTO {
932+
.SEM=IGNORED
927933
DISABLE(START_TARGET)
928934
SET_APPEND(PEERDIR_TAGS GO_PROTO GO_PROTO_FROM_SCHEMA)
929935
}
@@ -945,6 +951,7 @@ multimodule PROTO_SCHEMA {
945951
}
946952

947953
module DESC_PROTO_FROM_SCHEMA: _DESC_PROTO {
954+
.SEM=IGNORED
948955
DISABLE(START_TARGET)
949956
SET_APPEND(PEERDIR_TAGS DESC_PROTO DESC_PROTO_FROM_SCHEMA)
950957
}

0 commit comments

Comments
 (0)