Skip to content

Commit 9b567af

Browse files
alexv-smirnovrobot-piglethiddenpathbulatmanolegsidorkin
authored
Library import 240819-0942 (#7994)
Co-authored-by: robot-piglet <robot-piglet@yandex-team.com> Co-authored-by: hiddenpath <hiddenpath@yandex-team.com> Co-authored-by: bulatman <bulatman@yandex-team.com> Co-authored-by: robot-contrib <robot-contrib@yandex-team.com> Co-authored-by: osidorkin <osidorkin@yandex-team.com> Co-authored-by: akhropov <akhropov@yandex-team.com> Co-authored-by: akozhikhov <akozhikhov@yandex-team.com> Co-authored-by: orlovorlov <orlovorlov@yandex-team.com> Co-authored-by: babenko <babenko@yandex-team.com> Co-authored-by: shadchin <shadchin@yandex-team.com> Co-authored-by: dmasloff <dmasloff@yandex-team.com> Co-authored-by: aleksei-le <aleksei-le@yandex-team.com> Co-authored-by: coteeq <coteeq@yandex-team.com> Co-authored-by: dimdim11 <dimdim11@yandex-team.com> Co-authored-by: robot-ya-builder <robot-ya-builder@yandex-team.com> Co-authored-by: iaz1607 <iaz1607@yandex-team.com>
1 parent 47bd121 commit 9b567af

File tree

1,072 files changed

+26183
-25471
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

+26183
-25471
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,5 +89,5 @@ AttributeMacros: [Y_PRINTF_FORMAT, Y_NO_SANITIZE, Y_FORCE_INLINE, Y_NO_INLINE, Y
8989
IndentExternBlock: Indent
9090
TypenameMacros: [Y_THREAD, Y_STATIC_THREAD, Y_POD_THREAD, Y_POD_STATIC_THREAD]
9191
SpacesInLineCommentPrefix:
92-
Minimum: 0
93-
Maximum: -1
92+
Minimum: 1
93+
Maximum: 1

‎build/export_generators/cmake/conan_imports.jinja

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,29 @@
55
{%- set srcdir_and_mask = rsplit(search, ",", 2) -%}
66
{%- set srcdir = srcdir_and_mask[0]|trim -%}
77
{%- set mask = srcdir_and_mask[1]|trim -%}
8-
{%- if use_conan2 %}
9-
{{ shift }}copy(self, pattern="{{ mask }}", src=dep.cpp_info.bindirs[0], dst=self.build_folder + "../../../../{{ dstdir }}")
8+
{%- if use_conan2 -%}
9+
{%- if "bin" in srcdir %}
10+
for bindir in dep.cpp_info.bindirs:
11+
{{ shift }}copy(self, pattern="{{ mask }}", src=bindir, dst=self.build_folder + "../../../../{{ dstdir }}")
12+
{%- elif "res" in srcdir %}
13+
for resdir in dep.cpp_info.resdirs:
14+
{{ shift }}copy(self, pattern="{{ mask }}", src=resdir, dst=self.build_folder + "../../../../{{ dstdir }}")
15+
{%- elif "build" in srcdir %}
16+
for builddir in dep.cpp_info.builddirs:
17+
{{ shift }}copy(self, pattern="{{ mask }}", src=builddir, dst=self.build_folder + "../../../../{{ dstdir }}")
18+
{%- elif ("src" in srcdir) or ("source" in srcdir) %}
19+
for srcdir in dep.cpp_info.srcdirs:
20+
{{ shift }}copy(self, pattern="{{ mask }}", src=srcdir, dst=self.build_folder + "../../../../{{ dstdir }}")
21+
{%- elif "lib" in srcdir %}
22+
for libdir in dep.cpp_info.libdirs:
23+
{{ shift }}copy(self, pattern="{{ mask }}", src=libdir, dst=self.build_folder + "../../../../{{ dstdir }}")
24+
{%- elif "include" in srcdir %}
25+
for includedir in dep.cpp_info.includedirs:
26+
{{ shift }}copy(self, pattern="{{ mask }}", src=includedir, dst=self.build_folder + "../../../../{{ dstdir }}")
27+
{%- elif "frame" in srcdir %}
28+
for framedir in dep.cpp_info.frameworkdirs:
29+
{{ shift }}copy(self, pattern="{{ mask }}", src=framedir, dst=self.build_folder + "../../../../{{ dstdir }}")
30+
{%- endif -%}
1031
{%- else %}
1132
{{ shift }}self.copy(pattern="{{ mask }}", src="{{ srcdir }}", dst="{{ dstdir }}")
1233
{%- endif -%}

‎build/export_generators/cmake/conanfile.py.jinja

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ class App(ConanFile):
7575
{%- endfor %}
7676

7777
for dep in self.dependencies.values():
78-
if dep.cpp_info.bindirs:
7978
{%- if conan.imports|length -%}
8079
{%- set conan_imports = conan.imports -%}
8180
{%- set shift = "" -%}

‎build/mapping.conf.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,14 +196,19 @@
196196
"5841616607": "https://devtools-registry.s3.yandex.net/5841616607",
197197
"6255592114": "https://devtools-registry.s3.yandex.net/6255592114",
198198
"6607396810": "https://devtools-registry.s3.yandex.net/6607396810",
199+
"6892424874": "https://devtools-registry.s3.yandex.net/6892424874",
199200
"6255591964": "https://devtools-registry.s3.yandex.net/6255591964",
200201
"6607396320": "https://devtools-registry.s3.yandex.net/6607396320",
202+
"6892424539": "https://devtools-registry.s3.yandex.net/6892424539",
201203
"6255592465": "https://devtools-registry.s3.yandex.net/6255592465",
202204
"6607397946": "https://devtools-registry.s3.yandex.net/6607397946",
205+
"6892425499": "https://devtools-registry.s3.yandex.net/6892425499",
203206
"6255592313": "https://devtools-registry.s3.yandex.net/6255592313",
204207
"6607397279": "https://devtools-registry.s3.yandex.net/6607397279",
208+
"6892425185": "https://devtools-registry.s3.yandex.net/6892425185",
205209
"6255591839": "https://devtools-registry.s3.yandex.net/6255591839",
206210
"6607395742": "https://devtools-registry.s3.yandex.net/6607395742",
211+
"6892424070": "https://devtools-registry.s3.yandex.net/6892424070",
207212
"5786827409": "https://devtools-registry.s3.yandex.net/5786827409",
208213
"5786826723": "https://devtools-registry.s3.yandex.net/5786826723",
209214
"5786828167": "https://devtools-registry.s3.yandex.net/5786828167",
@@ -369,6 +374,8 @@
369374
"6815696206": "https://devtools-registry.s3.yandex.net/6815696206",
370375
"6859343013": "https://devtools-registry.s3.yandex.net/6859343013",
371376
"6859350577": "https://devtools-registry.s3.yandex.net/6859350577",
377+
"6892341406": "https://devtools-registry.s3.yandex.net/6892341406",
378+
"6892348074": "https://devtools-registry.s3.yandex.net/6892348074",
372379
"5486731632": "https://devtools-registry.s3.yandex.net/5486731632",
373380
"5514350352": "https://devtools-registry.s3.yandex.net/5514350352",
374381
"5514360398": "https://devtools-registry.s3.yandex.net/5514360398",
@@ -964,14 +971,19 @@
964971
"5841616607": "contrib/tools/protoc/bin/protoc for linux",
965972
"6255592114": "contrib/tools/python3/bin/python3 for darwin",
966973
"6607396810": "contrib/tools/python3/bin/python3 for darwin",
974+
"6892424874": "contrib/tools/python3/bin/python3 for darwin",
967975
"6255591964": "contrib/tools/python3/bin/python3 for darwin-arm64",
968976
"6607396320": "contrib/tools/python3/bin/python3 for darwin-arm64",
977+
"6892424539": "contrib/tools/python3/bin/python3 for darwin-arm64",
969978
"6255592465": "contrib/tools/python3/bin/python3 for linux",
970979
"6607397946": "contrib/tools/python3/bin/python3 for linux",
980+
"6892425499": "contrib/tools/python3/bin/python3 for linux",
971981
"6255592313": "contrib/tools/python3/bin/python3 for linux-aarch64",
972982
"6607397279": "contrib/tools/python3/bin/python3 for linux-aarch64",
983+
"6892425185": "contrib/tools/python3/bin/python3 for linux-aarch64",
973984
"6255591839": "contrib/tools/python3/bin/python3 for win32",
974985
"6607395742": "contrib/tools/python3/bin/python3 for win32",
986+
"6892424070": "contrib/tools/python3/bin/python3 for win32",
975987
"5786827409": "contrib/tools/python3/python3 for darwin",
976988
"5786826723": "contrib/tools/python3/python3 for darwin-arm64",
977989
"5786828167": "contrib/tools/python3/python3 for linux",
@@ -1137,6 +1149,8 @@
11371149
"6815696206": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
11381150
"6859343013": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
11391151
"6859350577": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
1152+
"6892341406": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
1153+
"6892348074": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
11401154
"5486731632": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
11411155
"5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
11421156
"5514360398": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",

‎build/platform/python/ymake_python3/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:6607396810"
4+
"uri": "sbr:6892424874"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:6607396320"
7+
"uri": "sbr:6892424539"
88
},
99
"linux": {
10-
"uri": "sbr:6607397946"
10+
"uri": "sbr:6892425499"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:6607397279"
13+
"uri": "sbr:6892425185"
1414
},
1515
"win32": {
16-
"uri": "sbr:6607395742"
16+
"uri": "sbr:6892424070"
1717
}
1818
}
1919
}

