Skip to content

Commit 0bcb6b0

Browse files
alexv-smirnovalexv-smirnov
authored
Merge pull request #5828 from ydb-platform/mergelibs-240621-1318
Library import 240621-1318
2 parents b89687a + e69e39a commit 0bcb6b0

File tree

1,072 files changed

+42664
-5320
lines changed

Some content is hidden

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

1,072 files changed

+42664
-5320
lines changed

‎build/conf/proto.conf‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@ PY_PROTOC=${tool:"contrib/tools/protoc"}
44
when ($PYTHON2 == "yes") {
55
PY_PROTOC=${tool:"contrib/tools/protoc_old"}
66
}
7-
JAVA_PROTOC=${tool:"contrib/tools/protoc"}
8-
NEW_JAVA_PROTOC=yes
9-
when ($NEW_JAVA_PROTOC == "yes") {
10-
JAVA_PROTOC=${tool:"build/platform/java/protoc"}
11-
}
7+
JAVA_PROTOC=${tool:"build/platform/java/protoc"}
8+
129
when ($OPENSOURCE_REPLACE_PROTOBUF) {
1310
PROTOC_STYLEGUIDE_OUT=
1411
PROTOC_PLUGIN_STYLEGUIDE=
@@ -478,8 +475,8 @@ macro USE_JAVALITE() {
478475
}
479476

480477
# tag:proto tag:java-specific
481-
JAVA_PROTO_COMPILER_VERSION = 3.22.5
482-
JAVA_PROTO_RUNTIME_VERSION = 3.22.5
478+
JAVA_PROTO_COMPILER_VERSION = 3.25.3
479+
JAVA_PROTO_RUNTIME_VERSION = 3.25.3
483480
JAVA_PROTO_COMMON_VERSION = 2.9.0
484481
JAVA_GRPC_VERSION = 1.51.0
485482
JAVA_NETTY_NETTY_VERSION = 4.1.79.Final
@@ -564,7 +561,7 @@ macro GRPC() {
564561
PY_PROTO_PLUGIN(grpc_py _pb2_grpc.py contrib/tools/protoc/plugins/grpc_python DEPS contrib/python/grpcio)
565562

566563
# Java
567-
JAVA_PROTO_PLUGIN(grpc_java contrib/tools/protoc/plugins/grpc_java DEPS $JAVA_GRPC_STUB $JAVA_GRPC_PROTOBUF)
564+
JAVA_PROTO_PLUGIN(grpc_java build/platform/java/grpc DEPS $JAVA_GRPC_STUB $JAVA_GRPC_PROTOBUF)
568565
SET_APPEND(JAVA_PROTOBUF_PEERS contrib/java/javax/annotation/javax.annotation-api/1.3.1)
569566
}
570567

‎build/conf/swig.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ _EXPLICIT_SWIG_JAVA_SOURCES=
4646
_EXPLICIT_SWIG_IFACE_SOURCES=
4747
macro _EXPORT_JAVA_BINDINGS(JavaSrcs...) {
4848
SET_APPEND(_EXPLICIT_SWIG_JAVA_SOURCES ${input:JavaSrcs})
49-
.SEM=find_package SWIG COMPONENTS java && find_package Java && packages-ITEM && packages-name SWIG && packages-components java && mpackages-ITEM && mpackages-name SWIG && mpackages-components java && packages-ITEM && packages-name Java && mpackages-ITEM && mpackages-name Java && include UseSWIG && include UseJava && includes UseSWIG && includes UseJava ${input;hide:JavaSrcs} ${output;hide;pre=$_HASH_HELPER($Args):".o"}
49+
.SEM=find_package SWIG COMPONENTS java && find_package Java && packages-ITEM && packages-name SWIG && packages-components java && mpackages-ITEM && mpackages-name SWIG && mpackages-components java && packages-ITEM && packages-name Java && mpackages-ITEM && mpackages-name Java && include UseSWIG && include UseJava && dir_includes UseSWIG && dir_includes UseJava ${input;hide:JavaSrcs} ${output;hide;pre=$_HASH_HELPER($Args):".o"}
5050
}
5151
macro _EXPORT_SWIG_SOURCES(SwigSrcs...) {
5252
SET_APPEND(_EXPLICIT_SWIG_IFACE_SOURCES ${input:SwigSrcs})

‎build/export_generators/cmake/dir_includes.jinja‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
{%- if includes is defined %}
2-
{% for incl in includes -%}
3-
include({{ incl }})
4-
{% endfor -%}
1+
{%- if dir_includes is defined %}
2+
{% for dir_include in dir_includes -%}
3+
include({{ dir_include }})
4+
{% endfor -%}
55
{%- endif -%}
66

77
{%- if subdirs|length %}

‎build/export_generators/cmake/dir_packages.jinja‎

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,37 @@
1-
{%- set packages = [] -%}
2-
{%- if (target.packages is defined) and (target.packages|length) -%}
3-
{%- set packages = packages + target.packages -%}
4-
{%- endif -%}
5-
{%- if (target.mpackages is defined) and (target.mpackages|length) -%}
6-
{%- if packages|length -%}
7-
{#- Skip duplicating packages -#}
8-
{%- set mpackages = target.mpackages|rejectattr('name', 'in', packages|map(attribute='name')) -%}
9-
{%- if mpackages|length -%}
10-
{%- set packages = packages + mpackages -%}
11-
{%- endif -%}
12-
{%- else -%}
13-
{%- set packages = packages + target.mpackages -%}
14-
{%- endif -%}
15-
{%- endif -%}
16-
{%- if packages|length -%}
17-
{%- for package in packages -%}
1+
{%- macro RenderPackages(target) -%}
2+
{%- set packages = [] -%}
3+
{%- if (target.packages is defined) and (target.packages|length) -%}
4+
{%- set packages = packages + target.packages -%}
5+
{%- endif -%}
6+
{%- if (target.mpackages is defined) and (target.mpackages|length) -%}
7+
{%- if packages|length -%}
8+
{#- Skip duplicating packages -#}
9+
{%- set mpackages = target.mpackages|rejectattr('name', 'in', packages|map(attribute='name')) -%}
10+
{%- if mpackages|length -%}
11+
{%- set packages = packages + mpackages -%}
12+
{%- endif -%}
13+
{%- else -%}
14+
{%- set packages = packages + target.mpackages -%}
15+
{%- endif -%}
16+
{%- endif -%}
17+
{%- if packages|length -%}
18+
{%- for package in packages -%}
1819
find_package({{ package.name }} REQUIRED
19-
{%- if package.components|length %} COMPONENTS
20-
{%- for component in package.components %}
20+
{%- if package.components|length %} COMPONENTS
21+
{%- for component in package.components %}
2122
{{ component }}
22-
{% endfor -%}
23-
{%- endif -%}
23+
{% endfor -%}
24+
{%- endif -%}
2425
)
25-
{% endfor -%}
26+
{% endfor -%}
27+
{%- endif -%}
28+
{%- endmacro -%}
29+
30+
{%- if target is defined -%}
31+
{{ RenderPackages(target) }}
32+
{%- endif -%}
33+
{%- if extra_targets is defined -%}
34+
{%- for extra_target in extra_targets -%}
35+
{{ RenderPackages(extra_target) }}
36+
{%- endfor -%}
2637
{%- endif -%}

‎build/export_generators/cmake/generator.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,12 @@ dir_macroses="list"
115115
dir_macroses-ITEM="dict"
116116
dir_macroses-macro="str"
117117
dir_macroses-args="list"
118+
dir_includes="set"
118119

119120
[attrs.target]
120121
# DEPRECATED - Skipped old hardcoded-cmake attributes
121122
set_target_property="skip"
123+
append_target_property="skip"
122124

123125
# DEPRECATED - target multiple calls macroses
124126
generate_enum_serilization="skip"

‎build/export_generators/cmake/target_links.jinja‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@
2828
{%- endif -%}
2929
{%- endif -%}
3030
{%- if (current_target.allocators is defined) and (current_target.allocators|length) -%}
31-
{%- if (macro == "add_executable") or (macro == "add_library" and ("SHARED" in macro_args)) -%}
31+
{%- if (current_target.macro == "add_executable") or (current_target.macro == "add_library" and ("SHARED" in current_target.macro_args)) -%}
3232
{#- support allocators -#}
33-
{%- set allocators = allocators + current_target.allocators|sum -%}
33+
{%- set allocators = allocators + current_target.allocators -%}
3434
{%- else -%}
3535
{#- not supported allocators -#}
3636
{%- if current_target.is_fake_module -%}
37-
{%- set interfaces = interfaces + current_target.allocators|sum -%}
37+
{%- set interfaces = interfaces + current_target.allocators -%}
3838
{%- else -%}
39-
{%- set publics = publics + current_target.allocators|sum -%}
39+
{%- set publics = publics + current_target.allocators -%}
4040
{%- endif -%}
4141
{%- endif -%}
4242
{%- endif -%}

‎build/export_generators/cmake/target_properties.jinja‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
1-
{% for property in current_target.properties -%}
1+
{%- if (current_target.target_properties is defined) and (current_target.target_properties|length) -%}
2+
{#- Deduplicate target property names -#}
3+
{%- set property_names = current_target.target_properties|map(attribute='name')|unique -%}
4+
{%- for property_name in property_names -%}
5+
{%- set properties = current_target.target_properties|selectattr('name', 'eq', property_name) -%}
6+
{#- Apply only first property by name -#}
7+
{%- set property = properties|first %}
28
set_property(TARGET {{ name }} PROPERTY {{ property.name }}
3-
{%- for value in property.value %}
9+
{%- for value in property.value %}
410
{{ value }}
5-
{%- endfor %}
11+
{%- endfor %}
612
)
7-
{% endfor -%}
13+
{% endfor -%}
14+
{%- endif -%}
815

9-
{%- if (current_target.protoc_extra_outs is defined) and (current_target.protoc_extra_outs|length) -%}
16+
{%- if (current_target.protoc_extra_outs is defined) and (current_target.protoc_extra_outs|length) %}
1017
set_property(TARGET {{ name }} PROPERTY PROTOC_EXTRA_OUTS
1118
{%- for protoc_extra_out in current_target.protoc_extra_outs %}
1219
{{ protoc_extra_out }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ repositories {
102102

103103
}
104104

105-
val project_root="{%- if export_root.startswith(arcadia_root + '/') -%}{{ arcadia_root }}{%- else -%}{{ export_root }}{%- endif -%}"
105+
val project_root="{%- if export_root.startswith(arcadia_root + '/') -%}{{ arcadia_root }}{%- else -%}{{ export_root }}/.hic_sunt_dracones{%- endif -%}"
106106

107107
{% if mainClass -%}
108108
application {

‎build/external_resources/ya-tc/public.resources.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"by_platform": {
33
"darwin": {
4-
"uri": "sbr:6148089711"
4+
"uri": "sbr:6512097221"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:6148088723"
7+
"uri": "sbr:6512096671"
88
},
99
"linux": {
10-
"uri": "sbr:6148087756"
10+
"uri": "sbr:6512096202"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:6148086856"
13+
"uri": "sbr:6512095667"
1414
}
1515
}
1616
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"by_platform": {
33
"darwin": {
4-
"uri": "sbr:6414093835"
4+
"uri": "sbr:6529076530"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:6414092531"
7+
"uri": "sbr:6529075176"
88
},
99
"linux": {
10-
"uri": "sbr:6414090908"
10+
"uri": "sbr:6529073664"
1111
}
1212
}
1313
}

0 commit comments

Comments
 (0)