Merge pull request #8068 from ydb-platform/mergelibs-240820-2236

Library import 240820-2236
ydb-platform · Aug 21, 2024 · 7f8f368 · 7f8f368
2 parents ed392b6 + c17e4f1
commit 7f8f368
Show file tree

Hide file tree

Showing 108 changed files with 278 additions and 20 deletions.
diff --git a/build/export_generators/cmake/dir_cmake_lists.jinja b/build/export_generators/cmake/dir_cmake_lists.jinja
@@ -1,5 +1,5 @@
-{%- include '[generator]/disclaimer.jinja' %}
-{% include 'prologue.cmake' ignore missing -%}
+{%- include '[generator]/disclaimer.jinja' -%}
+{%- include 'prologue.cmake' ignore missing -%}
 
 {%- include "[generator]/dir_packages.jinja" -%}
 {%- include "[generator]/dir_tools.jinja" -%}

diff --git a/build/export_generators/cmake/dir_includes.jinja b/build/export_generators/cmake/dir_includes.jinja
@@ -1,11 +1,11 @@
-{%- if dir_includes is defined %}
-{%     for dir_include in dir_includes -%}
+{%- if dir_includes|length -%}
+{%-    for dir_include in dir_includes %}
 include({{ dir_include }})
-{%     endfor -%}
-{%- endif -%}
+{%     endfor %}
+{%  endif -%}
 
-{%- if subdirs|length %}
-{%      for subdir in subdirs -%}
+{%- if subdirs|length -%}
+{%-     for subdir in subdirs %}
 add_subdirectory({{ subdir }})
-{%      endfor -%}
-{%- endif -%}
+{%-     endfor %}
+{%  endif -%}
diff --git a/build/export_generators/cmake/dir_macroses.jinja b/build/export_generators/cmake/dir_macroses.jinja
@@ -1,4 +1,4 @@
-{%- if dir_macroses is defined -%}
+{%- if dir_macroses|length -%}
 {%-     for dir_macros in dir_macroses -%}
 {%-         if dir_macros.macro == "set_vars" -%}
 {%-             for set_var in dir_macros.args %}

diff --git a/build/export_generators/cmake/dir_packages.jinja b/build/export_generators/cmake/dir_packages.jinja
@@ -15,7 +15,7 @@
 {%-         endif -%}
 {%-     endif -%}
 {%-     if packages|length -%}
