Skip to content

Commit ba4af7c

Browse files
maximyurchukmaximyurchuk
authored
Merge pull request #10186 from ydb-platform/mergelibs-241007-1548
Library import 241007-1548
2 parents 2996126 + 04d87ab commit ba4af7c

File tree

198 files changed

+6900
-8681
lines changed

Some content is hidden

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

198 files changed

+6900
-8681
lines changed

‎build/conf/compilers/msvc_compiler.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
_STD_CXX=/std:$_STD_CXX_VERSION
22

33
C_COMPILER=${_WINE_C_PREFIX} ${C_COMPILER_UNQUOTED}
4-
C_COMPILER_OLD=${_WINE_C_PREFIX} ${quo:C_COMPILER_OLD_UNQUOTED}
54
CXX_COMPILER=${_WINE_CXX_PREFIX} ${CXX_COMPILER_UNQUOTED}
65
CXX_COMPILER_OLD=${_WINE_CXX_PREFIX} ${quo:CXX_COMPILER_OLD_UNQUOTED}
76
MASM_COMPILER=${_WINE_MASM_PREFIX} ${MASM_COMPILER_UNQUOTED}

‎build/conf/go.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ macro _GO_COMPILE_CGO1(NAME, FLAGS[], FILES...) {
216216

217217
# tag:go-specific
218218
macro _GO_COMPILE_CGO2(NAME, C_FILES[], S_FILES[], OBJ_FILES[], FILES...) {
219-
.CMD=${hide:_CGO_FAKEID} $C_COMPILER_OLD $C_FLAGS_PLATFORM ${pre=-I:_C__INCLUDE} $CGO_CFLAGS_VALUE ${input;tobindir:"_cgo_main.c"} -c -o ${tmp;noauto;suf=${OBJECT_SUF}:"_cgo_main.c"} && $C_COMPILER $C_FLAGS_PLATFORM ${pre=-I:_C__INCLUDE} -o ${tmp;noauto;suf=${OBJECT_SUF}:"_cgo_"} $LDFLAGS $LDFLAGS_GLOBAL $CGO2_LDFLAGS_VALUE ${input;hide:"_cgo_export.h"} ${tmp;noauto;suf=${OBJECT_SUF}:"_cgo_main.c"} ${input;suf=${OBJECT_SUF}:"_cgo_export.c"} ${input;nopath;noext;suf=.cgo2.c${OBJECT_SUF}:FILES} ${input;suf=${OBJECT_SUF}:C_FILES} ${input;suf=.o:S_FILES} ${input:OBJ_FILES} $CGO_LDFLAGS_VALUE && ${GO_TOOLS_ROOT}/pkg/tool/$_GO_TC_PATH/cgo -dynpackage $NAME -dynimport ${tmp;noauto;suf=${OBJECT_SUF}:"_cgo_"} -dynout ${output:"_cgo_import.go"} -dynlinker $GO_CGO2_FLAGS_VALUE $GO_TOOLCHAIN_ENV ${kv;hide:"p go"} ${kv;hide:"pc light-blue"} ${kv;hide:"show_out"}
219+
.CMD=${hide:_CGO_FAKEID} $C_COMPILER $C_FLAGS_PLATFORM ${pre=-I:_C__INCLUDE} $CGO_CFLAGS_VALUE ${input;tobindir:"_cgo_main.c"} -c -o ${tmp;noauto;suf=${OBJECT_SUF}:"_cgo_main.c"} && $C_COMPILER $C_FLAGS_PLATFORM ${pre=-I:_C__INCLUDE} -o ${tmp;noauto;suf=${OBJECT_SUF}:"_cgo_"} $LDFLAGS $LDFLAGS_GLOBAL $CGO2_LDFLAGS_VALUE ${input;hide:"_cgo_export.h"} ${tmp;noauto;suf=${OBJECT_SUF}:"_cgo_main.c"} ${input;suf=${OBJECT_SUF}:"_cgo_export.c"} ${input;nopath;noext;suf=.cgo2.c${OBJECT_SUF}:FILES} ${input;suf=${OBJECT_SUF}:C_FILES} ${input;suf=.o:S_FILES} ${input:OBJ_FILES} $CGO_LDFLAGS_VALUE && ${GO_TOOLS_ROOT}/pkg/tool/$_GO_TC_PATH/cgo -dynpackage $NAME -dynimport ${tmp;noauto;suf=${OBJECT_SUF}:"_cgo_"} -dynout ${output:"_cgo_import.go"} -dynlinker $GO_CGO2_FLAGS_VALUE $GO_TOOLCHAIN_ENV ${kv;hide:"p go"} ${kv;hide:"pc light-blue"} ${kv;hide:"show_out"}
220220

221221
_USE_LINKER()
222222
}

‎build/conf/linkers/msvc_linker.conf

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,13 @@ when ($IDE_MSVS != "yes") {
5151
/LIBPATH:\""${_MSVC_TC_VC_ROOT}/lib/$_MSVC_ARCH"\"
5252
}
5353

54+
when ($WINDOWS_MANIFEST != "") {
55+
_FLAGS_MANIFEST=/MANIFEST:EMBED /MANIFESTINPUT:${input:WINDOWS_MANIFEST}
56+
}
57+
otherwise {
58+
_FLAGS_MANIFEST=
59+
}
60+
5461
_FLAGS_COMMON =/NOLOGO /ERRORREPORT:PROMPT /SUBSYSTEM:CONSOLE /TLBID:1 $MSVC_DYNAMICBASE /NXCOMPAT
5562
_FLAGS_COMMON+=$_FLAGS_IGNORE
5663
_FLAGS_COMMON+=$_FLAGS_MACHINE
@@ -100,7 +107,7 @@ LINK_STDLIBS=\
100107
ws2_32.lib
101108

102109
LDFLAGS_GLOBAL=
103-
LDFLAGS=
110+
LDFLAGS=$_FLAGS_MANIFEST
104111
OBJADDE=
105112
OBJADDE_LIB=
106113
OBJADDE_LIB_GLOBAL=

‎build/export_generators/ide-gradle/build.gradle.kts.jinja

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ plugins {
4444
{%- endif %}
4545
}
4646
{# language level #}
47-
{%- if target.required_jdk != "" %}
47+
{%- if target.required_jdk is defined and target.required_jdk|length %}
4848
java {
4949
toolchain {
5050
languageVersion = JavaLanguageVersion.of("{{ target.required_jdk }}")
@@ -55,6 +55,11 @@ java {
5555

5656
allOpen {
5757
annotation("org.springframework.stereotype.Component")
58+
annotation("org.springframework.transaction.annotation.Transactional")
59+
annotation("org.springframework.scheduling.annotation.Async")
60+
annotation("org.springframework.cache.annotation.Cacheable")
61+
annotation("org.springframework.boot.test.context.SpringBootTest")
62+
annotation("org.springframework.validation.annotation.Validated")
5863
}
5964
{% endif -%}
6065
{%- if with_kotlin %}

‎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:7167514017"
4+
"uri": "sbr:7211385890"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:7167513539"
7+
"uri": "sbr:7211384971"
88
},
99
"linux": {
10-
"uri": "sbr:7167514830"
10+
"uri": "sbr:7211387031"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:7167513152"
13+
"uri": "sbr:7211384106"
1414
},
1515
"win32-clang-cl": {
16-
"uri": "sbr:7167514469"
16+
"uri": "sbr:7211386552"
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:7167510579"
4+
"uri": "sbr:7211379592"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:7167510004"
7+
"uri": "sbr:7211379140"
88
},
99
"linux": {
10-
"uri": "sbr:7167511734"
10+
"uri": "sbr:7211380545"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:7167509437"
13+
"uri": "sbr:7211378513"
1414
},
1515
"win32-clang-cl": {
16-
"uri": "sbr:7167511239"
16+
"uri": "sbr:7211379980"
1717
}
1818
}
1919
}

‎build/mapping.conf.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,8 @@
407407
"7120353733": "https://devtools-registry.s3.yandex.net/7120353733",
408408
"7203766556": "https://devtools-registry.s3.yandex.net/7203766556",
409409
"7203793573": "https://devtools-registry.s3.yandex.net/7203793573",
410+
"7214825617": "https://devtools-registry.s3.yandex.net/7214825617",
411+
"7214836038": "https://devtools-registry.s3.yandex.net/7214836038",
410412
"5486731632": "https://devtools-registry.s3.yandex.net/5486731632",
411413
"5514350352": "https://devtools-registry.s3.yandex.net/5514350352",
412414
"5514360398": "https://devtools-registry.s3.yandex.net/5514360398",
@@ -562,6 +564,7 @@
562564
"7129654082": "https://devtools-registry.s3.yandex.net/7129654082",
563565
"7157619813": "https://devtools-registry.s3.yandex.net/7157619813",
564566
"7167514017": "https://devtools-registry.s3.yandex.net/7167514017",
567+
"7211385890": "https://devtools-registry.s3.yandex.net/7211385890",
565568
"5766171800": "https://devtools-registry.s3.yandex.net/5766171800",
566569
"5805430761": "https://devtools-registry.s3.yandex.net/5805430761",
567570
"5829025456": "https://devtools-registry.s3.yandex.net/5829025456",
@@ -604,6 +607,7 @@
604607
"7129653224": "https://devtools-registry.s3.yandex.net/7129653224",
605608
"7157617132": "https://devtools-registry.s3.yandex.net/7157617132",
606609
"7167513539": "https://devtools-registry.s3.yandex.net/7167513539",
610+
"7211384971": "https://devtools-registry.s3.yandex.net/7211384971",
607611
"5766173070": "https://devtools-registry.s3.yandex.net/5766173070",
608612
"5805432830": "https://devtools-registry.s3.yandex.net/5805432830",
609613
"5829031598": "https://devtools-registry.s3.yandex.net/5829031598",
@@ -646,6 +650,7 @@
646650
"7129655749": "https://devtools-registry.s3.yandex.net/7129655749",
647651
"7157625186": "https://devtools-registry.s3.yandex.net/7157625186",
648652
"7167514830": "https://devtools-registry.s3.yandex.net/7167514830",
653+
"7211387031": "https://devtools-registry.s3.yandex.net/7211387031",
649654
"5766171341": "https://devtools-registry.s3.yandex.net/5766171341",
650655
"5805430188": "https://devtools-registry.s3.yandex.net/5805430188",
651656
"5829023352": "https://devtools-registry.s3.yandex.net/5829023352",
@@ -688,6 +693,7 @@
688693
"7129652122": "https://devtools-registry.s3.yandex.net/7129652122",
689694
"7157614512": "https://devtools-registry.s3.yandex.net/7157614512",
690695
"7167513152": "https://devtools-registry.s3.yandex.net/7167513152",
696+
"7211384106": "https://devtools-registry.s3.yandex.net/7211384106",
691697
"5766172695": "https://devtools-registry.s3.yandex.net/5766172695",
692698
"5805432230": "https://devtools-registry.s3.yandex.net/5805432230",
693699
"5829029743": "https://devtools-registry.s3.yandex.net/5829029743",
@@ -730,6 +736,7 @@
730736
"7129654809": "https://devtools-registry.s3.yandex.net/7129654809",
731737
"7157622599": "https://devtools-registry.s3.yandex.net/7157622599",
732738
"7167514469": "https://devtools-registry.s3.yandex.net/7167514469",
739+
"7211386552": "https://devtools-registry.s3.yandex.net/7211386552",
733740
"4307890075": "https://devtools-registry.s3.yandex.net/4307890075",
734741
"5517245192": "https://devtools-registry.s3.yandex.net/5517245192",
735742
"4307901240": "https://devtools-registry.s3.yandex.net/4307901240",
@@ -1321,6 +1328,8 @@
13211328
"7120353733": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
13221329
"7203766556": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
13231330
"7203793573": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
1331+
"7214825617": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
1332+
"7214836038": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
13241333
"5486731632": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
13251334
"5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
13261335
"5514360398": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
@@ -1476,6 +1485,7 @@
14761485
"7129654082": "devtools/ymake/bin/ymake for darwin",
14771486
"7157619813": "devtools/ymake/bin/ymake for darwin",
14781487
"7167514017": "devtools/ymake/bin/ymake for darwin",
1488+
"7211385890": "devtools/ymake/bin/ymake for darwin",
14791489
"5766171800": "devtools/ymake/bin/ymake for darwin-arm64",
14801490
"5805430761": "devtools/ymake/bin/ymake for darwin-arm64",
14811491
"5829025456": "devtools/ymake/bin/ymake for darwin-arm64",
@@ -1518,6 +1528,7 @@
15181528
"7129653224": "devtools/ymake/bin/ymake for darwin-arm64",
15191529
"7157617132": "devtools/ymake/bin/ymake for darwin-arm64",
15201530
"7167513539": "devtools/ymake/bin/ymake for darwin-arm64",
1531+
"7211384971": "devtools/ymake/bin/ymake for darwin-arm64",
15211532
"5766173070": "devtools/ymake/bin/ymake for linux",
15221533
"5805432830": "devtools/ymake/bin/ymake for linux",
15231534
"5829031598": "devtools/ymake/bin/ymake for linux",
@@ -1560,6 +1571,7 @@
15601571
"7129655749": "devtools/ymake/bin/ymake for linux",
15611572
"7157625186": "devtools/ymake/bin/ymake for linux",
15621573
"7167514830": "devtools/ymake/bin/ymake for linux",
1574+
"7211387031": "devtools/ymake/bin/ymake for linux",
15631575
"5766171341": "devtools/ymake/bin/ymake for linux-aarch64",
15641576
"5805430188": "devtools/ymake/bin/ymake for linux-aarch64",
15651577
"5829023352": "devtools/ymake/bin/ymake for linux-aarch64",
@@ -1602,6 +1614,7 @@
16021614
"7129652122": "devtools/ymake/bin/ymake for linux-aarch64",
16031615
"7157614512": "devtools/ymake/bin/ymake for linux-aarch64",
16041616
"7167513152": "devtools/ymake/bin/ymake for linux-aarch64",
1617+
"7211384106": "devtools/ymake/bin/ymake for linux-aarch64",
16051618
"5766172695": "devtools/ymake/bin/ymake for win32-clang-cl",
16061619
"5805432230": "devtools/ymake/bin/ymake for win32-clang-cl",
16071620
"5829029743": "devtools/ymake/bin/ymake for win32-clang-cl",
@@ -1644,6 +1657,7 @@
16441657
"7129654809": "devtools/ymake/bin/ymake for win32-clang-cl",
16451658
"7157622599": "devtools/ymake/bin/ymake for win32-clang-cl",
16461659
"7167514469": "devtools/ymake/bin/ymake for win32-clang-cl",
1660+
"7211386552": "devtools/ymake/bin/ymake for win32-clang-cl",
16471661
"4307890075": "flake8_linter for linux",
16481662
"5517245192": "flake8_linter for linux",
16491663
"4307901240": "flake8_linter for linux-aarch64",

‎build/platform/python/ymake_python3/ya.make

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
RESOURCES_LIBRARY()
22

33
TOOLCHAIN(python3)
4-
VERSION(3.12.5)
4+
VERSION(3.12.6)
55

66
NO_YMAKE_PYTHON3()
77
SET(RESOURCES_LIBRARY_LINK $TOUCH_UNIT)

‎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:7203790694)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7214835716)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7203789329)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7214835475)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7203793573)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7214836038)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7203788076)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7214835148)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7203792081)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7214835884)
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:7203764126)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7214824944)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7203762905)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7214824429)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7203766556)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7214825617)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7203761608)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7214823934)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7203765438)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7214825382)
1111

1212
ENDIF()

0 commit comments

Comments
 (0)