Skip to content

Commit f9469fd

Browse files
alexv-smirnovalexv-smirnov
committed
Merge pull request #19400 from ydb-platform/merge-libs-250606-0050
2 parents 4fbb0a8 + 9ec7b91 commit f9469fd

File tree

142 files changed

+292
-142
lines changed

Some content is hidden

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

142 files changed

+292
-142
lines changed

‎build/conf/java.conf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -639,6 +639,7 @@ _JAVA_CONTRIB_SEM= \
639639
&& consumer-jar ${MODDIR}/${REALPRJNAME}.jar \
640640
&& consumer-type contrib \
641641
$_JAVAC_SEM \
642+
$_JVM_ARGS_SEM \
642643
$_KOTLINC_SEM \
643644
&& IGNORED
644645

@@ -1030,6 +1031,7 @@ _BUILD_JAR_SEM= \
10301031
&& consumer-jar ${MODDIR}/${REALPRJNAME}.jar \
10311032
&& consumer-type library \
10321033
$_JAVAC_SEM \
1034+
$_JVM_ARGS_SEM \
10331035
$_KOTLINC_SEM \
10341036
$_KOTLIN_SEM \
10351037
$_KAPT_SEM \
@@ -1050,6 +1052,7 @@ _BUILD_PROTO_JAR_SEM= \
10501052
&& consumer-type library \
10511053
${pre=&& consumer-proto_namespace :PROTO_NAMESPACE} \
10521054
$_JAVAC_SEM \
1055+
$_JVM_ARGS_SEM \
10531056
$_KOTLINC_SEM \
10541057
$_ANN_PROCESSORS_SEM \
10551058
$_USE_ANNOTATION_PROCESSOR_SEM \
@@ -1616,6 +1619,7 @@ macro SYSTEM_PROPERTIES(Args...) {
16161619

16171620
# tag:java-specific
16181621
JVM_ARGS_VALUE=-ea
1622+
_JVM_ARGS_SEM=&& jvm_args $JVM_ARGS_VALUE
16191623
### @usage: JVM_ARGS(Args...)
16201624
###
16211625
### Arguments to run Java programs in tests.

‎build/conf/ts/ts.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ TS_YNDEXING=no
1010
# Use outdir defined in tsconfig (actual not for bundlers, they use own way to define output directory)
1111
TS_CONFIG_USE_OUTDIR=
1212
TS_USE_PREBUILT_NOTS_TOOL=yes
13-
NOTS_TOOL=${tool:"devtools/frontend_build_platform/nots/builder"}
13+
TS_FAKEID=${FAKEID}.2025-06-04
14+
NOTS_TOOL=${tool:"devtools/frontend_build_platform/nots/builder"} ${hide:TS_FAKEID}
1415

1516
# Additional commands that module can add (with `&&` as delimiter), if set those will be executed
1617
# in build phase just before building the module.

‎build/export_generators/gradle/generator.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ runs-classpath="list"
7474
runs-cwd="str"
7575
runs-in="list"
7676
runs-in_dir="list"
77-
runs-in_dirs_inputs="list"
7877
runs-in_noparse="list"
7978
runs-out="list"
8079
runs-out_dir="list"

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ val {{ varprefix }}{{ run['_object_index'] }} = task<JavaExec>("{{ varprefix }}{
8484

8585
{#-
8686
Не использованы атрибуты
87-
run-in_dirs_inputs="list"
8887
run-tool="list"
8988
#}
9089
}

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{%- macro AnnotationProcessors(funcName, annotation_processors) -%}
22
{%- if annotation_processors|length -%}
3-
{%- for annotation_processor in annotation_processors|unique|sort -%}
3+
{%- set annotation_processors = annotation_processors|unique|sort -%}
4+
{%- set lomboks = annotation_processors|select('startsWith', 'contrib/java/org/projectlombok/lombok') -%}
5+
{%- set nolomboks = annotation_processors|reject('startsWith', 'contrib/java/org/projectlombok/lombok') -%}
6+
{%- set annotation_processors = lomboks + nolomboks -%}
7+
{%- for annotation_processor in annotation_processors -%}
48
{%- set parts = rsplit(annotation_processor, "/", 4) %}
59
{{ funcName }}("{{ parts[0]|replace("contrib/java/", "")|replace("/", ".") }}:{{ parts[1] }}:{{ parts[2] }}")
610
{%- endfor -%}
@@ -37,8 +41,13 @@
3741
{%- else %}
3842
{{ implementationFunc }}({{ classpath }})
3943
{%- endif -%}
40-
{%- else %}
44+
{%- else -%}
45+
{%- if classpath|replace('project(":', '') != classpath -%}
46+
{#- Contrib in exported arcadia folders #}
47+
{{ implementationFunc }}(files("$output_root/{{ library.jar }}"))
48+
{%- else %}
4149
{{ apiFunc }}({{ classpath }})
50+
{%- endif -%}
4251
{%- endif -%}
4352
{%- if library.excludes.consumer|length and not build_contribs -%} {
4453
{%- for exclude in library.excludes.consumer if exclude.classpath -%}
@@ -78,9 +87,8 @@ dependencies {
7887
{%- endif -%}
7988
{#- glue -#}
8089
{{ AnnotationProcessors("annotationProcessor", target.use_annotation_processor) }}
81-
{%- for extra_target in extra_targets -%}
82-
{{ AnnotationProcessors("testAnnotationProcessor", extra_target.use_annotation_processor) }}
83-
{%- endfor -%}
90+
{%- set test_annotation_processors = extra_targets|selectattr('use_annotation_processor')|map(attribute='use_annotation_processor')|sum -%}
91+
{{ AnnotationProcessors("testAnnotationProcessor", test_annotation_processors) }}
8492
{%- if with_kapt -%}
8593
{{ Kapts("kapt", target.kapt.classpaths) }}
8694
{%- endif -%}

‎build/export_generators/ide-gradle/generator.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ runs-classpath="list"
7777
runs-cwd="str"
7878
runs-in="list"
7979
runs-in_dir="list"
80-
runs-in_dirs_inputs="list"
8180
runs-in_noparse="list"
8281
runs-out="list"
8382
runs-out_dir="list"
@@ -96,6 +95,7 @@ custom_runs-cmake_packages-components="list"
9695

9796
javac-flags="list"
9897
kotlinc-flags="list"
98+
jvm_args="list"
9999

100100
target_commands="list"
101101
target_commands-ITEM="dict"

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,23 @@ val prepareMainProtos = tasks.register<Copy>("prepareMainProtos") {
3333
{%- if extractLibrariesProtosTask %}
3434

3535
val extractMainLibrariesProtos = tasks.register<Copy>("extractMainLibrariesProtos") {
36-
{%- set root_libraries = libraries|rejectattr('proto_namespace') -%}
37-
{%- set ns_libraries = libraries|selectattr('proto_namespace') -%}
38-
{%- if root_libraries|length %}
3936
from("$arcadia_root") {
40-
{%- for library in root_libraries -%}
37+
{%- for library in libraries -%}
4138
{%- set path_and_jar = rsplit(library.jar, '/', 2) %}
4239
include("{{ path_and_jar[0] }}/**/*.proto")
4340
{%- endfor %}
4441
}
45-
{%- endif -%}
42+
{%- set ns_libraries = libraries|selectattr('proto_namespace') -%}
4643
{%- if ns_libraries|length -%}
4744
{%- for library in ns_libraries -%}
4845
{%- set path_and_jar = rsplit(library.jar, '/', 2) -%}
4946
{%- set path = "#R/" + path_and_jar[0] -%}
50-
{%- set path = path|replace("#R/" + library.proto_namespace + "/", "")|replace("#R/", "") %}
47+
{%- set path = path|replace("#R/" + library.proto_namespace + "/", "")|replace("#R/" + library.proto_namespace, "")|replace("#R/", "") -%}
48+
{%- if path != "" -%}
49+
{%- set path = path + "/" -%}
50+
{%- endif %}
5151
from("$arcadia_root/{{ library.proto_namespace }}") {
52-
include("{{ path }}/**/*.proto")
52+
include("{{ path }}**/*.proto")
5353
}
5454
{%- endfor -%}
5555
{%- endif %}

‎build/mapping.conf.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,7 @@
555555
"8813611998": "{registry_endpoint}/8813611998",
556556
"8850031153": "{registry_endpoint}/8850031153",
557557
"8865992733": "{registry_endpoint}/8865992733",
558+
"8895767556": "{registry_endpoint}/8895767556",
558559
"5486731632": "{registry_endpoint}/5486731632",
559560
"5514350352": "{registry_endpoint}/5514350352",
560561
"5514360398": "{registry_endpoint}/5514360398",
@@ -2018,6 +2019,7 @@
20182019
"8813611998": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
20192020
"8850031153": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
20202021
"8865992733": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
2022+
"8895767556": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
20212023
"5486731632": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
20222024
"5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
20232025
"5514360398": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",

‎build/platform/test_tool/host.ya.make.inc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
2-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8866026265)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8895832159)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8866025345)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8895829195)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8866027930)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8895837699)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8866024152)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8895827132)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8866027125)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8895835134)
1111

1212
ENDIF()

‎build/platform/test_tool/host_os.ya.make.inc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
2-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8865991022)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8895763011)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8865990327)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8895760446)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8865992733)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8895767556)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8865989443)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8895758330)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8865991956)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8895765221)
1111

1212
ENDIF()

0 commit comments

Comments
 (0)