Skip to content

Commit 60e718d

Browse files
alexv-smirnovalexv-smirnov
committed
Merge branch 'rightlib' into merge-libs-250627-0050
2 parents b62fed9 + ba5dde7 commit 60e718d

File tree

1,058 files changed

+27529
-30583
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,058 files changed

+27529
-30583
lines changed

‎build/export_generators/cmake/dir_targets.jinja

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44
{%- set args = list_of_dict|selectattr(macro_field, 'eq', macro)|map(attribute=args_field)|sum -%}
55
{%- if args|length %}
66
{{ macro }}({{ target_name }}{{ macro_suffix }}
7-
{%- for arg in args %}
7+
{%- for arg in args -%}
8+
{%- if ('"' in arg) and (arg[0] != '"') %}
9+
[=[{{ arg }}]=]
10+
{%- else %}
811
{{ arg }}
12+
{%- endif -%}
913
{%- endfor %}
1014
)
1115
{% endif %}

‎build/external_resources/go_tools/ya.make

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ TOOLCHAIN(go)
55
IF(GOSTD_VERSION == 1.23)
66
VERSION(1.23)
77
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(GO_TOOLS go1.23.json)
8+
ELSEIF(GOSTD_VERSION == 1.24)
9+
VERSION(1.24)
10+
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(GO_TOOLS go1.24.json)
11+
ELSEIF(GOSTD_VERSION == 1.25)
12+
VERSION(1.25)
13+
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(GO_TOOLS go1.25.json)
814
ELSE()
915
MESSAGE(FATAL_ERROR Unsupported version [${GOSTD_VERSION}] of Go Standard Library)
1016
ENDIF()

‎build/mapping.conf.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,7 @@
571571
"8944928850": "{registry_endpoint}/8944928850",
572572
"8980584272": "{registry_endpoint}/8980584272",
573573
"9029509511": "{registry_endpoint}/9029509511",
574+
"9059000402": "{registry_endpoint}/9059000402",
574575
"5486731632": "{registry_endpoint}/5486731632",
575576
"5514350352": "{registry_endpoint}/5514350352",
576577
"5514360398": "{registry_endpoint}/5514360398",
@@ -2072,6 +2073,7 @@
20722073
"8944928850": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
20732074
"8980584272": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
20742075
"9029509511": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
2076+
"9059000402": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
20752077
"5486731632": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
20762078
"5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
20772079
"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:9029515707)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9059043122)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9029513855)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9059040296)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9029519042)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9059050710)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9029512688)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9059037599)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9029517384)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9059047042)
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:9029506769)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9058995494)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9029504959)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9058993203)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9029509511)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9059000402)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9029503739)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9058991328)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9029508202)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9058997687)
1111

1212
ENDIF()

‎contrib/libs/icu/.yandex_meta/__init__.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,23 @@
66
from devtools.yamaker.project import NixProject
77

88

9+
def _get_major_version(version: str) -> str:
10+
return version.split('.')[0]
11+
12+
913
def post_build(self):
1014
# copying icudt.dat file from original repository
11-
icu_dat_path = f"{self.srcdir}/data/in/icudt76l.dat"
12-
rodata_path = f"{self.dstdir}/icudt76_dat.rodata"
15+
major_version = _get_major_version(self.version)
16+
icu_dat_path = f"{self.srcdir}/data/in/icudt{major_version}l.dat"
17+
rodata_path = f"{self.dstdir}/icudt{major_version}_dat.rodata"
1318
shutil.copy(icu_dat_path, rodata_path)
1419

1520

1621
def post_install(self):
1722
result_target = self.yamakes["."]
1823

19-
result_target.SRCS.add("icudt76_dat.rodata")
24+
major_version = _get_major_version(self.version)
25+
result_target.SRCS.add(f"icudt{major_version}_dat.rodata")
2026

