Skip to content

Commit c7d8170

Browse files
alexv-smirnovmarsaly79
alexv-smirnov
authored and
marsaly79
committed
Library import 2 (ydb-platform#639)
1 parent 061a1bc commit c7d8170

File tree

588 files changed

+21498
-33333
lines changed

Some content is hidden

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

588 files changed

+21498
-33333
lines changed

‎build/conf/java.conf

+3-7
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ module EXTERNAL_JAVA_LIBRARY: _BASE_UNIT {
272272
.ALIASES=SRCS=_SRCS_NO_GLOBAL
273273
.ALLOWED=EMBED_JAVA_VCS_INFO
274274
.RESTRICTED=EXTERNAL_JAR
275-
.GLOBAL=MAVEN_EXPORT_COORDS EXPORT_GRADLE_CLASSPATH
275+
.GLOBAL=MAVEN_EXPORT_COORDS
276276

277277
PEERDIR(build/platform/java/jdk)
278278
PEERDIR+=$JDK_RESOURCE_PEERDIR $EXTERNAL_JAVA_EXTRA_PEERDIR
@@ -440,7 +440,6 @@ module _JAR_BASE: _BARE_UNIT {
440440
.ALLOWED=EMBED_JAVA_VCS_INFO DEPENDENCY_MANAGEMENT EXCLUDE
441441
.DEFAULT_NAME_GENERATOR=TwoDirNames
442442
.RESTRICTED=WITH_JDK RESOURCE RESOURCE_FILES
443-
.GLOBAL=EXPORT_GRADLE_CLASSPATH
444443

445444
PEERDIR_TAGS=JAVA_PROTO JAVA_FBS JAVA_IDL DLL JAR_COMPILATION __EMPTY__
446445

@@ -506,8 +505,6 @@ JAVA_CONTRIB_SEM= \
506505
consumer-classpath $EXPORT_GRADLE_CLASSPATH \
507506
&& consumer-jar ${MODDIR}/${REALPRJNAME}.jar \
508507
&& consumer-type contrib \
509-
&& peers_closure $MANAGED_PEERS_CLOSURE \
510-
&& peers_closure_coords $EXPORT_GRADLE_CLASSPATH_GLOBAL \
511508
&& IGNORED
512509

513510
# tag:java-specific
@@ -516,7 +513,7 @@ module JAVA_CONTRIB: _JAR_BASE {
516513
.PEERDIR_POLICY=as_include
517514
.SEM=JAVA_CONTRIB_SEM
518515
.FINAL_TARGET=yes
519-
.GLOBAL=MAVEN_EXPORT_COORDS EXPORT_GRADLE_CLASSPATH
516+
.GLOBAL=MAVEN_EXPORT_COORDS
520517

521518
when ($JAR_RESOURCE_ID) {
522519
FETCH_TARGET_JAR= && $_FETCH_CONTRIB($JAR_RESOURCE_ID ${BINDIR}/${MODULE_PREFIX}${REALPRJNAME}${MODULE_SUFFIX})
@@ -868,7 +865,6 @@ BUILD_JAR_SEM= \
868865
&& consumer-classpath $EXPORT_GRADLE_CLASSPATH \
869866
&& consumer-jar ${MODDIR}/${REALPRJNAME}.jar \
870867
&& consumer-type library \
871-
&& excludes_rules $EXCLUDE_VALUE \
872868
$_KOTLIN_SEM \
873869
$_JAR_MAIN_SEM \
874870
$_GRADLE_EXPORT_PUBLISHING_SEM \
@@ -894,7 +890,7 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
894890
.FINAL_TARGET=yes
895891
.ALIASES=JAVA_SRCS=FULL_JAVA_SRCS ANNOTATION_PROCESSOR=JAR_ANNOTATION_PROCESSOR
896892
.RESTRICTED=EXTERNAL_JAR
897-
.GLOBAL=MAVEN_EXPORT_COORDS EXPORT_GRADLE_CLASSPATH
893+
.GLOBAL=MAVEN_EXPORT_COORDS
898894
MODULE_SUFFIX=.jar
899895

900896
PEERDIR(build/platform/java/jdk)

‎build/conf/proto.conf

+10
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ CPP_PROTO_OUTS=
3030
CPP_PROTO_OUTS_SEM=
3131
CPP_PROTO_SUFFIXES=.pb.h .pb.cc
3232
CPP_PROTO_PLUGINS=
33+
CPP_PROTO_NO_DBGINFO=no
3334

3435
# tag:proto tag:cpp-specific
3536
CPP_EV_OPTS=--plugin=protoc-gen-event2cpp=${tool:"tools/event2cpp"} --event2cpp_out=$ARCADIA_BUILD_ROOT -I=$ARCADIA_ROOT/library/cpp/eventlog
@@ -50,6 +51,14 @@ JAVA_PROTO_ARGS=
5051
# tag:proto tag:python-specific
5152
OPTIMIZE_PY_PROTOS_FLAG=no
5253

54+
# tag:proto
55+
### @usage: CPP_PROTOLIBS_DEBUG_INFO()
56+
###
57+
### Eqvivalent to NO_DEBUG_INFO() macro if the flag CPP_PROTO_NO_DBGINFO=yes
58+
macro CPP_PROTOLIBS_DEBUG_INFO() {
59+
SET(NO_DEBUGINFO $CPP_PROTO_NO_DBGINFO)
60+
}
61+
5362
# tag:internal
5463
### @usage: _ORDER_ADDINCL([BUILD ...] [SOURCE ...] Args...) # internal
5564
###
@@ -638,6 +647,7 @@ multimodule PROTO_LIBRARY {
638647
ENABLE(CPP_PROTO)
639648
ENABLE(GEN_PROTO)
640649
NO_CLANG_TIDY()
650+
CPP_PROTOLIBS_DEBUG_INFO()
641651
SET(PEERDIR_TAGS CPP_PROTO)
642652

643653
when ($BUILD_PROTO_AS_EVLOG == "yes" && $USE_VANILLA_PROTOC == "yes") {

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,11 @@ dependencies {
4444
{% for library in target.consumer -%}
4545
{% set classpath = library.classpath -%}
4646
{% if targets|selectattr("app_main_class") -%}
47-
{% if target.lib_excludes is defined and target.lib_excludes[classpath]|length > 0 -%}
47+
{% if library.excludes.consumer is defined %}
4848
implementation({{ classpath }}) {
49-
{% for exclude in target.lib_excludes[classpath] -%}
50-
exclude group: '{{ exclude[0] }}', module: '{{ exclude[1] }}'
49+
{% for exclude in library.excludes.consumer -%}
50+
{% set classpath_parts = exclude.classpath.split(':') -%}
51+
exclude group: '{{ classpath_parts[0] }}', module: '{{ classpath_parts[1] }}'
5152
{% endfor -%}
5253
}
5354
{% else -%}

‎build/export_generators/gradle/generator.toml

-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ add_vcs_info_to_mf="bool"
2020
junit4_test="flag"
2121
junit5_test="flag"
2222
app_main_class="str"
23-
peers_closure="list"
24-
peers_closure_coords="list"
25-
excludes_rules="list"
2623

2724
publish="flag"
2825
publish_group="str"

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,11 @@ dependencies {
6868
{% for library in target.consumer -%}
6969
{% set classpath = library.classpath -%}
7070
{% if targets|selectattr("app_main_class") -%}
71-
{% if target.lib_excludes is defined and target.lib_excludes[classpath]|length > 0 -%}
71+
{% if library.excludes.consumer is defined %}
7272
implementation({{ classpath }}) {
73-
{% for exclude in target.lib_excludes[classpath] -%}
74-
exclude group: '{{ exclude[0] }}', module: '{{ exclude[1] }}'
73+
{% for exclude in library.excludes.consumer -%}
74+
{% set classpath_parts = exclude.classpath.split(':') -%}
75+
exclude group: '{{ classpath_parts[0] }}', module: '{{ classpath_parts[1] }}'
7576
{% endfor -%}
7677
}
7778
{% else -%}

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

-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ add_vcs_info_to_mf="bool"
1919
junit4_test="flag"
2020
junit5_test="flag"
2121
app_main_class="str"
22-
peers_closure="list"
23-
peers_closure_coords="list"
24-
excludes_rules="list"
2522
jar_source_set="list"
2623

2724
publish="flag"

‎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:5534004877"
4+
"uri": "sbr:5562968267"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:5534041285"
7+
"uri": "sbr:5562965675"
88
},
99
"linux": {
10-
"uri": "sbr:5534030737"
10+
"uri": "sbr:5562947428"
1111
}
1212
}
1313
}

‎build/mapping.conf.json

+15-3
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"5424038053": "https://devtools-registry.s3.yandex.net/5424038053",
3838
"5424051723": "https://devtools-registry.s3.yandex.net/5424051723",
3939
"5543659225": "https://devtools-registry.s3.yandex.net/5543659225",
40+
"5560184603": "https://devtools-registry.s3.yandex.net/5560184603",
4041
"5553311553": "https://devtools-registry.s3.yandex.net/5553311553",
4142
"5554110935": "https://devtools-registry.s3.yandex.net/5554110935",
4243
"5554115224": "https://devtools-registry.s3.yandex.net/5554115224",
@@ -94,6 +95,7 @@
9495
"5530946535": "https://devtools-registry.s3.yandex.net/5530946535",
9596
"5545693767": "https://devtools-registry.s3.yandex.net/5545693767",
9697
"5545709989": "https://devtools-registry.s3.yandex.net/5545709989",
98+
"5559549864": "https://devtools-registry.s3.yandex.net/5559549864",
9799
"4307890075": "https://devtools-registry.s3.yandex.net/4307890075",
98100
"5517245192": "https://devtools-registry.s3.yandex.net/5517245192",
99101
"4307901240": "https://devtools-registry.s3.yandex.net/4307901240",
@@ -111,12 +113,15 @@
111113
"5486584798": "https://devtools-registry.s3.yandex.net/5486584798",
112114
"5498749381": "https://devtools-registry.s3.yandex.net/5498749381",
113115
"5534092912": "https://devtools-registry.s3.yandex.net/5534092912",
116+
"5562971772": "https://devtools-registry.s3.yandex.net/5562971772",
114117
"5486590469": "https://devtools-registry.s3.yandex.net/5486590469",
115118
"5498750509": "https://devtools-registry.s3.yandex.net/5498750509",
116119
"5534043120": "https://devtools-registry.s3.yandex.net/5534043120",
120+
"5562958333": "https://devtools-registry.s3.yandex.net/5562958333",
117121
"5486590393": "https://devtools-registry.s3.yandex.net/5486590393",
118122
"5498735180": "https://devtools-registry.s3.yandex.net/5498735180",
119123
"5534059422": "https://devtools-registry.s3.yandex.net/5534059422",
124+
"5562961825": "https://devtools-registry.s3.yandex.net/5562961825",
120125
"5476908047": "https://devtools-registry.s3.yandex.net/5476908047",
121126
"5509380757": "https://devtools-registry.s3.yandex.net/5509380757",
122127
"5550834592": "https://devtools-registry.s3.yandex.net/5550834592",
@@ -132,7 +137,8 @@
132137
"5476896707": "https://devtools-registry.s3.yandex.net/5476896707",
133138
"5509388614": "https://devtools-registry.s3.yandex.net/5509388614",
134139
"5550838970": "https://devtools-registry.s3.yandex.net/5550838970",
135-
"2980468199": "https://devtools-registry.s3.yandex.net/2980468199"
140+
"2980468199": "https://devtools-registry.s3.yandex.net/2980468199",
141+
"5562224408": "https://devtools-registry.s3.yandex.net/5562224408"
136142
},
137143
"resources_descriptions": {
138144
"2214720943": "Clang 11.0.0 for darwin-arm64",
@@ -171,6 +177,7 @@
171177
"5424038053": "OTHER_RESOURCE-none-1.21.3-y_go1.21.3.linux-arm64.tar.gz",
172178
"5424051723": "OTHER_RESOURCE-none-1.21.3-y_go1.21.3.windows-amd64.tar.gz",
173179
"5543659225": "OTHER_RESOURCE-none-none-clang-darwin-arm64.tgz",
180+
"5560184603": "OTHER_RESOURCE-none-none-clang-mingw64.tgz",
174181
"5553311553": "OTHER_RESOURCE-none-none-clang-new-darwin-arm64.tgz",
175182
"5554110935": "OTHER_RESOURCE-none-none-clang-new-darwin-x86_64.tgz",
176183
"5554115224": "OTHER_RESOURCE-none-none-clang-new-linux-aarch64.tgz",
@@ -228,6 +235,7 @@
228235
"5530946535": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
229236
"5545693767": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
230237
"5545709989": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
238+
"5559549864": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
231239
"4307890075": "flake8_linter for linux",
232240
"5517245192": "flake8_linter for linux",
233241
"4307901240": "flake8_linter for linux-aarch64",
@@ -245,12 +253,15 @@
245253
"5486584798": "yexport for darwin",
246254
"5498749381": "yexport for darwin",
247255
"5534092912": "yexport for darwin",
256+
"5562971772": "yexport for darwin",
248257
"5486590469": "yexport for darwin-arm64",
249258
"5498750509": "yexport for darwin-arm64",
250259
"5534043120": "yexport for darwin-arm64",
260+
"5562958333": "yexport for darwin-arm64",
251261
"5486590393": "yexport for linux",
252262
"5498735180": "yexport for linux",
253263
"5534059422": "yexport for linux",
264+
"5562961825": "yexport for linux",
254265
"5476908047": "ymake for darwin",
255266
"5509380757": "ymake for darwin",
256267
"5550834592": "ymake for darwin",
@@ -266,8 +277,9 @@
266277
"5476896707": "ymake.exe for win32-clang-cl",
267278
"5509388614": "ymake.exe for win32-clang-cl",
268279
"5550838970": "ymake.exe for win32-clang-cl",
269-
"2980468199": "ytexec for linux"
280+
"2980468199": "ytexec for linux",
281+
"5562224408": "ytexec for linux"
270282
},
271283
"resources_info": {},
272284
"tasks": {}
273-
}
285+
}

‎build/platform/clang/clang16.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"uri": "sbr:5550376885"
1414
},
1515
"win32-x86_64": {
16-
"uri": "sbr:4597657641"
16+
"uri": "sbr:5560184603"
1717
}
1818
}
1919
}

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

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
2-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5530946966)
3-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5530945085)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5559522450)
3+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5559535346)
44
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
5-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5530946287)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5530944412)
5+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5559521542)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5559534336)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5530948376)
9-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5530946535)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5559524010)
9+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5559537477)
1010
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
11-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5530945697)
12-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5530943651)
11+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5559520978)
12+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5559533477)
1313
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
14-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5530947626)
15-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5530945871)
14+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5559523230)
15+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5559536195)
1616

