Skip to content

Commit 2f89980

Browse files
alexv-smirnovalexv-smirnov
authored
Merge pull request #12088 from ydb-platform/mergelibs-241128-1021
Library import 241128-1021
2 parents 6067a04 + 2b93e09 commit 2f89980

File tree

2,216 files changed

+32422
-37622
lines changed

Some content is hidden

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

2,216 files changed

+32422
-37622
lines changed

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

+10-11
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,14 @@ subprojects {
2121
{%- set with_kotlin = target.with_kotlin -%}
2222
{%- set kotlin_version = target.kotlin_version -%}
2323
{%- set hasJunit5Test = extra_targets|selectattr('junit5_test') -%}
24-
{%- set errorprone_plugin_version = "4.0.0" -%}
2524

2625
{%- if not target.required_jdk -%}
2726
{%- set has_required_jdk = false -%}
2827
{#- If no required JDK, set default JDK for Kotlin parts -#}
2928
{%- set required_jdk = '17' -%}
3029
{%- else -%}
3130
{%- set has_required_jdk = true -%}
32-
{#- Use JDK 23 instead 22 -#}
33-
{%- if target.required_jdk == '22' -%}
34-
{%- set required_jdk = '23' -%}
35-
{%- else -%}
36-
{%- set required_jdk = target.required_jdk -%}
37-
{%- endif -%}
31+
{%- set required_jdk = target.required_jdk -%}
3832
{%- endif %}
3933

4034
plugins {
@@ -64,8 +58,11 @@ plugins {
6458
{%- endif -%}
6559

6660
{#- errorprone plugin configuration -#}
67-
{%- if target.consumer|selectattr('jar', 'startsWith', 'contrib/java/com/google/errorprone/error_prone_annotations')|length %}
61+
{%- if errorprone -%}
62+
{%- set errorprone_plugin_version = "4.0.0" -%}
63+
{%- if target.consumer|selectattr('jar', 'startsWith', 'contrib/java/com/google/errorprone/error_prone_annotations')|length %}
6864
id("net.ltgt.errorprone") version "{{ errorprone_plugin_version }}"
65+
{%- endif -%}
6966
{%- endif -%}
7067

7168
{#- lombok plugin configuration -#}
@@ -310,10 +307,12 @@ sourceSets {
310307

311308
dependencies {
312309
{%- for library in target.consumer if library.classpath -%}
313-
{%- if library.prebuilt and (library.type != "contrib" or build_contribs) and ("contrib/java/com/google/errorprone/error_prone_annotations" in library.jar) -%}
314-
{%- set errorprone_version = library.jar|replace("contrib/java/com/google/errorprone/error_prone_annotations/", "") -%}
315-
{%- set errorprone_parts = split(errorprone_version, '/', 2) %}
310+
{%- if errorprone -%}
311+
{%- if library.prebuilt and (library.type != "contrib" or build_contribs) and ("contrib/java/com/google/errorprone/error_prone_annotations" in library.jar) -%}
312+
{%- set errorprone_version = library.jar|replace("contrib/java/com/google/errorprone/error_prone_annotations/", "") -%}
313+
{%- set errorprone_parts = split(errorprone_version, '/', 2) %}
316314
errorprone("com.google.errorprone:error_prone_core:{{ errorprone_parts[0] }}")
315+
{%- endif -%}
317316
{%- endif -%}
318317

319318
{%- if library.prebuilt and library.jar and (library.type != "contrib" or build_contribs) %}

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

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
rootProject.name = "{{ project_name }}"
22

3-
{% if subdirs|length > 1 -%}
4-
{%- for subdir in subdirs -%}
3+
{% for subdir in subdirs -%}
4+
{%- set arcadia_subdir = arcadia_root + "/" + subdir -%}
5+
{%- if arcadia_subdir != project_root -%}
56
{%- set classname = subdir | replace("/", ":") %}
67
include(":{{ classname }}")
7-
project(":{{ classname }}").projectDir = file("{{ arcadia_root }}/{{ subdir }}")
8-
{% endfor -%}
9-
{%- endif -%}
8+
project(":{{ classname }}").projectDir = file("{{ arcadia_subdir }}")
9+
{% endif -%}
10+
{%- endfor -%}
1011

1112
{%- include "[generator]/debug.jinja" ignore missing -%}

‎build/external_resources/yexport/public.resources.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"by_platform": {
33
"darwin": {
4-
"uri": "sbr:7370212609"
4+
"uri": "sbr:7539368752"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:7370211678"
7+
"uri": "sbr:7539368187"
88
},
99
"linux": {
10-
"uri": "sbr:7370210775"
10+
"uri": "sbr:7539367458"
1111
}
1212
}
1313
}

‎build/external_resources/yexport/resources.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"by_platform": {
33
"darwin": {
4-
"uri": "sbr:7370190051"
4+
"uri": "sbr:7539341499"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:7370188821"
7+
"uri": "sbr:7539340652"
88
},
99
"linux": {
10-
"uri": "sbr:7370187741"
10+
"uri": "sbr:7539339643"
1111
}
1212
}
1313
}

‎build/mapping.conf.json

+6
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,7 @@
520520
"6913307396": "https://devtools-registry.s3.yandex.net/6913307396",
521521
"7196092605": "https://devtools-registry.s3.yandex.net/7196092605",
522522
"7370212609": "https://devtools-registry.s3.yandex.net/7370212609",
523+
"7539368752": "https://devtools-registry.s3.yandex.net/7539368752",
523524
"5811823398": "https://devtools-registry.s3.yandex.net/5811823398",
524525
"5840611310": "https://devtools-registry.s3.yandex.net/5840611310",
525526
"5860185593": "https://devtools-registry.s3.yandex.net/5860185593",
@@ -543,6 +544,7 @@
543544
"6913305359": "https://devtools-registry.s3.yandex.net/6913305359",
544545
"7196092155": "https://devtools-registry.s3.yandex.net/7196092155",
545546
"7370211678": "https://devtools-registry.s3.yandex.net/7370211678",
547+
"7539368187": "https://devtools-registry.s3.yandex.net/7539368187",
546548
"5811822876": "https://devtools-registry.s3.yandex.net/5811822876",
547549
"5840610640": "https://devtools-registry.s3.yandex.net/5840610640",
548550
"5860184285": "https://devtools-registry.s3.yandex.net/5860184285",
@@ -566,6 +568,7 @@
566568
"6913303010": "https://devtools-registry.s3.yandex.net/6913303010",
567569
"7196091589": "https://devtools-registry.s3.yandex.net/7196091589",
568570
"7370210775": "https://devtools-registry.s3.yandex.net/7370210775",
571+
"7539367458": "https://devtools-registry.s3.yandex.net/7539367458",
569572
"5766172292": "https://devtools-registry.s3.yandex.net/5766172292",
570573
"5805431504": "https://devtools-registry.s3.yandex.net/5805431504",
571574
"5829027626": "https://devtools-registry.s3.yandex.net/5829027626",
@@ -1581,6 +1584,7 @@
15811584
"6913307396": "devtools/yexport/bin/yexport for darwin",
15821585
"7196092605": "devtools/yexport/bin/yexport for darwin",
15831586
"7370212609": "devtools/yexport/bin/yexport for darwin",
1587+
"7539368752": "devtools/yexport/bin/yexport for darwin",
15841588
"5811823398": "devtools/yexport/bin/yexport for darwin-arm64",
15851589
"5840611310": "devtools/yexport/bin/yexport for darwin-arm64",
15861590
"5860185593": "devtools/yexport/bin/yexport for darwin-arm64",
@@ -1604,6 +1608,7 @@
16041608
"6913305359": "devtools/yexport/bin/yexport for darwin-arm64",
16051609
"7196092155": "devtools/yexport/bin/yexport for darwin-arm64",
16061610
"7370211678": "devtools/yexport/bin/yexport for darwin-arm64",
1611+
"7539368187": "devtools/yexport/bin/yexport for darwin-arm64",
16071612
"5811822876": "devtools/yexport/bin/yexport for linux",
16081613
"5840610640": "devtools/yexport/bin/yexport for linux",
16091614
"5860184285": "devtools/yexport/bin/yexport for linux",
@@ -1627,6 +1632,7 @@
16271632
"6913303010": "devtools/yexport/bin/yexport for linux",
16281633
"7196091589": "devtools/yexport/bin/yexport for linux",
16291634
"7370210775": "devtools/yexport/bin/yexport for linux",
1635+
"7539367458": "devtools/yexport/bin/yexport for linux",
16301636
"5766172292": "devtools/ymake/bin/ymake for darwin",
16311637
"5805431504": "devtools/ymake/bin/ymake for darwin",
16321638
"5829027626": "devtools/ymake/bin/ymake for darwin",

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

+4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
- includes:
2+
- thrust/count.h
23
- thrust/device_ptr.h
4+
- thrust/device_vector.h
5+
- thrust/functional.h
36
- thrust/execution_policy.h
47
- thrust/iterator/iterator_facade.h
58
- thrust/iterator/iterator_traits.h
9+
- thrust/iterator/transform_iterator.h
610
- thrust/scan.h
711
- thrust/sort.h
812
- thrust/system/cuda/execution_policy.h

‎build/ymake_conf.py

+8-5
Original file line numberDiff line numberDiff line change
@@ -786,11 +786,6 @@ def print_presets(self):
786786
else:
787787
print('@import "${CONF_ROOT}/conf/coverage_selective_instrumentation.conf"')
788788

789-
if presets:
790-
print('# Variables set from command line by -D options')
791-
for key in sorted(presets):
792-
emit(key, opts().presets[key])
793-
794789
@staticmethod
795790
def _print_conf_content(path):
796791
with open(path, 'r') as fin:
@@ -802,6 +797,13 @@ def print_core_conf(self):
802797
def print_settings(self):
803798
pass
804799

800+
def print_epilogue(self):
801+
presets = opts().presets
802+
if presets:
803+
print('# Variables set from command line by -D options')
804+
for key in sorted(presets):
805+
emit(key, opts().presets[key])
806+
805807

806808
class System(object):
807809
def __init__(self, platform):
@@ -2644,6 +2646,7 @@ def main():
26442646
build.print_build()
26452647

26462648
custom_conf.print_epilogue()
2649+
ymake.print_epilogue()
26472650

26482651

26492652
if __name__ == '__main__':

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

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ https://github.com/llvm/llvm-project/releases/download/llvmorg-{{self.version().
88

99
{% block patch_source %}
1010
(
11+
rm CMakeLists.txt
1112
cd lib/builtins
1213
rm CMakeLists.txt
1314
rm aarch64/lse.S

0 commit comments

Comments
 (0)