Skip to content

Commit 9bc4b30

Browse files
ydbotydbot
committed
Merge pull request #26870 from ydb-platform/merge-rightlib-251015-0707
2 parents 329cee4 + bc7d93f commit 9bc4b30

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1529
-3646
lines changed

‎build/conf/java.conf‎

Lines changed: 62 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ multimodule JAVA_CONTRIB_ANNOTATION_PROCESSOR {
141141
### @usage: JUNIT_TESTS_JAR(path/to/some/peer realname.jar)
142142
###
143143
### Specifies jar to search test suites and test cases. By default tests are
144-
### searched in the jar compild by JTEST or JUNIT5 module sources. This macro
144+
### searched in the jar compild by JTEST, JUNIT5 or JUNIT6 module sources. This macro
145145
### allows to specify diferent jar to search tests.
146146
###
147147
### Only one jar file is used to search tests. If this macro invoked multiple
@@ -156,6 +156,66 @@ macro JUNIT_TESTS_JAR(Dir, Jar) {
156156
SET(UNITTEST_MOD $Dir/$Jar)
157157
}
158158

159+
_BUILD_JUNIT6_JAR_SEM=$_BUILD_JAR_SEM && junit6_test && $_TEST_CWD_SEM && $_TEST_ENV_SEM
160+
161+
multimodule JUNIT6 {
162+
# ATTENTION ya ide idea relies on this submodule name to find scope of `ya make` build before project generation
163+
module JAR_TESTABLE: _JAR_TEST {
164+
.ALLOWED=YT_SPEC
165+
# TODO(svidyuk) JAVA_DEPENDENCIES_CONFIGURATION must not be ignored here but there are diagnostics issues in case of ECLUDE in the middle:
166+
# * A -> B -> C -> lib-v1.4
167+
# | |-> DM(lib-v1.1)
168+
# | |-> EXCLUDE(lib-v1.4)
169+
# | |-> FORBID_CONFLICT_DM_RECENT = OK
170+
# |-> DM(lib-v1.1)
171+
# |-> FORBID_CONFLICT_DM_RECENT = FAIL (because downgrade from v1.4 to v1.1 is detected before understanding that v1.4 was excuded on the examined path)
172+
.IGNORED=JAVA_SRCS RUN_JAVA_PROGRAM JAVA_DEPENDENCIES_CONFIGURATION PROVIDES FEATURE_VERSION
173+
.ALIASES=JAVA_TEST_PEERDIR=PEERDIR JAVA_TEST_EXCLUDE=EXCLUDE
174+
.PEERDIRSELF=JUNIT6_JAR_COMPILATION
175+
.SEM=$_SEM_IGNORED
176+
177+
PEERDIR(devtools/jtest-annotations/junit6)
178+
179+
SET(MODULE_TYPE JUNIT6)
180+
SET_APPEND(PEERDIR_TAGS JAR_TESTABLE JAVA_TEST_LIBRARY)
181+
}
182+
module JUNIT6_JAR_COMPILATION: JAR_LIBRARY {
183+
.ALLOWED=YT_SPEC
184+
.ALIASES=JAVA_TEST_PEERDIR=_NOOP_MACRO JAVA_TEST_EXCLUDE=_NOOP_MACRO
185+
.FINAL_TARGET=no
186+
.DEFAULT_NAME_GENERATOR=FullPath
187+
.SEM=$_BUILD_JUNIT6_JAR_SEM
188+
.IGNORED=JUNIT_TESTS_JAR
189+
190+
PEERDIR+=devtools/junit6-runner
191+
PEERDIR+=build/platform/java/jacoco-agent
192+
193+
when ($OPENSOURCE != "yes") {
194+
PEERDIR+=devtools/jtest-annotations/junit6
195+
}
196+
197+
SET(_SEM_JAR_TARGET junit6)
198+
SET(MODULE_TYPE JUNIT6)
199+
SET_APPEND(PEERDIR_TAGS JUNIT6_JAR_COMPILATION JAVA_TEST_LIBRARY)
200+
201+
when ($OPENSOURCE == "yes" && $AUTOCHECK == "yes") {
202+
# FIXME: Replace AUTOCHECK == yes with _not a host platform_ check after YMAKE-218
203+
MODULE_LICENSES_RESTRICTION_TYPES = ALLOW_ONLY
204+
MODULE_LICENSES_RESTRICTIONS = SERVICE REQUIRE_CITATION REQUIRE_MODIFICATIONS_DISCLOSURE
205+
206+
when ($MAKE_UBERJAR_VALUE == "yes") {
207+
# At the time LICENCE_RESTRICTION does not properly distinct static / dynamic linkage in UBERJAR() modules.
208+
# Hence we forbid using UBERJAR() in OPENSOURCE()
209+
#
210+
# Should be fixed in YMAKE-1043
211+
_OK = no
212+
}
213+
}
214+
215+
ASSERT(_OK "UBERJAR() macro can not be used in this condfiguration, see YMAKE-1043")
216+
}
217+
}
218+
159219
_BUILD_JUNIT5_JAR_SEM=$_BUILD_JAR_SEM && junit5_test && $_TEST_CWD_SEM && $_TEST_ENV_SEM
160220

161221
multimodule JUNIT5 {
@@ -585,7 +645,7 @@ module _JAR_BASE: _BARE_UNIT {
585645
SET(MODULE_TAG JAVA)
586646

587647
# TODO: Remove JUNIT5 JTEST JAVA_TEST_LIBRARY
588-
PEERDIR_TAGS=JAVA JAVA_PROTO JAVA_PROTO_FROM_SCHEMA JAVA_FBS JAVA_IDL DLL JAR_COMPILATION __EMPTY__ RESOURCE_LIB JUNIT5_JAR_COMPILATION JTEST_JAR_COMPILATION JTEST_FOR_JAR_COMPILATION JAVA_TEST_LIBRARY
648+
PEERDIR_TAGS=JAVA JAVA_PROTO JAVA_PROTO_FROM_SCHEMA JAVA_FBS JAVA_IDL DLL JAR_COMPILATION __EMPTY__ RESOURCE_LIB JUNIT6_JAR_COMPILATION JUNIT5_JAR_COMPILATION JTEST_JAR_COMPILATION JTEST_FOR_JAR_COMPILATION JAVA_TEST_LIBRARY
589649

590650
HAS_MANAGEABLE_PEERS=yes
591651
DYNAMIC_LINK=yes

‎build/external_resources/ymake/public.resources.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"by_platform": {
33
"darwin": {
4-
"uri": "sbr:9966448368"
4+
"uri": "sbr:9997229151"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:9966447538"
7+
"uri": "sbr:9997227045"
88
},
99
"linux": {
10-
"uri": "sbr:9966450207"
10+
"uri": "sbr:9997233844"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:9966446510"
13+
"uri": "sbr:9997224991"
1414
},
1515
"win32": {
16-
"uri": "sbr:9966449520"
16+
"uri": "sbr:9997231623"
1717
}
1818
}
1919
}

‎build/external_resources/ymake/resources.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"by_platform": {
33
"darwin": {
4-
"uri": "sbr:9966448096"
4+
"uri": "sbr:9997218958"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:9966447317"
7+
"uri": "sbr:9997217011"
88
},
99
"linux": {
10-
"uri": "sbr:9966450060"
10+
"uri": "sbr:9997222986"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:9966446295"
13+
"uri": "sbr:9997215058"
1414
},
1515
"win32": {
16-
"uri": "sbr:9966449380"
16+
"uri": "sbr:9997221095"
1717
}
1818
}
1919
}

‎build/mapping.conf.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -904,6 +904,7 @@
904904
"9930174079": "{registry_endpoint}/9930174079",
905905
"9933947344": "{registry_endpoint}/9933947344",
906906
"9966448368": "{registry_endpoint}/9966448368",
907+
"9997229151": "{registry_endpoint}/9997229151",
907908
"5766171800": "{registry_endpoint}/5766171800",
908909
"5805430761": "{registry_endpoint}/5805430761",
909910
"5829025456": "{registry_endpoint}/5829025456",
@@ -1010,6 +1011,7 @@
10101011
"9930171537": "{registry_endpoint}/9930171537",
10111012
"9933946335": "{registry_endpoint}/9933946335",
10121013
"9966447538": "{registry_endpoint}/9966447538",
1014+
"9997227045": "{registry_endpoint}/9997227045",
10131015
"5766173070": "{registry_endpoint}/5766173070",
10141016
"5805432830": "{registry_endpoint}/5805432830",
10151017
"5829031598": "{registry_endpoint}/5829031598",
@@ -1116,6 +1118,7 @@
11161118
"9930179303": "{registry_endpoint}/9930179303",
11171119
"9933949303": "{registry_endpoint}/9933949303",
11181120
"9966450207": "{registry_endpoint}/9966450207",
1121+
"9997233844": "{registry_endpoint}/9997233844",
11191122
"5766171341": "{registry_endpoint}/5766171341",
11201123
"5805430188": "{registry_endpoint}/5805430188",
11211124
"5829023352": "{registry_endpoint}/5829023352",
@@ -1222,6 +1225,7 @@
12221225
"9930168648": "{registry_endpoint}/9930168648",
12231226
"9933944861": "{registry_endpoint}/9933944861",
12241227
"9966446510": "{registry_endpoint}/9966446510",
1228+
"9997224991": "{registry_endpoint}/9997224991",
12251229
"8270821739": "{registry_endpoint}/8270821739",
12261230
"8295446553": "{registry_endpoint}/8295446553",
12271231
"8326170338": "{registry_endpoint}/8326170338",
@@ -1258,6 +1262,7 @@
12581262
"9930176677": "{registry_endpoint}/9930176677",
12591263
"9933948304": "{registry_endpoint}/9933948304",
12601264
"9966449520": "{registry_endpoint}/9966449520",
1265+
"9997231623": "{registry_endpoint}/9997231623",
12611266
"5766172695": "{registry_endpoint}/5766172695",
12621267
"5805432230": "{registry_endpoint}/5805432230",
12631268
"5829029743": "{registry_endpoint}/5829029743",
@@ -2650,6 +2655,7 @@
26502655
"9930174079": "devtools/ymake/bin/ymake for darwin",
26512656
"9933947344": "devtools/ymake/bin/ymake for darwin",
26522657
"9966448368": "devtools/ymake/bin/ymake for darwin",
2658+
"9997229151": "devtools/ymake/bin/ymake for darwin",
26532659
"5766171800": "devtools/ymake/bin/ymake for darwin-arm64",
26542660
"5805430761": "devtools/ymake/bin/ymake for darwin-arm64",
26552661
"5829025456": "devtools/ymake/bin/ymake for darwin-arm64",
@@ -2756,6 +2762,7 @@
27562762
"9930171537": "devtools/ymake/bin/ymake for darwin-arm64",
27572763
"9933946335": "devtools/ymake/bin/ymake for darwin-arm64",
27582764
"9966447538": "devtools/ymake/bin/ymake for darwin-arm64",
2765+
"9997227045": "devtools/ymake/bin/ymake for darwin-arm64",
27592766
"5766173070": "devtools/ymake/bin/ymake for linux",
27602767
"5805432830": "devtools/ymake/bin/ymake for linux",
27612768
"5829031598": "devtools/ymake/bin/ymake for linux",
@@ -2862,6 +2869,7 @@
28622869
"9930179303": "devtools/ymake/bin/ymake for linux",
28632870
"9933949303": "devtools/ymake/bin/ymake for linux",
28642871
"9966450207": "devtools/ymake/bin/ymake for linux",
2872+
"9997233844": "devtools/ymake/bin/ymake for linux",
28652873
"5766171341": "devtools/ymake/bin/ymake for linux-aarch64",
28662874
"5805430188": "devtools/ymake/bin/ymake for linux-aarch64",
28672875
"5829023352": "devtools/ymake/bin/ymake for linux-aarch64",
@@ -2968,6 +2976,7 @@
29682976
"9930168648": "devtools/ymake/bin/ymake for linux-aarch64",
29692977
"9933944861": "devtools/ymake/bin/ymake for linux-aarch64",
29702978
"9966446510": "devtools/ymake/bin/ymake for linux-aarch64",
2979+
"9997224991": "devtools/ymake/bin/ymake for linux-aarch64",
29712980
"8270821739": "devtools/ymake/bin/ymake for win32",
29722981
"8295446553": "devtools/ymake/bin/ymake for win32",
29732982
"8326170338": "devtools/ymake/bin/ymake for win32",
@@ -3004,6 +3013,7 @@
30043013
"9930176677": "devtools/ymake/bin/ymake for win32",
30053014
"9933948304": "devtools/ymake/bin/ymake for win32",
30063015
"9966449520": "devtools/ymake/bin/ymake for win32",
3016+
"9997231623": "devtools/ymake/bin/ymake for win32",
30073017
"5766172695": "devtools/ymake/bin/ymake for win32-clang-cl",
30083018
"5805432230": "devtools/ymake/bin/ymake for win32-clang-cl",
30093019
"5829029743": "devtools/ymake/bin/ymake for win32-clang-cl",

‎contrib/python/aiohappyeyeballs/.dist-info/METADATA‎

Lines changed: 0 additions & 123 deletions
This file was deleted.

0 commit comments

Comments
 (0)