Skip to content

Commit 408da97

Browse files
ydbotydbot
committed
Merge pull request #28657 from ydb-platform/merge-rightlib-251111-1623
2 parents 1b58af3 + 5700ad6 commit 408da97

File tree

328 files changed

+90437
-2014
lines changed

Some content is hidden

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

328 files changed

+90437
-2014
lines changed

‎build/conf/java.conf‎

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ multimodule JTEST_FOR {
375375
}
376376

377377
multimodule JAVA_CONTRIB_PROGRAM {
378-
module JAR_RUNNABLE: _JAR_RUNNABLE {
378+
module JAR_RUNNABLE: _JAR_CONTRIB_RUNNABLE {
379379
.IGNORED=JAVA_SRCS RUN_JAR_PROGRAM RUN_JAVA_PROGRAM JAR_RESOURCE SRC_RESOURCE LOCAL_JAR
380380
.PEERDIRSELF=JAR_COMPILATION
381381
.SEM=$_SEM_IGNORED
@@ -1431,6 +1431,46 @@ module _JAR_RUNNABLE: _COMPILABLE_JAR_BASE {
14311431
CHECK_PROVIDES()
14321432
}
14331433

1434+
# tag:java-specific
1435+
module _JAR_CONTRIB_RUNNABLE: _JAR_BASE {
1436+
.FINAL_TARGET=yes
1437+
.CMD=$LINK_JAR_PROGRAM
1438+
.SEM=$_SEM_IGNORED
1439+
.ALIASES=JAVA_SRCS=_MARK_JAVA_PROG_WITH_SOURCES
1440+
.ALLOWED=WITH_JDK GENERATE_SCRIPT
1441+
.PEERDIR_POLICY=as_build_from
1442+
1443+
MODULE_SUFFIX=.run.cp.jar
1444+
CONSUME_NON_MANAGEABLE_PEERS=yes
1445+
1446+
when ($RUN_WITH_SOURCES == "yes") {
1447+
_SOURCE_JARS=${suf=-sources.jar;noext;ext=.jar:MANAGED_PEERS_CLOSURE} ${hide;late_out;pre=$BINDIR/$REALPRJNAME/;suf=-sources.jar;nopath;noext;ext=.jar:MANAGED_PEERS_CLOSURE}
1448+
_SOURCE_JARS_CPLIST=${rootrel;pre=$BINDIR/$REALPRJNAME/;suf=-sources.jar;nopath;noext;ext=.jar:MANAGED_PEERS_CLOSURE}
1449+
}
1450+
1451+
when ($TARED_CLASSPATH == "yes") {
1452+
DO_TAR_CLASSPATH=$TAR_CLASSPATH
1453+
}
1454+
1455+
when ($DISABLE_SCRIPTGEN) {
1456+
DO_GEN_JAVA_RUN_SH=
1457+
}
1458+
otherwise {
1459+
DO_GEN_JAVA_RUN_SH=$GEN_JAVA_RUN_SH
1460+
PEERDIR+=build/platform/java/scriptgen
1461+
}
1462+
1463+
when ($MAKE_UBERJAR_VALUE == "yes") {
1464+
LINK_JAR_PROGRAM=$LINK_UBERJAR_PROGRAM
1465+
DYNAMIC_LINK=no
1466+
_SCRIPTGEN_FLAGS=-D IS_UBERJAR=yes
1467+
}
1468+
otherwise {
1469+
_SCRIPTGEN_FLAGS=-D IS_UBERJAR=no
1470+
}
1471+
CHECK_PROVIDES()
1472+
}
1473+
14341474
# tag:java-specific
14351475
LINK_JAR_TEST=${hide:JAVA_FAKEID} ${WRITER_PY} --file ${BINDIR}/run-bf.txt -Q -m --ya-start-command-file ${ext=.jar:MANAGED_PEERS_CLOSURE} --ya-end-command-file && ${YMAKE_PYTHON3} ${input:"build/scripts/make_manifest_from_bf.py"} ${BINDIR}/run-bf.txt ${TARGET} ${hide;kv:"p JT"}
14361476
module _JAR_TEST: _COMPILABLE_JAR_BASE {

‎build/mapping.conf.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,7 @@
467467
"10153859564": "{registry_endpoint}/10153859564",
468468
"10164110401": "{registry_endpoint}/10164110401",
469469
"10190826595": "{registry_endpoint}/10190826595",
470+
"10239299149": "{registry_endpoint}/10239299149",
470471
"5486713852": "{registry_endpoint}/5486713852",
471472
"5514352253": "{registry_endpoint}/5514352253",
472473
"5523579199": "{registry_endpoint}/5523579199",
@@ -2288,6 +2289,7 @@
22882289
"10153859564": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
22892290
"10164110401": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
22902291
"10190826595": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
2292+
"10239299149": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
22912293
"5486713852": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
22922294
"5514352253": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
22932295
"5523579199": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",

‎build/platform/test_tool/host.ya.make.inc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
2-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10190891954)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10239425239)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10190886565)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10239422513)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10190901147)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10239430509)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10190882391)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10239420178)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10190896591)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10239427879)
1111

1212
ENDIF()

‎build/platform/test_tool/host_os.ya.make.inc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
2-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10190817653)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10239294900)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10190812518)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10239293034)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10190826595)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10239299149)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10190807948)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10239291286)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10190822339)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10239296643)
1111

1212
ENDIF()

‎contrib/libs/cxxsupp/libcxx/.yandex_meta/build.ym‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
{% block current_date %}2024-09-20{% endblock %}
55

66
{% block keep_sources %}
7+
.yandex_meta/scripts/fixlic.py
78
.yandex_meta/scripts/sysincls.py
89
include/__config_site
910
include/__config_epilogue.h
@@ -286,8 +287,17 @@ echo "no version update"
286287
rsync --recursive --delete --perms ${SRC}/ ${OUTPUT}
287288
{% endblock %}
288289

289-
290290
{% block step_install %}
291291
{{super()}}
292292
rsync ${SYSINCLS}/stl-to-libcxx.yml ${ARCADIA_ROOT}/build/sysincl/stl-to-libcxx.yml
293293
{% endblock %}
294+
295+
{% block run_license_analyzer %}
296+
{{super()}}
297+
base64 -d << EOF > ${BIN}/fixlic
298+
{% include 'scripts/fixlic.py/base64' %}
299+
300+
EOF
301+
cat ${OUTPUT}/.yandex_meta/licenses.list.txt | python3 ${BIN}/fixlic > _
302+
mv _ ${OUTPUT}/.yandex_meta/licenses.list.txt
303+
{% endblock %}

0 commit comments

Comments
 (0)