Skip to content

Commit 7f8f368

Browse files
maximyurchukmaximyurchuk
authored
Merge pull request #8068 from ydb-platform/mergelibs-240820-2236
Library import 240820-2236
2 parents ed392b6 + c17e4f1 commit 7f8f368

File tree

108 files changed

+278
-20
lines changed

Some content is hidden

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

108 files changed

+278
-20
lines changed

‎build/export_generators/cmake/dir_cmake_lists.jinja

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{%- include '[generator]/disclaimer.jinja' %}
2-
{% include 'prologue.cmake' ignore missing -%}
1+
{%- include '[generator]/disclaimer.jinja' -%}
2+
{%- include 'prologue.cmake' ignore missing -%}
33

44
{%- include "[generator]/dir_packages.jinja" -%}
55
{%- include "[generator]/dir_tools.jinja" -%}

‎build/export_generators/cmake/dir_includes.jinja

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
{%- if dir_includes is defined %}
2-
{% for dir_include in dir_includes -%}
1+
{%- if dir_includes|length -%}
2+
{%- for dir_include in dir_includes %}
33
include({{ dir_include }})
4-
{% endfor -%}
5-
{%- endif -%}
4+
{% endfor %}
5+
{% endif -%}
66

7-
{%- if subdirs|length %}
8-
{% for subdir in subdirs -%}
7+
{%- if subdirs|length -%}
8+
{%- for subdir in subdirs %}
99
add_subdirectory({{ subdir }})
10-
{% endfor -%}
11-
{%- endif -%}
10+
{%- endfor %}
11+
{% endif -%}

‎build/export_generators/cmake/dir_macroses.jinja

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{%- if dir_macroses is defined -%}
1+
{%- if dir_macroses|length -%}
22
{%- for dir_macros in dir_macroses -%}
33
{%- if dir_macros.macro == "set_vars" -%}
44
{%- for set_var in dir_macros.args %}

