Skip to content

Commit 908016b

Browse files
maximyurchukmaximyurchuk
authored
Merge pull request #8666 from ydb-platform/mergelibs-240903-1104
Library import 240903-1104
2 parents ec42e43 + 5653de4 commit 908016b

File tree

154 files changed

+3135
-1821
lines changed

Some content is hidden

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

154 files changed

+3135
-1821
lines changed

‎build/conf/java.conf

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1229,9 +1229,6 @@ elsewhen ($JDK_VERSION == "20") {
12291229
elsewhen ($JDK_VERSION == "17") {
12301230
JDK_REAL_VERSION=17
12311231
}
1232-
elsewhen ($JDK_VERSION == "15") {
1233-
JDK_REAL_VERSION=15
1234-
}
12351232
elsewhen ($JDK_VERSION == "11") {
12361233
JDK_REAL_VERSION=11
12371234
}
@@ -1261,9 +1258,6 @@ otherwise {
12611258
# need jdk11 for spare parts in "host" platform
12621259
JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk17 build/platform/java/jdk/jdk11
12631260
}
1264-
when ($JDK_REAL_VERSION == "15") {
1265-
JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk15 build/platform/java/jdk/jdk17
1266-
}
12671261
when ($JDK_REAL_VERSION == "11") {
12681262
JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk11 build/platform/java/jdk/jdk17
12691263
}
@@ -1282,9 +1276,6 @@ when ($JDK_REAL_VERSION == "20") {
12821276
when ($JDK_REAL_VERSION == "17") {
12831277
UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar17
12841278
}
1285-
when ($JDK_REAL_VERSION == "15") {
1286-
UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar15
1287-
}
12881279
when ($JDK_REAL_VERSION == "11") {
12891280
UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar11
12901281
}
@@ -1307,9 +1298,6 @@ otherwise {
13071298
when ($JDK_REAL_VERSION == "17") {
13081299
JDK_RESOURCE=$JDK17_RESOURCE_GLOBAL
13091300
}
1310-
when ($JDK_REAL_VERSION == "15") {
1311-
JDK_RESOURCE=$JDK15_RESOURCE_GLOBAL
1312-
}
13131301
when ($JDK_REAL_VERSION == "11") {
13141302
JDK_RESOURCE=$JDK11_RESOURCE_GLOBAL
13151303
}
@@ -1318,7 +1306,7 @@ otherwise {
13181306
# tag:java-specific
13191307
when (!$USE_SYSTEM_ERROR_PRONE) {
13201308
# Still not done: DTCC-667
1321-
when ($JDK_REAL_VERSION == "11" || $JDK_REAL_VERSION == "15") {
1309+
when ($JDK_REAL_VERSION == "11") {
13221310
ERROR_PRONE_VERSION=2.7.1
13231311
ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.7.1
13241312
ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_7_1_RESOURCE_GLOBAL
@@ -1372,9 +1360,6 @@ otherwise {
13721360
when ($JDK_REAL_VERSION == "17") {
13731361
UBERJAR_RESOURCE=$UBERJAR17_RESOURCE_GLOBAL
13741362
}
1375-
when ($JDK_REAL_VERSION == "15") {
1376-
UBERJAR_RESOURCE=$UBERJAR15_RESOURCE_GLOBAL
1377-
}
13781363
when ($JDK_REAL_VERSION == "11") {
13791364
UBERJAR_RESOURCE=$UBERJAR11_RESOURCE_GLOBAL
13801365
}
@@ -1393,9 +1378,6 @@ when ($JDK_REAL_VERSION == "20") {
13931378
when ($JDK_REAL_VERSION == "17") {
13941379
WITH_JDK_RESOURCE=$WITH_JDK17_RESOURCE_GLOBAL
13951380
}
1396-
when ($JDK_REAL_VERSION == "15") {
1397-
WITH_JDK_RESOURCE=$WITH_JDK15_RESOURCE_GLOBAL
1398-
}
13991381
when ($JDK_REAL_VERSION == "11") {
14001382
WITH_JDK_RESOURCE=$WITH_JDK11_RESOURCE_GLOBAL
14011383
}
@@ -1745,7 +1727,6 @@ macro ADD_DLLS_TO_JAR() {
17451727
# tag:java-specific
17461728
MANAGED_PEERS=
17471729
MANAGED_PEERS_CLOSURE=
1748-
RUN_JAVA_PROGRAM_MANAGED=
17491730
MANAGEABLE_PEERS_ROOTS=contrib/java
17501731
HAS_MANAGEABLE_PEERS=no
17511732
PROPAGATES_MANAGEABLE_PEERS=no

‎build/conf/licenses.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,6 @@
365365
"default": [
366366
"Service-Default-License",
367367
"Service-Dll-Harness",
368-
"Service-Prebuilt-Tool",
369368
"Service-Py23-Proxy",
370369
"Service-Unknown-License-Java"
371370
]

‎build/config/tests/cpp_style/config.clang-format

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ SortIncludes: false
8484
IndentPPDirectives: BeforeHash
8585

8686
SpaceBeforeInheritanceColon: false
87-
NamespaceMacros: [Y_UNIT_TEST_SUITE, Y_UNIT_TEST]
87+
NamespaceMacros: [Y_UNIT_TEST_SUITE]
8888
AttributeMacros: [Y_PRINTF_FORMAT, Y_NO_SANITIZE, Y_FORCE_INLINE, Y_NO_INLINE, Y_WARN_UNUSED_RESULT, Y_HIDDEN, Y_PUBLIC, Y_PURE_FUNCTION]
8989
IndentExternBlock: Indent
9090
TypenameMacros: [Y_THREAD, Y_STATIC_THREAD, Y_POD_THREAD, Y_POD_STATIC_THREAD]

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"by_platform": {
33
"darwin": {
4-
"uri": "sbr:6959220365"
4+
"uri": "sbr:6976467840"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:6959217204"
7+
"uri": "sbr:6976467045"
88
},
99
"linux": {
10-
"uri": "sbr:6959225691"
10+
"uri": "sbr:6976469309"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:6959214449"
13+
"uri": "sbr:6976466498"
1414
},
1515
"win32-clang-cl": {
16-
"uri": "sbr:6959223374"
16+
"uri": "sbr:6976468552"
1717
}
1818
}
1919
}

‎build/external_resources/ymake/resources.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"by_platform": {
33
"darwin": {
4-
"uri": "sbr:6959209660"
4+
"uri": "sbr:6976470248"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:6959207343"
7+
"uri": "sbr:6976469418"
88
},
99
"linux": {
10-
"uri": "sbr:6960956636"
10+
"uri": "sbr:6976471430"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:6959205082"
13+
"uri": "sbr:6976468560"
1414
},
1515
"win32-clang-cl": {
16-
"uri": "sbr:6959211457"
16+
"uri": "sbr:6976470807"
1717
}
1818
}
1919
}

‎build/mapping.conf.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,7 @@
525525
"6888066924": "https://devtools-registry.s3.yandex.net/6888066924",
526526
"6937600791": "https://devtools-registry.s3.yandex.net/6937600791",
527527
"6959220365": "https://devtools-registry.s3.yandex.net/6959220365",
528+
"6976467840": "https://devtools-registry.s3.yandex.net/6976467840",
528529
"5766171800": "https://devtools-registry.s3.yandex.net/5766171800",
529530
"5805430761": "https://devtools-registry.s3.yandex.net/5805430761",
530531
"5829025456": "https://devtools-registry.s3.yandex.net/5829025456",
@@ -559,6 +560,7 @@
559560
"6888066560": "https://devtools-registry.s3.yandex.net/6888066560",
560561
"6937600701": "https://devtools-registry.s3.yandex.net/6937600701",
561562
"6959217204": "https://devtools-registry.s3.yandex.net/6959217204",
563+
"6976467045": "https://devtools-registry.s3.yandex.net/6976467045",
562564
"5766173070": "https://devtools-registry.s3.yandex.net/5766173070",
563565
"5805432830": "https://devtools-registry.s3.yandex.net/5805432830",
564566
"5829031598": "https://devtools-registry.s3.yandex.net/5829031598",
@@ -593,6 +595,7 @@
593595
"6888067594": "https://devtools-registry.s3.yandex.net/6888067594",
594596
"6937601032": "https://devtools-registry.s3.yandex.net/6937601032",
595597
"6959225691": "https://devtools-registry.s3.yandex.net/6959225691",
598+
"6976469309": "https://devtools-registry.s3.yandex.net/6976469309",
596599
"5766171341": "https://devtools-registry.s3.yandex.net/5766171341",
597600
"5805430188": "https://devtools-registry.s3.yandex.net/5805430188",
598601
"5829023352": "https://devtools-registry.s3.yandex.net/5829023352",
@@ -627,6 +630,7 @@
627630
"6888066108": "https://devtools-registry.s3.yandex.net/6888066108",
628631
"6937600548": "https://devtools-registry.s3.yandex.net/6937600548",
629632
"6959214449": "https://devtools-registry.s3.yandex.net/6959214449",
633+
"6976466498": "https://devtools-registry.s3.yandex.net/6976466498",
630634
"5766172695": "https://devtools-registry.s3.yandex.net/5766172695",
631635
"5805432230": "https://devtools-registry.s3.yandex.net/5805432230",
632636
"5829029743": "https://devtools-registry.s3.yandex.net/5829029743",
@@ -661,6 +665,7 @@
661665
"6888067214": "https://devtools-registry.s3.yandex.net/6888067214",
662666
"6937600896": "https://devtools-registry.s3.yandex.net/6937600896",
663667
"6959223374": "https://devtools-registry.s3.yandex.net/6959223374",
668+
"6976468552": "https://devtools-registry.s3.yandex.net/6976468552",
664669
"4307890075": "https://devtools-registry.s3.yandex.net/4307890075",
665670
"5517245192": "https://devtools-registry.s3.yandex.net/5517245192",
666671
"4307901240": "https://devtools-registry.s3.yandex.net/4307901240",
@@ -734,6 +739,9 @@
734739
"6956610092": "https://devtools-registry.s3.yandex.net/6956610092",
735740
"6957903888": "https://devtools-registry.s3.yandex.net/6957903888",
736741
"6391354461": "https://devtools-registry.s3.yandex.net/6391354461",
742+
"6990868751": "https://devtools-registry.s3.yandex.net/6990868751",
743+
"6990860705": "https://devtools-registry.s3.yandex.net/6990860705",
744+
"6990881789": "https://devtools-registry.s3.yandex.net/6990881789",
737745
"3167009386": "https://devtools-registry.s3.yandex.net/3167009386",
738746
"3050798466": "https://devtools-registry.s3.yandex.net/3050798466",
739747
"3064614561": "https://devtools-registry.s3.yandex.net/3064614561",
@@ -1352,6 +1360,7 @@
13521360
"6888066924": "devtools/ymake/bin/ymake for darwin",
13531361
"6937600791": "devtools/ymake/bin/ymake for darwin",
13541362
"6959220365": "devtools/ymake/bin/ymake for darwin",
1363+
"6976467840": "devtools/ymake/bin/ymake for darwin",
13551364
"5766171800": "devtools/ymake/bin/ymake for darwin-arm64",
13561365
"5805430761": "devtools/ymake/bin/ymake for darwin-arm64",
13571366
"5829025456": "devtools/ymake/bin/ymake for darwin-arm64",
@@ -1386,6 +1395,7 @@
13861395
"6888066560": "devtools/ymake/bin/ymake for darwin-arm64",
13871396
"6937600701": "devtools/ymake/bin/ymake for darwin-arm64",
13881397
"6959217204": "devtools/ymake/bin/ymake for darwin-arm64",
1398+
"6976467045": "devtools/ymake/bin/ymake for darwin-arm64",
13891399
"5766173070": "devtools/ymake/bin/ymake for linux",
13901400
"5805432830": "devtools/ymake/bin/ymake for linux",
13911401
"5829031598": "devtools/ymake/bin/ymake for linux",
@@ -1420,6 +1430,7 @@
14201430
"6888067594": "devtools/ymake/bin/ymake for linux",
14211431
"6937601032": "devtools/ymake/bin/ymake for linux",
14221432
"6959225691": "devtools/ymake/bin/ymake for linux",
1433+
"6976469309": "devtools/ymake/bin/ymake for linux",
14231434
"5766171341": "devtools/ymake/bin/ymake for linux-aarch64",
14241435
"5805430188": "devtools/ymake/bin/ymake for linux-aarch64",
14251436
"5829023352": "devtools/ymake/bin/ymake for linux-aarch64",
@@ -1454,6 +1465,7 @@
14541465
"6888066108": "devtools/ymake/bin/ymake for linux-aarch64",
14551466
"6937600548": "devtools/ymake/bin/ymake for linux-aarch64",
14561467
"6959214449": "devtools/ymake/bin/ymake for linux-aarch64",
1468+
"6976466498": "devtools/ymake/bin/ymake for linux-aarch64",
14571469
"5766172695": "devtools/ymake/bin/ymake for win32-clang-cl",
14581470
"5805432230": "devtools/ymake/bin/ymake for win32-clang-cl",
14591471
"5829029743": "devtools/ymake/bin/ymake for win32-clang-cl",
@@ -1488,6 +1500,7 @@
14881500
"6888067214": "devtools/ymake/bin/ymake for win32-clang-cl",
14891501
"6937600896": "devtools/ymake/bin/ymake for win32-clang-cl",
14901502
"6959223374": "devtools/ymake/bin/ymake for win32-clang-cl",
1503+
"6976468552": "devtools/ymake/bin/ymake for win32-clang-cl",
14911504
"4307890075": "flake8_linter for linux",
14921505
"5517245192": "flake8_linter for linux",
14931506
"4307901240": "flake8_linter for linux-aarch64",
@@ -1561,6 +1574,9 @@
15611574
"6956610092": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz",
15621575
"6957903888": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz",
15631576
"6391354461": "none-none-none-result_resources/protoc-linux-x86_64.tgz",
1577+
"6990868751": "none-none-none-sandbox/backup/3527d100-e2d0-4b0e-bb7a-905010853d98/yfm-docs.tar",
1578+
"6990860705": "none-none-none-sandbox/backup/d386643e-58f8-43e1-8760-341d73801df8/yfm-docs.tar",
1579+
"6990881789": "none-none-none-sandbox/backup/efc428e5-52a5-4a6f-8f0c-53f1d255efea/yfm-docs.tar",
15641580
"3167009386": "openjdk 11.0.15 vanilla for darwin",
15651581
"3050798466": "openjdk 11.0.15 vanilla for darwin-arm64",
15661582
"3064614561": "openjdk 11.0.15 vanilla for linux",

‎build/platform/java/jdk/jdk15/jdk.json

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎build/platform/java/jdk/jdk15/ya.make

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎build/platform/java/jdk/ya.make

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ ELSEIF(JDK_REAL_VERSION == "20")
1515
ELSEIF(JDK_REAL_VERSION == "17")
1616
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk17/jdk.json)
1717
SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk17/jdk.json)
18-
ELSEIF(JDK_REAL_VERSION == "15")
19-
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk15/jdk.json)
20-
SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk15/jdk.json)
2118
ELSEIF(JDK_REAL_VERSION == "11")
2219
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK_DEFAULT jdk11/jdk.json)
2320
SET_RESOURCE_URI_FROM_JSON(WITH_JDK_URI jdk11/jdk.json)
@@ -33,7 +30,6 @@ END()
3330

3431
RECURSE(
3532
jdk11
36-
jdk15
3733
jdk17
3834
jdk20
3935
jdk21

‎build/platform/lld/ya.make

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
RESOURCES_LIBRARY()
22

3-
LICENSE(Service-Prebuilt-Tool)
4-
53
DEFAULT(LLD_VERSION ${CLANG_VER})
64

5+
TOOLCHAIN(lld)
6+
VERSION(${LLD_VERSION})
7+
78
IF (LLD_VERSION == 14)
89
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(LLD_ROOT lld14.json)
910
ELSE()

‎build/platform/yfm/ya.make

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ ENDIF()
66

77
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
88
YFM_TOOL
9-
sbr:6662972834 FOR DARWIN-ARM64
10-
sbr:6662972834 FOR DARWIN
11-
sbr:6662965433 FOR LINUX
12-
sbr:6662980150 FOR WIN32
9+
sbr:6990868751 FOR DARWIN-ARM64
10+
sbr:6990868751 FOR DARWIN
11+
sbr:6990860705 FOR LINUX
12+
sbr:6990881789 FOR WIN32
1313
)
1414

1515
END()

‎build/plugins/_dart_fields.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -993,7 +993,6 @@ def normalized(cls, unit, flat_args, spec_args):
993993
@classmethod
994994
def test_srcs(cls, unit, flat_args, spec_args):
995995
test_files = get_values_list(unit, 'TEST_SRCS_VALUE')
996-
test_files = _resolve_module_files(unit, unit.get("MODDIR"), test_files)
997996
return {cls.KEY: serialize_list(test_files)}
998997

999998
@classmethod

‎build/plugins/java.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def onjava_module(unit, *args):
7575
'ANNOTATION_PROCESSOR': extract_macro_calls(unit, 'ANNOTATION_PROCESSOR_VALUE', args_delim),
7676
'EXTERNAL_JAR': extract_macro_calls(unit, 'EXTERNAL_JAR_VALUE', args_delim),
7777
'RUN_JAVA_PROGRAM': [],
78-
'RUN_JAVA_PROGRAM_MANAGED': '${RUN_JAVA_PROGRAM_MANAGED}',
78+
'RUN_JAVA_PROGRAM_MANAGED': '',
7979
'MAVEN_GROUP_ID': extract_macro_calls(unit, 'MAVEN_GROUP_ID_VALUE', args_delim),
8080
'JAR_INCLUDE_FILTER': extract_macro_calls(unit, 'JAR_INCLUDE_FILTER_VALUE', args_delim),
8181
'JAR_EXCLUDE_FILTER': extract_macro_calls(unit, 'JAR_EXCLUDE_FILTER_VALUE', args_delim),
@@ -100,7 +100,6 @@ def onjava_module(unit, *args):
100100
'JDK_RESOURCE': 'JDK' + (unit.get('JDK_VERSION') or unit.get('JDK_REAL_VERSION') or '_DEFAULT'),
101101
}
102102
if unit.get('ENABLE_PREVIEW_VALUE') == 'yes' and (unit.get('JDK_VERSION') or unit.get('JDK_REAL_VERSION')) in (
103-
'15',
104103
'17',
105104
'20',
106105
'21',
@@ -372,7 +371,6 @@ def on_jdk_version_macro_check(unit, *args):
372371
jdk_version = args[0]
373372
available_versions = (
374373
'11',
375-
'15',
376374
'17',
377375
'20',
378376
'21',

‎build/plugins/lib/nots/package_manager/base/lockfile.py

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,17 @@
44
from six import add_metaclass
55

66

7+
class LockfilePackageMetaInvalidError(RuntimeError):
8+
pass
9+
10+
11+
def is_tarball_url_valid(tarball_url):
12+
if not tarball_url.startswith("https://") and not tarball_url.startswith("http://"):
13+
return True
14+
15+
return tarball_url.startswith("https://npm.yandex-team.ru/") or tarball_url.startswith("http://npm.yandex-team.ru/")
16+
17+
718
class LockfilePackageMeta(object):
819
"""
920
Basic struct representing package meta from lockfile.
@@ -16,6 +27,11 @@ def from_str(s):
1627
return LockfilePackageMeta(*s.strip().split(" "))
1728

1829
def __init__(self, key, tarball_url, sky_id, integrity, integrity_algorithm):
30+
if not is_tarball_url_valid(tarball_url):
31+
raise LockfilePackageMetaInvalidError(
32+
"tarball can only point to npm.yandex-team.ru, got {}".format(tarball_url)
33+
)
34+
1935
# http://npm.yandex-team.ru/@scope%2fname/-/name-0.0.1.tgz
2036
parts = tarball_url.split("/")
2137

@@ -37,10 +53,6 @@ def to_uri(self):
3753
return pkg_uri
3854

3955

40-
class LockfilePackageMetaInvalidError(RuntimeError):
41-
pass
42-
43-
4456
@add_metaclass(ABCMeta)
4557
class BaseLockfile(object):
4658
@classmethod

0 commit comments

Comments
 (0)