-{%-         for package in packages -%}
+{%-         for package in packages %}
 find_package({{ package.name }} REQUIRED
 {%-             if package.components|length %} COMPONENTS
 {%-                 for component in package.components %}
@@ -30,7 +30,7 @@ find_package({{ package.name }} REQUIRED
 {%- if target is defined -%}
 {{ RenderPackages(target) }}
 {%- endif -%}
-{%- if extra_targets is defined -%}
+{%- if extra_targets|length -%}
 {%-     for extra_target in extra_targets -%}
 {{ RenderPackages(extra_target) }}
 {%-     endfor -%}

diff --git a/build/export_generators/cmake/dir_targets.jinja b/build/export_generators/cmake/dir_targets.jinja
@@ -72,7 +72,7 @@
 {%-     set current_target = target -%}
 {%-     include '[generator]/target_cmake_lists.jinja' -%}
 {%- endif -%}
-{%- if extra_targets is defined -%}
+{%- if extra_targets|length -%}
 {%-     for current_target in extra_targets -%}
 {%-         include '[generator]/target_cmake_lists.jinja' -%}
 {%-     endfor -%}

diff --git a/build/export_generators/cmake/dir_tools.jinja b/build/export_generators/cmake/dir_tools.jinja
@@ -1,4 +1,4 @@
-{%- if tools is defined -%}
+{%- if tools|length -%}
 {%-     for tool in tools -%}
 {%-         set path_and_name = rsplit(tool, "/", 2) -%}
 {%-         set toolPath = path_and_name[0] -%}

diff --git a/build/export_generators/cmake/disclaimer.jinja b/build/export_generators/cmake/disclaimer.jinja
@@ -1,4 +1,4 @@
-# This file was generated by the YaTool build system (https://github.com/yandex/yatool), 
+# This file was generated by the YaTool build system (https://github.com/yandex/yatool),
 # from a source YaTool build configuration provided in ya.make files.
 #
 # If the repository supports both CMake and ya build configurations, please modify both of them.

diff --git a/build/export_generators/cmake/root_cmake_lists.jinja b/build/export_generators/cmake/root_cmake_lists.jinja
@@ -1,4 +1,4 @@
-{% include '[generator]/disclaimer.jinja' %}
+{%- include '[generator]/disclaimer.jinja' -%}
 
 cmake_minimum_required(VERSION 3.15)
 if (POLICY CMP0132)

diff --git a/build/mapping.conf.json b/build/mapping.conf.json
@@ -102,6 +102,9 @@
         "5458408674": "https://devtools-registry.s3.yandex.net/5458408674",
         "5463300202": "https://devtools-registry.s3.yandex.net/5463300202",
         "5465946272": "https://devtools-registry.s3.yandex.net/5465946272",
+        "5938874764": "https://devtools-registry.s3.yandex.net/5938874764",
+        "5938174048": "https://devtools-registry.s3.yandex.net/5938174048",
+        "2441712958": "https://devtools-registry.s3.yandex.net/2441712958",
         "1966560555": "https://devtools-registry.s3.yandex.net/1966560555",
         "309054781": "https://devtools-registry.s3.yandex.net/309054781",
         "243881345": "https://devtools-registry.s3.yandex.net/243881345",
@@ -669,26 +672,31 @@
         "5777101734": "https://devtools-registry.s3.yandex.net/5777101734",
         "5909068951": "https://devtools-registry.s3.yandex.net/5909068951",
         "6043999575": "https://devtools-registry.s3.yandex.net/6043999575",
+        "6431453246": "https://devtools-registry.s3.yandex.net/6431453246",
         "6431665742": "https://devtools-registry.s3.yandex.net/6431665742",
         "5776379446": "https://devtools-registry.s3.yandex.net/5776379446",
         "5777100597": "https://devtools-registry.s3.yandex.net/5777100597",
         "5909067709": "https://devtools-registry.s3.yandex.net/5909067709",
         "6043999100": "https://devtools-registry.s3.yandex.net/6043999100",
+        "6431452613": "https://devtools-registry.s3.yandex.net/6431452613",
         "6431664742": "https://devtools-registry.s3.yandex.net/6431664742",
         "5776375952": "https://devtools-registry.s3.yandex.net/5776375952",
         "5777098178": "https://devtools-registry.s3.yandex.net/5777098178",
         "5909065014": "https://devtools-registry.s3.yandex.net/5909065014",
         "6043997813": "https://devtools-registry.s3.yandex.net/6043997813",
+        "6431451381": "https://devtools-registry.s3.yandex.net/6431451381",
         "6431662248": "https://devtools-registry.s3.yandex.net/6431662248",
         "5776374505": "https://devtools-registry.s3.yandex.net/5776374505",
         "5777096988": "https://devtools-registry.s3.yandex.net/5777096988",
         "5909063641": "https://devtools-registry.s3.yandex.net/5909063641",
         "6043997124": "https://devtools-registry.s3.yandex.net/6043997124",
+        "6431450445": "https://devtools-registry.s3.yandex.net/6431450445",
         "6431661101": "https://devtools-registry.s3.yandex.net/6431661101",
         "5776377955": "https://devtools-registry.s3.yandex.net/5776377955",
         "5777099502": "https://devtools-registry.s3.yandex.net/5777099502",
         "5909066324": "https://devtools-registry.s3.yandex.net/5909066324",
         "6043998448": "https://devtools-registry.s3.yandex.net/6043998448",
+        "6431452096": "https://devtools-registry.s3.yandex.net/6431452096",
         "6431663364": "https://devtools-registry.s3.yandex.net/6431663364",
         "6391354461": "https://devtools-registry.s3.yandex.net/6391354461",
         "3167009386": "https://devtools-registry.s3.yandex.net/3167009386",
@@ -708,6 +716,7 @@
         "6561765464": "https://devtools-registry.s3.yandex.net/6561765464",
         "6184289846": "https://devtools-registry.s3.yandex.net/6184289846",
         "6561764909": "https://devtools-registry.s3.yandex.net/6561764909",
+        "6490009481": "https://devtools-registry.s3.yandex.net/6490009481",
         "5054517618": "https://devtools-registry.s3.yandex.net/5054517618",
         "5054512910": "https://devtools-registry.s3.yandex.net/5054512910",
         "5054518131": "https://devtools-registry.s3.yandex.net/5054518131",
@@ -736,6 +745,9 @@
         "5664939545": "https://devtools-registry.s3.yandex.net/5664939545",
         "5678781047": "https://devtools-registry.s3.yandex.net/5678781047",
         "5749208149": "https://devtools-registry.s3.yandex.net/5749208149",
+        "6662972834": "https://devtools-registry.s3.yandex.net/6662972834",
+        "6662965433": "https://devtools-registry.s3.yandex.net/6662965433",
+        "6662980150": "https://devtools-registry.s3.yandex.net/6662980150",
         "5476908047": "https://devtools-registry.s3.yandex.net/5476908047",
         "5509380757": "https://devtools-registry.s3.yandex.net/5509380757",
         "5550834592": "https://devtools-registry.s3.yandex.net/5550834592",
@@ -882,6 +894,9 @@
         "5458408674": "OTHER_RESOURCE-none-none-lld.tgz",
         "5463300202": "OTHER_RESOURCE-none-none-lld.tgz",
         "5465946272": "OTHER_RESOURCE-none-none-lld.tgz",
+        "5938874764": "OTHER_RESOURCE-none-none-plantuml-asl-1.2024.3-sources.jar",
+        "5938174048": "OTHER_RESOURCE-none-none-plantuml-asl-1.2024.3.jar",
+        "2441712958": "OTHER_RESOURCE-none-none-resource.tar.gz",
         "1966560555": "Ubuntu 14 x86-64 native SDK (patched, v3)",
         "309054781": "Ubuntu 16 x86-64 -> Ubuntu 16 aarch64 cross SDK",
         "243881345": "Ubuntu 16 x86_64 native SDK",
@@ -1449,26 +1464,31 @@
         "5777101734": "none-none-none-result_resources/jdk-darwin-aarch64.yandex.tgz",
         "5909068951": "none-none-none-result_resources/jdk-darwin-aarch64.yandex.tgz",
         "6043999575": "none-none-none-result_resources/jdk-darwin-aarch64.yandex.tgz",
+        "6431453246": "none-none-none-result_resources/jdk-darwin-aarch64.yandex.tgz",
         "6431665742": "none-none-none-result_resources/jdk-darwin-aarch64.yandex.tgz",
         "5776379446": "none-none-none-result_resources/jdk-darwin-x86_64.yandex.tgz",
         "5777100597": "none-none-none-result_resources/jdk-darwin-x86_64.yandex.tgz",
         "5909067709": "none-none-none-result_resources/jdk-darwin-x86_64.yandex.tgz",
         "6043999100": "none-none-none-result_resources/jdk-darwin-x86_64.yandex.tgz",
+        "6431452613": "none-none-none-result_resources/jdk-darwin-x86_64.yandex.tgz",
         "6431664742": "none-none-none-result_resources/jdk-darwin-x86_64.yandex.tgz",
         "5776375952": "none-none-none-result_resources/jdk-linux-aarch64.yandex.tgz",
         "5777098178": "none-none-none-result_resources/jdk-linux-aarch64.yandex.tgz",
         "5909065014": "none-none-none-result_resources/jdk-linux-aarch64.yandex.tgz",
         "6043997813": "none-none-none-result_resources/jdk-linux-aarch64.yandex.tgz",
+        "6431451381": "none-none-none-result_resources/jdk-linux-aarch64.yandex.tgz",
         "6431662248": "none-none-none-result_resources/jdk-linux-aarch64.yandex.tgz",
         "5776374505": "none-none-none-result_resources/jdk-linux-x86_64.yandex.tgz",
         "5777096988": "none-none-none-result_resources/jdk-linux-x86_64.yandex.tgz",
         "5909063641": "none-none-none-result_resources/jdk-linux-x86_64.yandex.tgz",
         "6043997124": "none-none-none-result_resources/jdk-linux-x86_64.yandex.tgz",
+        "6431450445": "none-none-none-result_resources/jdk-linux-x86_64.yandex.tgz",
         "6431661101": "none-none-none-result_resources/jdk-linux-x86_64.yandex.tgz",
         "5776377955": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz",
         "5777099502": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz",
         "5909066324": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz",
         "6043998448": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz",
+        "6431452096": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz",
         "6431663364": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz",
         "6391354461": "none-none-none-result_resources/protoc-linux-x86_64.tgz",
         "3167009386": "openjdk 11.0.15 vanilla for darwin",
@@ -1488,6 +1508,7 @@
         "6561765464": "tools/flake8_linter/bin/flake8_linter for linux",
         "6184289846": "tools/flake8_linter/bin/flake8_linter for linux-aarch64",
         "6561764909": "tools/flake8_linter/bin/flake8_linter for linux-aarch64",
+        "6490009481": "uberjar for all jdk11",
         "5054517618": "ya-tc for darwin",
         "5054512910": "ya-tc for darwin-arm64",
         "5054518131": "ya-tc for linux",
@@ -1516,6 +1537,9 @@
         "5664939545": "yexport for linux",
         "5678781047": "yexport for linux",
         "5749208149": "yexport for linux",
+        "6662972834": "yfm-docs for darwin",
+        "6662965433": "yfm-docs for linux",
+        "6662980150": "yfm-docs for win32",
         "5476908047": "ymake for darwin",
         "5509380757": "ymake for darwin",
         "5550834592": "ymake for darwin",

diff --git a/build/platform/python/ymake_python3/ya.make b/build/platform/python/ymake_python3/ya.make
@@ -1,7 +1,7 @@
 RESOURCES_LIBRARY()
 
 TOOLCHAIN(python3)
-VERSION(3.12.3)
+VERSION(3.12.5)
 
 NO_YMAKE_PYTHON3()
 SET(RESOURCES_LIBRARY_LINK $TOUCH_UNIT)

diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/ya.make b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/ya.make
@@ -10,6 +10,8 @@ LICENSE(
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
+VERSION(1.11.37)
+
 PEERDIR(
     contrib/libs/curl
     contrib/libs/openssl

diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/ya.make b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/ya.make
@@ -6,6 +6,8 @@ LICENSE(Apache-2.0)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
+VERSION(1.11.37)
+
 PEERDIR(
     contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core
     contrib/restricted/aws/aws-c-auth

diff --git a/contrib/libs/curl/bin/ya.make b/contrib/libs/curl/bin/ya.make
@@ -11,6 +11,8 @@ LICENSE(
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
+VERSION(8.5.0)
+
 PEERDIR(
     contrib/libs/c-ares
     contrib/libs/curl

diff --git a/contrib/libs/flatbuffers/flatc/ya.make b/contrib/libs/flatbuffers/flatc/ya.make
@@ -12,6 +12,8 @@ INDUCED_DEPS(
     ${ARCADIA_ROOT}/contrib/libs/flatbuffers/include/flatbuffers/flatbuffers_iter.h
 )
 
+VERSION(24.3.25)
+
 PEERDIR(
     contrib/restricted/abseil-cpp/absl/base
 )

diff --git a/contrib/libs/grpc/grpc++_reflection/ya.make b/contrib/libs/grpc/grpc++_reflection/ya.make
@@ -4,6 +4,8 @@ LIBRARY()
 
 WITHOUT_LICENSE_TEXTS()
 
+VERSION(1.54.2)
+
 LICENSE(Apache-2.0)
 
 PEERDIR(

diff --git a/contrib/libs/grpc/grpcpp_channelz/ya.make b/contrib/libs/grpc/grpcpp_channelz/ya.make
@@ -4,6 +4,8 @@ LIBRARY()
 
 WITHOUT_LICENSE_TEXTS()
 
+VERSION(1.54.2)
+
 LICENSE(Apache-2.0)
 
 PEERDIR(

diff --git a/contrib/libs/grpc/src/compiler/grpc_cpp_plugin/ya.make b/contrib/libs/grpc/src/compiler/grpc_cpp_plugin/ya.make
@@ -4,6 +4,8 @@ PROGRAM()
 
 WITHOUT_LICENSE_TEXTS()
 
+VERSION(1.54.2)
+
 LICENSE(Apache-2.0)
 
 PEERDIR(

diff --git a/contrib/libs/grpc/src/compiler/grpc_plugin_support/ya.make b/contrib/libs/grpc/src/compiler/grpc_plugin_support/ya.make
@@ -4,6 +4,8 @@ LIBRARY()
 
 WITHOUT_LICENSE_TEXTS()
 
+VERSION(1.54.2)
+
 LICENSE(Apache-2.0)
 
 PEERDIR(

diff --git a/contrib/libs/grpc/src/compiler/grpc_python_plugin/ya.make b/contrib/libs/grpc/src/compiler/grpc_python_plugin/ya.make
@@ -4,6 +4,8 @@ PROGRAM()
 
 WITHOUT_LICENSE_TEXTS()
 
+VERSION(1.54.2)
+
 LICENSE(Apache-2.0)
 
 PEERDIR(

diff --git a/contrib/libs/grpc/third_party/address_sorting/ya.make b/contrib/libs/grpc/third_party/address_sorting/ya.make
@@ -2,6 +2,8 @@
 
 LIBRARY()
 
+VERSION(1.54.2)
+
 LICENSE(BSD-3-Clause)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)

diff --git a/contrib/libs/grpc/third_party/upb/ya.make b/contrib/libs/grpc/third_party/upb/ya.make
@@ -2,6 +2,8 @@
 
 LIBRARY()
 
+VERSION(1.54.2)
+
 LICENSE(
     BSD-3-Clause AND
     MIT

diff --git a/contrib/libs/hyperscan/runtime_avx2/ya.make b/contrib/libs/hyperscan/runtime_avx2/ya.make
@@ -6,6 +6,8 @@ LICENSE(BSD-3-Clause)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
+VERSION(5.4.2)
+
 ADDINCL(
     contrib/libs/hyperscan
     contrib/libs/hyperscan/src

diff --git a/contrib/libs/hyperscan/runtime_avx512/ya.make b/contrib/libs/hyperscan/runtime_avx512/ya.make
@@ -6,6 +6,8 @@ LICENSE(BSD-3-Clause)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
+VERSION(5.4.2)
+
 ADDINCL(
     contrib/libs/hyperscan
     contrib/libs/hyperscan/src

diff --git a/contrib/libs/hyperscan/runtime_core2/ya.make b/contrib/libs/hyperscan/runtime_core2/ya.make
@@ -6,6 +6,8 @@ LICENSE(BSD-3-Clause)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
+VERSION(5.4.2)
+
 ADDINCL(
     contrib/libs/hyperscan
     contrib/libs/hyperscan/src

diff --git a/contrib/libs/hyperscan/runtime_corei7/ya.make b/contrib/libs/hyperscan/runtime_corei7/ya.make
@@ -6,6 +6,8 @@ LICENSE(BSD-3-Clause)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
+VERSION(5.4.2)
+
 ADDINCL(
     contrib/libs/hyperscan
     contrib/libs/hyperscan/src

diff --git a/contrib/libs/lcms2/utils/jpgicc/ya.make b/contrib/libs/lcms2/utils/jpgicc/ya.make
@@ -9,6 +9,8 @@ LICENSE(
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
+VERSION(2.16)
+
 PEERDIR(
     contrib/libs/lcms2
     contrib/libs/libjpeg-turbo

diff --git a/contrib/libs/lcms2/utils/linkicc/ya.make b/contrib/libs/lcms2/utils/linkicc/ya.make
@@ -6,6 +6,8 @@ LICENSE(MIT)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
+VERSION(2.16)
+
 PEERDIR(
     contrib/libs/lcms2
 )

diff --git a/contrib/libs/lcms2/utils/psicc/ya.make b/contrib/libs/lcms2/utils/psicc/ya.make
@@ -6,6 +6,8 @@ LICENSE(MIT)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
+VERSION(2.16)
+
 PEERDIR(
     contrib/libs/lcms2
 )

diff --git a/contrib/libs/lcms2/utils/tificc/ya.make b/contrib/libs/lcms2/utils/tificc/ya.make
@@ -6,6 +6,8 @@ LICENSE(MIT)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
+VERSION(2.16)
+
 PEERDIR(
     contrib/libs/lcms2
     contrib/libs/libtiff

diff --git a/contrib/libs/lcms2/utils/transicc/ya.make b/contrib/libs/lcms2/utils/transicc/ya.make
@@ -6,6 +6,8 @@ LICENSE(MIT)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
+VERSION(2.16)
+
 PEERDIR(
     contrib/libs/lcms2
 )

diff --git a/contrib/libs/libaio/dynamic/ya.make b/contrib/libs/libaio/dynamic/ya.make
@@ -10,6 +10,8 @@ LICENSE(
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
+VERSION(0.3.113)
+
 DYNAMIC_LIBRARY_FROM(contrib/libs/libaio/static)
 
 LICENSE_RESTRICTION_EXCEPTIONS(contrib/libs/libaio/static)