Merge pull request #12088 from ydb-platform/mergelibs-241128-1021

Library import 241128-1021

Author: alexv-smirnov

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

@@ -21,20 +21,14 @@ subprojects {
 {%- set with_kotlin = target.with_kotlin -%}
 {%- set kotlin_version = target.kotlin_version -%}
 {%- set hasJunit5Test = extra_targets|selectattr('junit5_test') -%}
-{%- set errorprone_plugin_version = "4.0.0" -%}
 
 {%- if not target.required_jdk -%}
 {%-     set has_required_jdk = false -%}
 {#-     If no required JDK, set default JDK for Kotlin parts -#}
 {%-     set required_jdk = '17' -%}
 {%- else -%}
 {%-     set has_required_jdk = true -%}
-{#-     Use JDK 23 instead 22 -#}
-{%-     if target.required_jdk == '22' -%}
-{%-         set required_jdk = '23' -%}
-{%-     else -%}
-{%-         set required_jdk = target.required_jdk -%}
-{%-     endif -%}
+{%-     set required_jdk = target.required_jdk -%}
 {%- endif %}
 
 plugins {
@@ -64,8 +58,11 @@ plugins {
 {%- endif -%}
 
 {#- errorprone plugin configuration -#}
-{%- if target.consumer|selectattr('jar', 'startsWith', 'contrib/java/com/google/errorprone/error_prone_annotations')|length %}
+{%- if errorprone -%}
+{%-     set errorprone_plugin_version = "4.0.0" -%}
+{%-     if target.consumer|selectattr('jar', 'startsWith', 'contrib/java/com/google/errorprone/error_prone_annotations')|length %}
     id("net.ltgt.errorprone") version "{{ errorprone_plugin_version }}"
+{%-     endif -%}
 {%- endif -%}
 
 {#- lombok plugin configuration -#}
@@ -310,10 +307,12 @@ sourceSets {
 
 dependencies {
 {%- for library in target.consumer if library.classpath -%}
-{%-     if library.prebuilt and (library.type != "contrib" or build_contribs) and ("contrib/java/com/google/errorprone/error_prone_annotations" in library.jar) -%}
-{%-         set errorprone_version = library.jar|replace("contrib/java/com/google/errorprone/error_prone_annotations/", "") -%}
-{%-         set errorprone_parts = split(errorprone_version, '/', 2) %}
+{%-     if errorprone -%}
+{%-         if library.prebuilt and (library.type != "contrib" or build_contribs) and ("contrib/java/com/google/errorprone/error_prone_annotations" in library.jar) -%}
+{%-             set errorprone_version = library.jar|replace("contrib/java/com/google/errorprone/error_prone_annotations/", "") -%}
+{%-             set errorprone_parts = split(errorprone_version, '/', 2) %}
     errorprone("com.google.errorprone:error_prone_core:{{ errorprone_parts[0] }}")
+{%-         endif -%}
 {%-     endif -%}
 
 {%-     if library.prebuilt and library.jar and (library.type != "contrib" or build_contribs) %}

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

@@ -1,11 +1,12 @@
 rootProject.name = "{{ project_name }}"
 
-{%  if subdirs|length > 1 -%}
-{%-     for subdir in subdirs -%}
+{%  for subdir in subdirs -%}
+{%-     set arcadia_subdir = arcadia_root + "/" + subdir -%}
+{%-     if arcadia_subdir != project_root -%}
 {%-         set classname = subdir | replace("/", ":") %}
 include(":{{ classname }}")
-project(":{{ classname }}").projectDir = file("{{ arcadia_root }}/{{ subdir }}")
-{%      endfor -%}
-{%- endif -%}
+project(":{{ classname }}").projectDir = file("{{ arcadia_subdir }}")
+{%      endif -%}
+{%- endfor -%}
 
 {%- include "[generator]/debug.jinja" ignore missing -%}

build/external_resources/yexport/public.resources.json

@@ -1,13 +1,13 @@
 {
     "by_platform": {
         "darwin": {
-            "uri": "sbr:7370212609"
+            "uri": "sbr:7539368752"
         },
         "darwin-arm64": {
-            "uri": "sbr:7370211678"
+            "uri": "sbr:7539368187"
         },
         "linux": {
-            "uri": "sbr:7370210775"
+            "uri": "sbr:7539367458"
         }
     }
 }

build/external_resources/yexport/resources.json

@@ -1,13 +1,13 @@
 {
     "by_platform": {
         "darwin": {
-            "uri": "sbr:7370190051"
+            "uri": "sbr:7539341499"
         },
         "darwin-arm64": {
-            "uri": "sbr:7370188821"
+            "uri": "sbr:7539340652"
         },
         "linux": {
-            "uri": "sbr:7370187741"
+            "uri": "sbr:7539339643"
         }
     }
 }

build/mapping.conf.json

@@ -520,6 +520,7 @@
         "6913307396": "https://devtools-registry.s3.yandex.net/6913307396",
         "7196092605": "https://devtools-registry.s3.yandex.net/7196092605",
         "7370212609": "https://devtools-registry.s3.yandex.net/7370212609",
+        "7539368752": "https://devtools-registry.s3.yandex.net/7539368752",
         "5811823398": "https://devtools-registry.s3.yandex.net/5811823398",
         "5840611310": "https://devtools-registry.s3.yandex.net/5840611310",
         "5860185593": "https://devtools-registry.s3.yandex.net/5860185593",
@@ -543,6 +544,7 @@
         "6913305359": "https://devtools-registry.s3.yandex.net/6913305359",
         "7196092155": "https://devtools-registry.s3.yandex.net/7196092155",
         "7370211678": "https://devtools-registry.s3.yandex.net/7370211678",
+        "7539368187": "https://devtools-registry.s3.yandex.net/7539368187",
         "5811822876": "https://devtools-registry.s3.yandex.net/5811822876",
         "5840610640": "https://devtools-registry.s3.yandex.net/5840610640",
         "5860184285": "https://devtools-registry.s3.yandex.net/5860184285",
@@ -566,6 +568,7 @@
         "6913303010": "https://devtools-registry.s3.yandex.net/6913303010",
         "7196091589": "https://devtools-registry.s3.yandex.net/7196091589",
         "7370210775": "https://devtools-registry.s3.yandex.net/7370210775",
+        "7539367458": "https://devtools-registry.s3.yandex.net/7539367458",
         "5766172292": "https://devtools-registry.s3.yandex.net/5766172292",
         "5805431504": "https://devtools-registry.s3.yandex.net/5805431504",
         "5829027626": "https://devtools-registry.s3.yandex.net/5829027626",
@@ -1581,6 +1584,7 @@
         "6913307396": "devtools/yexport/bin/yexport for darwin",
         "7196092605": "devtools/yexport/bin/yexport for darwin",
         "7370212609": "devtools/yexport/bin/yexport for darwin",
+        "7539368752": "devtools/yexport/bin/yexport for darwin",
         "5811823398": "devtools/yexport/bin/yexport for darwin-arm64",
         "5840611310": "devtools/yexport/bin/yexport for darwin-arm64",
         "5860185593": "devtools/yexport/bin/yexport for darwin-arm64",
@@ -1604,6 +1608,7 @@
         "6913305359": "devtools/yexport/bin/yexport for darwin-arm64",
         "7196092155": "devtools/yexport/bin/yexport for darwin-arm64",
         "7370211678": "devtools/yexport/bin/yexport for darwin-arm64",
+        "7539368187": "devtools/yexport/bin/yexport for darwin-arm64",
         "5811822876": "devtools/yexport/bin/yexport for linux",
         "5840610640": "devtools/yexport/bin/yexport for linux",
         "5860184285": "devtools/yexport/bin/yexport for linux",
@@ -1627,6 +1632,7 @@
         "6913303010": "devtools/yexport/bin/yexport for linux",
         "7196091589": "devtools/yexport/bin/yexport for linux",
         "7370210775": "devtools/yexport/bin/yexport for linux",
+        "7539367458": "devtools/yexport/bin/yexport for linux",
         "5766172292": "devtools/ymake/bin/ymake for darwin",
         "5805431504": "devtools/ymake/bin/ymake for darwin",
         "5829027626": "devtools/ymake/bin/ymake for darwin",

build/sysincl/nvidia-thrust-to-nothing.yml

@@ -1,8 +1,12 @@
 - includes:
+  - thrust/count.h
   - thrust/device_ptr.h
+  - thrust/device_vector.h
+  - thrust/functional.h
   - thrust/execution_policy.h
   - thrust/iterator/iterator_facade.h
   - thrust/iterator/iterator_traits.h
+  - thrust/iterator/transform_iterator.h
   - thrust/scan.h
   - thrust/sort.h
   - thrust/system/cuda/execution_policy.h

build/ymake_conf.py

@@ -786,11 +786,6 @@ def print_presets(self):
         else:
             print('@import "${CONF_ROOT}/conf/coverage_selective_instrumentation.conf"')
 
-        if presets:
-            print('# Variables set from command line by -D options')
-            for key in sorted(presets):
-                emit(key, opts().presets[key])
-
     @staticmethod
     def _print_conf_content(path):
         with open(path, 'r') as fin:
@@ -802,6 +797,13 @@ def print_core_conf(self):
     def print_settings(self):
         pass
 
+    def print_epilogue(self):
+        presets = opts().presets
+        if presets:
+            print('# Variables set from command line by -D options')
+            for key in sorted(presets):
+                emit(key, opts().presets[key])
+
 
 class System(object):
     def __init__(self, platform):
@@ -2644,6 +2646,7 @@ def main():
     build.print_build()
 
     custom_conf.print_epilogue()
+    ymake.print_epilogue()
 
 
 if __name__ == '__main__':

contrib/libs/cxxsupp/builtins/.yandex_meta/build.ym

@@ -8,6 +8,7 @@ https://github.com/llvm/llvm-project/releases/download/llvmorg-{{self.version().
 
 {% block patch_source %}
 (
+rm CMakeLists.txt
 cd lib/builtins
 rm CMakeLists.txt
 rm aarch64/lse.S