‎build/export_generators/cmake/dir_packages.jinja

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
{%- endif -%}
1616
{%- endif -%}
1717
{%- if packages|length -%}
18-
{%- for package in packages -%}
18+
{%- for package in packages %}
1919
find_package({{ package.name }} REQUIRED
2020
{%- if package.components|length %} COMPONENTS
2121
{%- for component in package.components %}
@@ -30,7 +30,7 @@ find_package({{ package.name }} REQUIRED
3030
{%- if target is defined -%}
3131
{{ RenderPackages(target) }}
3232
{%- endif -%}
33-
{%- if extra_targets is defined -%}
33+
{%- if extra_targets|length -%}
3434
{%- for extra_target in extra_targets -%}
3535
{{ RenderPackages(extra_target) }}
3636
{%- endfor -%}

‎build/export_generators/cmake/dir_targets.jinja

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
{%- set current_target = target -%}
7373
{%- include '[generator]/target_cmake_lists.jinja' -%}
7474
{%- endif -%}
75-
{%- if extra_targets is defined -%}
75+
{%- if extra_targets|length -%}
7676
{%- for current_target in extra_targets -%}
7777
{%- include '[generator]/target_cmake_lists.jinja' -%}
7878
{%- endfor -%}

‎build/export_generators/cmake/dir_tools.jinja

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{%- if tools is defined -%}
1+
{%- if tools|length -%}
22
{%- for tool in tools -%}
33
{%- set path_and_name = rsplit(tool, "/", 2) -%}
44
{%- set toolPath = path_and_name[0] -%}

‎build/export_generators/cmake/disclaimer.jinja

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated by the YaTool build system (https://github.com/yandex/yatool),
1+
# This file was generated by the YaTool build system (https://github.com/yandex/yatool),
22
# from a source YaTool build configuration provided in ya.make files.
33
#
44
# If the repository supports both CMake and ya build configurations, please modify both of them.

‎build/export_generators/cmake/root_cmake_lists.jinja

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% include '[generator]/disclaimer.jinja' %}
1+
{%- include '[generator]/disclaimer.jinja' -%}
22

33
cmake_minimum_required(VERSION 3.15)
44
if (POLICY CMP0132)

‎build/mapping.conf.json

+24
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,9 @@
102102
"5458408674": "https://devtools-registry.s3.yandex.net/5458408674",
103103
"5463300202": "https://devtools-registry.s3.yandex.net/5463300202",
104104
"5465946272": "https://devtools-registry.s3.yandex.net/5465946272",
105+
"5938874764": "https://devtools-registry.s3.yandex.net/5938874764",
106+
"5938174048": "https://devtools-registry.s3.yandex.net/5938174048",
107+
"2441712958": "https://devtools-registry.s3.yandex.net/2441712958",
105108
"1966560555": "https://devtools-registry.s3.yandex.net/1966560555",
106109
"309054781": "https://devtools-registry.s3.yandex.net/309054781",
107110
"243881345": "https://devtools-registry.s3.yandex.net/243881345",
@@ -669,26 +672,31 @@
669672
"5777101734": "https://devtools-registry.s3.yandex.net/5777101734",
670673
"5909068951": "https://devtools-registry.s3.yandex.net/5909068951",
671674
"6043999575": "https://devtools-registry.s3.yandex.net/6043999575",
675+
"6431453246": "https://devtools-registry.s3.yandex.net/6431453246",
672676
"6431665742": "https://devtools-registry.s3.yandex.net/6431665742",
673677
"5776379446": "https://devtools-registry.s3.yandex.net/5776379446",
674678
"5777100597": "https://devtools-registry.s3.yandex.net/5777100597",
675679
"5909067709": "https://devtools-registry.s3.yandex.net/5909067709",
676680
"6043999100": "https://devtools-registry.s3.yandex.net/6043999100",
681+
"6431452613": "https://devtools-registry.s3.yandex.net/6431452613",
677682
"6431664742": "https://devtools-registry.s3.yandex.net/6431664742",
678683
"5776375952": "https://devtools-registry.s3.yandex.net/5776375952",
679684
"5777098178": "https://devtools-registry.s3.yandex.net/5777098178",
680685
"5909065014": "https://devtools-registry.s3.yandex.net/5909065014",
681686
"6043997813": "https://devtools-registry.s3.yandex.net/6043997813",
687+
"6431451381": "https://devtools-registry.s3.yandex.net/6431451381",
682688
"6431662248": "https://devtools-registry.s3.yandex.net/6431662248",
683689
"5776374505": "https://devtools-registry.s3.yandex.net/5776374505",
684690
"5777096988": "https://devtools-registry.s3.yandex.net/5777096988",
685691
"5909063641": "https://devtools-registry.s3.yandex.net/5909063641",
686692
"6043997124": "https://devtools-registry.s3.yandex.net/6043997124",
693+
"6431450445": "https://devtools-registry.s3.yandex.net/6431450445",
687694
"6431661101": "https://devtools-registry.s3.yandex.net/6431661101",
688695
"5776377955": "https://devtools-registry.s3.yandex.net/5776377955",
689696
"5777099502": "https://devtools-registry.s3.yandex.net/5777099502",
690697
"5909066324": "https://devtools-registry.s3.yandex.net/5909066324",
691698
"6043998448": "https://devtools-registry.s3.yandex.net/6043998448",
699+
"6431452096": "https://devtools-registry.s3.yandex.net/6431452096",
692700
"6431663364": "https://devtools-registry.s3.yandex.net/6431663364",
693701
"6391354461": "https://devtools-registry.s3.yandex.net/6391354461",
694702
"3167009386": "https://devtools-registry.s3.yandex.net/3167009386",
@@ -708,6 +716,7 @@
708716
"6561765464": "https://devtools-registry.s3.yandex.net/6561765464",
709717
"6184289846": "https://devtools-registry.s3.yandex.net/6184289846",
710718
"6561764909": "https://devtools-registry.s3.yandex.net/6561764909",
719+
"6490009481": "https://devtools-registry.s3.yandex.net/6490009481",
711720
"5054517618": "https://devtools-registry.s3.yandex.net/5054517618",
712721
"5054512910": "https://devtools-registry.s3.yandex.net/5054512910",
713722
"5054518131": "https://devtools-registry.s3.yandex.net/5054518131",
@@ -736,6 +745,9 @@
736745
"5664939545": "https://devtools-registry.s3.yandex.net/5664939545",
737746
"5678781047": "https://devtools-registry.s3.yandex.net/5678781047",
738747
"5749208149": "https://devtools-registry.s3.yandex.net/5749208149",
748+
"6662972834": "https://devtools-registry.s3.yandex.net/6662972834",
749+
"6662965433": "https://devtools-registry.s3.yandex.net/6662965433",
750+
"6662980150": "https://devtools-registry.s3.yandex.net/6662980150",
739751
"5476908047": "https://devtools-registry.s3.yandex.net/5476908047",
740752
"5509380757": "https://devtools-registry.s3.yandex.net/5509380757",
741753
"5550834592": "https://devtools-registry.s3.yandex.net/5550834592",
@@ -882,6 +894,9 @@
882894
"5458408674": "OTHER_RESOURCE-none-none-lld.tgz",
883895
"5463300202": "OTHER_RESOURCE-none-none-lld.tgz",
884896
"5465946272": "OTHER_RESOURCE-none-none-lld.tgz",
897+
"5938874764": "OTHER_RESOURCE-none-none-plantuml-asl-1.2024.3-sources.jar",
898+
"5938174048": "OTHER_RESOURCE-none-none-plantuml-asl-1.2024.3.jar",
899+
"2441712958": "OTHER_RESOURCE-none-none-resource.tar.gz",
885900
"1966560555": "Ubuntu 14 x86-64 native SDK (patched, v3)",
886901
"309054781": "Ubuntu 16 x86-64 -> Ubuntu 16 aarch64 cross SDK",
887902
"243881345": "Ubuntu 16 x86_64 native SDK",
@@ -1449,26 +1464,31 @@
14491464
"5777101734": "none-none-none-result_resources/jdk-darwin-aarch64.yandex.tgz",
14501465
"5909068951": "none-none-none-result_resources/jdk-darwin-aarch64.yandex.tgz",
14511466
"6043999575": "none-none-none-result_resources/jdk-darwin-aarch64.yandex.tgz",
1467+
"6431453246": "none-none-none-result_resources/jdk-darwin-aarch64.yandex.tgz",
14521468
"6431665742": "none-none-none-result_resources/jdk-darwin-aarch64.yandex.tgz",
14531469
"5776379446": "none-none-none-result_resources/jdk-darwin-x86_64.yandex.tgz",
14541470
"5777100597": "none-none-none-result_resources/jdk-darwin-x86_64.yandex.tgz",
14551471
"5909067709": "none-none-none-result_resources/jdk-darwin-x86_64.yandex.tgz",
14561472
"6043999100": "none-none-none-result_resources/jdk-darwin-x86_64.yandex.tgz",
1473+
"6431452613": "none-none-none-result_resources/jdk-darwin-x86_64.yandex.tgz",
14571474
"6431664742": "none-none-none-result_resources/jdk-darwin-x86_64.yandex.tgz",
14581475
"5776375952": "none-none-none-result_resources/jdk-linux-aarch64.yandex.tgz",
14591476
"5777098178": "none-none-none-result_resources/jdk-linux-aarch64.yandex.tgz",
14601477
"5909065014": "none-none-none-result_resources/jdk-linux-aarch64.yandex.tgz",
14611478
"6043997813": "none-none-none-result_resources/jdk-linux-aarch64.yandex.tgz",
1479+
"6431451381": "none-none-none-result_resources/jdk-linux-aarch64.yandex.tgz",
14621480
"6431662248": "none-none-none-result_resources/jdk-linux-aarch64.yandex.tgz",
14631481
"5776374505": "none-none-none-result_resources/jdk-linux-x86_64.yandex.tgz",
14641482
"5777096988": "none-none-none-result_resources/jdk-linux-x86_64.yandex.tgz",
14651483
"5909063641": "none-none-none-result_resources/jdk-linux-x86_64.yandex.tgz",
14661484
"6043997124": "none-none-none-result_resources/jdk-linux-x86_64.yandex.tgz",
1485+
"6431450445": "none-none-none-result_resources/jdk-linux-x86_64.yandex.tgz",
14671486
"6431661101": "none-none-none-result_resources/jdk-linux-x86_64.yandex.tgz",
14681487
"5776377955": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz",
14691488
"5777099502": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz",
14701489
"5909066324": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz",
14711490
"6043998448": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz",
1491+
"6431452096": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz",
14721492
"6431663364": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz",
14731493
"6391354461": "none-none-none-result_resources/protoc-linux-x86_64.tgz",
14741494
"3167009386": "openjdk 11.0.15 vanilla for darwin",
@@ -1488,6 +1508,7 @@
14881508
"6561765464": "tools/flake8_linter/bin/flake8_linter for linux",
14891509
"6184289846": "tools/flake8_linter/bin/flake8_linter for linux-aarch64",
14901510
"6561764909": "tools/flake8_linter/bin/flake8_linter for linux-aarch64",
1511+
"6490009481": "uberjar for all jdk11",
14911512
"5054517618": "ya-tc for darwin",
14921513
"5054512910": "ya-tc for darwin-arm64",
14931514
"5054518131": "ya-tc for linux",
@@ -1516,6 +1537,9 @@
15161537
"5664939545": "yexport for linux",
15171538
"5678781047": "yexport for linux",
15181539
"5749208149": "yexport for linux",
1540+
"6662972834": "yfm-docs for darwin",
1541+
"6662965433": "yfm-docs for linux",
1542+
"6662980150": "yfm-docs for win32",
15191543
"5476908047": "ymake for darwin",
15201544
"5509380757": "ymake for darwin",
15211545
"5550834592": "ymake for darwin",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
RESOURCES_LIBRARY()
22

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

66
NO_YMAKE_PYTHON3()
77
SET(RESOURCES_LIBRARY_LINK $TOUCH_UNIT)

‎contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/ya.make

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ LICENSE(
1010

1111
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
1212

13+
VERSION(1.11.37)
14+
1315
PEERDIR(
1416
contrib/libs/curl
1517
contrib/libs/openssl

‎contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/ya.make

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ LICENSE(Apache-2.0)
66

77
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
88

9+
VERSION(1.11.37)
10+
911
PEERDIR(
1012
contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core
1113
contrib/restricted/aws/aws-c-auth

‎contrib/libs/curl/bin/ya.make

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ LICENSE(
1111

1212
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
1313

14+
VERSION(8.5.0)
15+
1416
PEERDIR(
1517
contrib/libs/c-ares
1618
contrib/libs/curl

‎contrib/libs/flatbuffers/flatc/ya.make

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ INDUCED_DEPS(
1212
${ARCADIA_ROOT}/contrib/libs/flatbuffers/include/flatbuffers/flatbuffers_iter.h
1313
)
1414

15+
VERSION(24.3.25)
16+
1517
PEERDIR(
1618
contrib/restricted/abseil-cpp/absl/base
1719
)

‎contrib/libs/grpc/grpc++_reflection/ya.make

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ LIBRARY()
44

55
WITHOUT_LICENSE_TEXTS()
66

7+
VERSION(1.54.2)
8+
79
LICENSE(Apache-2.0)
810

911
PEERDIR(

‎contrib/libs/grpc/grpcpp_channelz/ya.make

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ LIBRARY()
44

55
WITHOUT_LICENSE_TEXTS()
66

7+
VERSION(1.54.2)
8+
79
LICENSE(Apache-2.0)
810

911
PEERDIR(

‎contrib/libs/grpc/src/compiler/grpc_cpp_plugin/ya.make

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ PROGRAM()
44

55
WITHOUT_LICENSE_TEXTS()
66

7+
VERSION(1.54.2)
8+
79
LICENSE(Apache-2.0)
810

911
PEERDIR(

‎contrib/libs/grpc/src/compiler/grpc_plugin_support/ya.make

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ LIBRARY()
44

55
WITHOUT_LICENSE_TEXTS()
66

7+
VERSION(1.54.2)
8+
79
LICENSE(Apache-2.0)
810

911
PEERDIR(

‎contrib/libs/grpc/src/compiler/grpc_python_plugin/ya.make

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ PROGRAM()
44

55
WITHOUT_LICENSE_TEXTS()
66

7+
VERSION(1.54.2)
8+
79
LICENSE(Apache-2.0)
810

911
PEERDIR(

‎contrib/libs/grpc/third_party/address_sorting/ya.make

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
LIBRARY()
44

5+
VERSION(1.54.2)
6+
57
LICENSE(BSD-3-Clause)
68

79
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)

‎contrib/libs/grpc/third_party/upb/ya.make

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
LIBRARY()
44

5+
VERSION(1.54.2)
6+
57
LICENSE(
68
BSD-3-Clause AND
79
MIT

‎contrib/libs/hyperscan/runtime_avx2/ya.make

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ LICENSE(BSD-3-Clause)
66

77
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
88

9+
VERSION(5.4.2)
10+
911
ADDINCL(
1012
contrib/libs/hyperscan
1113
contrib/libs/hyperscan/src

‎contrib/libs/hyperscan/runtime_avx512/ya.make

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ LICENSE(BSD-3-Clause)
66

77
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
88

9+
VERSION(5.4.2)
10+
911
ADDINCL(
1012
contrib/libs/hyperscan
1113
contrib/libs/hyperscan/src

‎contrib/libs/hyperscan/runtime_core2/ya.make

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ LICENSE(BSD-3-Clause)
66

77
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
88

9+
VERSION(5.4.2)
10+
911
ADDINCL(
1012
contrib/libs/hyperscan
1113
contrib/libs/hyperscan/src

‎contrib/libs/hyperscan/runtime_corei7/ya.make

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ LICENSE(BSD-3-Clause)
66

77
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
88

9+
VERSION(5.4.2)
10+
911
ADDINCL(
1012
contrib/libs/hyperscan
1113
contrib/libs/hyperscan/src

‎contrib/libs/lcms2/utils/jpgicc/ya.make

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ LICENSE(
99

1010
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
1111

12+
VERSION(2.16)
13+
1214
PEERDIR(
1315
contrib/libs/lcms2
1416
contrib/libs/libjpeg-turbo

‎contrib/libs/lcms2/utils/linkicc/ya.make

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ LICENSE(MIT)
66

77
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
88

9+
VERSION(2.16)
10+
911
PEERDIR(
1012
contrib/libs/lcms2
1113
)

‎contrib/libs/lcms2/utils/psicc/ya.make

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ LICENSE(MIT)
66

77
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
88

9+
VERSION(2.16)
10+
911
PEERDIR(
1012
contrib/libs/lcms2
1113
)

‎contrib/libs/lcms2/utils/tificc/ya.make

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ LICENSE(MIT)
66

77
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
88

9+
VERSION(2.16)
10+
911
PEERDIR(
1012
contrib/libs/lcms2
1113
contrib/libs/libtiff

‎contrib/libs/lcms2/utils/transicc/ya.make

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ LICENSE(MIT)
66

77
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
88

9+
VERSION(2.16)
10+
911
PEERDIR(
1012
contrib/libs/lcms2
1113
)

‎contrib/libs/libaio/dynamic/ya.make

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ LICENSE(
1010

1111
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
1212

13+
VERSION(0.3.113)
14+
1315
DYNAMIC_LIBRARY_FROM(contrib/libs/libaio/static)
1416

1517
LICENSE_RESTRICTION_EXCEPTIONS(contrib/libs/libaio/static)

0 commit comments

Comments
 (0)