1717
ENDIF()

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

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
2-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5545693048)
3-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5545693048)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5559548658)
3+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5559548658)
44
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
5-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5545692674)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5545692674)
5+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5559548099)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5559548099)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5545693767)
9-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5545693767)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5559549864)
9+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5559549864)
1010
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
11-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5545692313)
12-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5545692313)
11+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5559547357)
12+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5559547357)
1313
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
14-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5545693355)
15-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5545693355)
14+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5559549352)
15+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5559549352)
1616

1717
ENDIF()

‎build/plugins/java.py

-1
Original file line numberDiff line numberDiff line change
@@ -483,4 +483,3 @@ def on_setup_project_coords_if_needed(unit, *args):
483483
else:
484484
value = 'project(\\":{}\\")'.format(project_dir.replace('/', ':'))
485485
unit.set(['EXPORT_GRADLE_CLASSPATH', value])
486-
unit.set(['EXPORT_GRADLE_CLASSPATH_GLOBAL', value])

‎build/plugins/res.py

+5
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ def onresource_files(unit, *args):
5656
key = 'resfs/file/' + (
5757
dest or (prefix + (path if not prefix_to_strip else remove_prefix(path, prefix_to_strip)))
5858
)
59+
if key in res:
60+
unit.message(
61+
['warn', "Dublicated resource file {} in RESOURCE_FILES() macro. Skipped it.".format(path)]
62+
)
63+
continue
5964
src = 'resfs/src/{}={}'.format(key, rootrel_arc_src(path, unit))
6065
res += ['-', src, path, key]
6166

0 commit comments

Comments
 (0)