‎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:6859341560)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6892340424)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6859340618)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6892339701)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6859343013)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6892341406)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6859339878)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6892339194)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6859342250)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6892340947)
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:6859349354)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6892347071)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6859348596)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6892346489)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6859350577)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6892348074)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6859347658)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6892345742)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6859349912)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6892347590)
1111

1212
ENDIF()

‎build/plugins/lib/test_const/__init__.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
# coding: utf-8
22
import re
33

4+
TEST_BT_COLORS = {
5+
"function_name": "[[alt1]]",
6+
"function_arg": "[[good]]",
7+
"stack_frame": "[[bad]]",
8+
"thread_prefix": "[[alt3]]",
9+
"thread_id": "[[bad]]",
10+
"file_path": "[[warn]]",
11+
"line_num": "[[alt2]]",
12+
"address": "[[unimp]]",
13+
}
414

515
RESTART_TEST_INDICATOR = '##restart-test##'
616
INFRASTRUCTURE_ERROR_INDICATOR = '##infrastructure-error##'

‎build/scripts/link_dyn_lib.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,6 @@ def parse_args():
212212
parser.add_option('--soname')
213213
parser.add_option('--source-root')
214214
parser.add_option('--build-root')
215-
parser.add_option('--fix-elf')
216215
parser.add_option('--linker-output')
217216
parser.add_option('--musl', action='store_true')
218217
parser.add_option('--dynamic-cuda', action='store_true')
@@ -268,16 +267,6 @@ def parse_args():
268267
print >> sys.stderr, 'linker command:', shlex_join(cmd)
269268
sys.exit(proc.returncode)
270269

271-
if opts.fix_elf:
272-
cmd = [opts.fix_elf, opts.target]
273-
proc = subprocess.Popen(cmd, shell=False, stderr=sys.stderr, stdout=sys.stdout)
274-
proc.communicate()
275-
276-
if proc.returncode:
277-
print >> sys.stderr, 'fix_elf has failed with retcode:', proc.returncode
278-
print >> sys.stderr, 'fix_elf command:', shlex_join(cmd)
279-
sys.exit(proc.returncode)
280-
281270
if opts.soname and opts.soname != opts.target:
282271
if os.path.exists(opts.soname):
283272
os.unlink(opts.soname)

‎contrib/libs/apache/orc/c++/include/orc/orc-config.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#ifndef ORC_CONFIG_HH
2020
#define ORC_CONFIG_HH
2121

22-
#define ORC_VERSION "2.0.1"
22+
#define ORC_VERSION "2.0.2"
2323

2424
#define ORC_CXX_HAS_CSTDINT
2525

0 commit comments

Comments
 (0)