2127
result_target.CFLAGS = [
2228
"-DU_COMMON_IMPLEMENTATION",
@@ -84,7 +90,7 @@ def post_install(self):
8490
"g:cpp-contrib",
8591
],
8692
arcdir="contrib/libs/icu",
87-
nixattr="icu74",
93+
nixattr="icu",
8894
put_with={
8995
"icuio": [
9096
"icuuc",

‎contrib/libs/icu/.yandex_meta/devtools.copyrights.report

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,17 @@ BELONGS ya.make
336336
Files with this license:
337337
readme.html [7:10]
338338

339+
KEEP COPYRIGHT_SERVICE_LABEL 15a10786a52ce6e33763c52348c47981
340+
BELONGS ya.make
341+
License text:
342+
Copyright © 2016-2025 Unicode, Inc.
343+
Scancode info:
344+
Original SPDX id: COPYRIGHT_SERVICE_LABEL
345+
Score : 100.00
346+
Match type : COPYRIGHT
347+
Files with this license:
348+
LICENSE [5:5]
349+
339350
KEEP COPYRIGHT_SERVICE_LABEL 15d83207399227b14a1044b1cba00a64
340351
BELONGS ya.make
341352
License text:
@@ -761,17 +772,6 @@ BELONGS ya.make
761772
include/unicode/selfmt.h [4:6]
762773
include/unicode/umsg.h [4:6]
763774

764-
KEEP COPYRIGHT_SERVICE_LABEL 2a4e27e8d5d46fb305aaa9ee946c9903
765-
BELONGS ya.make
766-
License text:
767-
Copyright © 2016-2024 Unicode, Inc.
768-
Scancode info:
769-
Original SPDX id: COPYRIGHT_SERVICE_LABEL
770-
Score : 100.00
771-
Match type : COPYRIGHT
772-
Files with this license:
773-
LICENSE [5:5]
774-
775775
KEEP COPYRIGHT_SERVICE_LABEL 2b694c7444010b1b84ed2710400fe3ef
776776
BELONGS ya.make
777777
Note: matched license text is too long. Read it in the source files.
@@ -3450,7 +3450,7 @@ BELONGS ya.make
34503450
Score : 100.00
34513451
Match type : COPYRIGHT
34523452
Files with this license:
3453-
i18n/messageformat2.cpp [523:525]
3453+
i18n/messageformat2.cpp [505:507]
34543454

34553455
KEEP COPYRIGHT_SERVICE_LABEL a021d3bd6d6cbb97cbccc0ab1586c491
34563456
BELONGS ya.make
@@ -3840,7 +3840,7 @@ BELONGS ya.make
38403840
Score : 100.00
38413841
Match type : COPYRIGHT
38423842
Files with this license:
3843-
APIChangeReport.html [1173:1175]
3843+
APIChangeReport.html [566:568]
38443844

38453845
KEEP COPYRIGHT_SERVICE_LABEL c1b7297fc443f46a1d1de36f8b788822
38463846
BELONGS ya.make
@@ -4354,7 +4354,7 @@ BELONGS ya.make
43544354
Score : 100.00
43554355
Match type : COPYRIGHT
43564356
Files with this license:
4357-
i18n/messageformat2.cpp [581:591]
4357+
i18n/messageformat2.cpp [563:573]
43584358

43594359
KEEP COPYRIGHT_SERVICE_LABEL eed7e8b3d80757822970ac3a50dd6716
43604360
BELONGS ya.make

‎contrib/libs/icu/.yandex_meta/devtools.licenses.report

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
# FILE_IGNORE - ignore file (do nothing)
2929
# FILE_INCLUDE - include all file data into licenses text file
3030
# =======================
31-
IGNORE_FILES icudt76_dat.rodata
31+
IGNORE_FILES icudt77_dat.rodata
3232

3333
KEEP Unicode 0285f1da3a441f34fd441c30fe7aa87e
3434
BELONGS ya.make
@@ -111,7 +111,7 @@ BELONGS ya.make
111111
Match type : INTRO
112112
Links : https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/free-unknown.LICENSE
113113
Files with this license:
114-
i18n/messageformat2_parser.cpp [338:338]
114+
i18n/messageformat2_parser.cpp [585:585]
115115

116116
KEEP MIT 399584035c417b91040964779555dfac
117117
BELONGS ya.make
@@ -1217,7 +1217,7 @@ BELONGS ya.make
12171217
Match type : REFERENCE
12181218
Links : http://unicode.org/, http://unicode.org/copyright.html, https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/unicode.LICENSE
12191219
Files with this license:
1220-
APIChangeReport.html [1175:1175]
1220+
APIChangeReport.html [568:568]
12211221

12221222
KEEP BSD-3-Clause 8324f1990c82a65667a0b4767115a5fa
12231223
BELONGS ya.make

‎contrib/libs/icu/.yandex_meta/licenses.list.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
205205
// 5iii(c)(a). Assert that `key` is a literal.
206206
// (Not needed)
207207
// 5iii(c)(b). Let `ks` be the resolved value of `key`.
208-
UnicodeString ks = key.asLiteral().unquoted();
208+
UnicodeString ks = normalizeNFC(key.asLiteral().unquoted());
209209
// 5iii(c)(c) Let matchpref be the integer position of ks in `matches`.
210210
matchpref = vectorFind(matches, ks);
211211
U_ASSERT(matchpref >= 0);
@@ -1355,7 +1355,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
13551355

13561356

13571357
====================COPYRIGHT====================
1358-
<i><font size="-1">Contents generated by StableAPI tool on Mon Sep 30 11:33:51 PDT 2024<br>
1358+
<i><font size="-1">Contents generated by StableAPI tool on Wed Feb 19 16:09:53 PST 2025<br>
13591359
Copyright &copy; 2017 and later: Unicode, Inc. and others.<br>
13601360
License &amp; terms of use: http://www.unicode.org/copyright.html
13611361

@@ -1383,7 +1383,7 @@ Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
13831383

13841384

13851385
====================COPYRIGHT====================
1386-
Copyright © 2016-2024 Unicode, Inc.
1386+
Copyright © 2016-2025 Unicode, Inc.
13871387

13881388

13891389
====================Custom-punycode====================

‎contrib/libs/icu/.yandex_meta/override.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
self: super: with self; rec {
2-
version = "76.1";
2+
version = "77.1";
33
version_dash = "${lib.replaceStrings [ "." ] [ "-" ] version}";
44
version_us = "${lib.replaceStrings [ "." ] [ "_" ] version}";
55

66
src = fetchurl {
77
url = "https://github.com/unicode-org/icu/releases/download/release-${version_dash}/icu4c-${version_us}-src.tgz";
8-
hash = "sha256-36y0a/5HR0EEcs4+EUS/KKEC/uqk44dbrJtMbPMPTz4=";
8+
hash = "sha256-WI5DH3cyfDkDH/u4hDwOO8EiwhE3RIX6h9xfP6/yQGE=";
99
};
1010

1111
sourceRoot = "icu/source";

0 commit comments

Comments
 (0)