Skip to content

Commit e04e58d

Browse files
maximyurchukmaximyurchuk
authored
Merge pull request #12236 from ydb-platform/mergelibs-241203-0816
Library import 241203-0816
2 parents 7186c0a + 96db4e2 commit e04e58d

File tree

102 files changed

+3600
-539
lines changed

Some content is hidden

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

102 files changed

+3600
-539
lines changed

‎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:7522713648"
4+
"uri": "sbr:7570915389"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:7522713246"
7+
"uri": "sbr:7570915039"
88
},
99
"linux": {
10-
"uri": "sbr:7522714449"
10+
"uri": "sbr:7570916388"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:7522712750"
13+
"uri": "sbr:7570914495"
1414
},
1515
"win32-clang-cl": {
16-
"uri": "sbr:7522714072"
16+
"uri": "sbr:7570915900"
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:7522728679"
4+
"uri": "sbr:7570909413"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:7522728262"
7+
"uri": "sbr:7570909172"
88
},
99
"linux": {
10-
"uri": "sbr:7522729575"
10+
"uri": "sbr:7570910246"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:7522727825"
13+
"uri": "sbr:7570908880"
1414
},
1515
"win32-clang-cl": {
16-
"uri": "sbr:7522729138"
16+
"uri": "sbr:7570909765"
1717
}
1818
}
1919
}

‎build/mapping.conf.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -624,6 +624,7 @@
624624
"7448914799": "https://devtools-registry.s3.yandex.net/7448914799",
625625
"7478218557": "https://devtools-registry.s3.yandex.net/7478218557",
626626
"7522713648": "https://devtools-registry.s3.yandex.net/7522713648",
627+
"7570915389": "https://devtools-registry.s3.yandex.net/7570915389",
627628
"5766171800": "https://devtools-registry.s3.yandex.net/5766171800",
628629
"5805430761": "https://devtools-registry.s3.yandex.net/5805430761",
629630
"5829025456": "https://devtools-registry.s3.yandex.net/5829025456",
@@ -677,6 +678,7 @@
677678
"7448913101": "https://devtools-registry.s3.yandex.net/7448913101",
678679
"7478218228": "https://devtools-registry.s3.yandex.net/7478218228",
679680
"7522713246": "https://devtools-registry.s3.yandex.net/7522713246",
681+
"7570915039": "https://devtools-registry.s3.yandex.net/7570915039",
680682
"5766173070": "https://devtools-registry.s3.yandex.net/5766173070",
681683
"5805432830": "https://devtools-registry.s3.yandex.net/5805432830",
682684
"5829031598": "https://devtools-registry.s3.yandex.net/5829031598",
@@ -730,6 +732,7 @@
730732
"7448917907": "https://devtools-registry.s3.yandex.net/7448917907",
731733
"7478219259": "https://devtools-registry.s3.yandex.net/7478219259",
732734
"7522714449": "https://devtools-registry.s3.yandex.net/7522714449",
735+
"7570916388": "https://devtools-registry.s3.yandex.net/7570916388",
733736
"5766171341": "https://devtools-registry.s3.yandex.net/5766171341",
734737
"5805430188": "https://devtools-registry.s3.yandex.net/5805430188",
735738
"5829023352": "https://devtools-registry.s3.yandex.net/5829023352",
@@ -783,6 +786,7 @@
783786
"7448911598": "https://devtools-registry.s3.yandex.net/7448911598",
784787
"7478218007": "https://devtools-registry.s3.yandex.net/7478218007",
785788
"7522712750": "https://devtools-registry.s3.yandex.net/7522712750",
789+
"7570914495": "https://devtools-registry.s3.yandex.net/7570914495",
786790
"5766172695": "https://devtools-registry.s3.yandex.net/5766172695",
787791
"5805432230": "https://devtools-registry.s3.yandex.net/5805432230",
788792
"5829029743": "https://devtools-registry.s3.yandex.net/5829029743",
@@ -836,6 +840,7 @@
836840
"7448916360": "https://devtools-registry.s3.yandex.net/7448916360",
837841
"7478218861": "https://devtools-registry.s3.yandex.net/7478218861",
838842
"7522714072": "https://devtools-registry.s3.yandex.net/7522714072",
843+
"7570915900": "https://devtools-registry.s3.yandex.net/7570915900",
839844
"4307890075": "https://devtools-registry.s3.yandex.net/4307890075",
840845
"5517245192": "https://devtools-registry.s3.yandex.net/5517245192",
841846
"4307901240": "https://devtools-registry.s3.yandex.net/4307901240",
@@ -1690,6 +1695,7 @@
16901695
"7448914799": "devtools/ymake/bin/ymake for darwin",
16911696
"7478218557": "devtools/ymake/bin/ymake for darwin",
16921697
"7522713648": "devtools/ymake/bin/ymake for darwin",
1698+
"7570915389": "devtools/ymake/bin/ymake for darwin",
16931699
"5766171800": "devtools/ymake/bin/ymake for darwin-arm64",
16941700
"5805430761": "devtools/ymake/bin/ymake for darwin-arm64",
16951701
"5829025456": "devtools/ymake/bin/ymake for darwin-arm64",
@@ -1743,6 +1749,7 @@
17431749
"7448913101": "devtools/ymake/bin/ymake for darwin-arm64",
17441750
"7478218228": "devtools/ymake/bin/ymake for darwin-arm64",
17451751
"7522713246": "devtools/ymake/bin/ymake for darwin-arm64",
1752+
"7570915039": "devtools/ymake/bin/ymake for darwin-arm64",
17461753
"5766173070": "devtools/ymake/bin/ymake for linux",
17471754
"5805432830": "devtools/ymake/bin/ymake for linux",
17481755
"5829031598": "devtools/ymake/bin/ymake for linux",
@@ -1796,6 +1803,7 @@
17961803
"7448917907": "devtools/ymake/bin/ymake for linux",
17971804
"7478219259": "devtools/ymake/bin/ymake for linux",
17981805
"7522714449": "devtools/ymake/bin/ymake for linux",
1806+
"7570916388": "devtools/ymake/bin/ymake for linux",
17991807
"5766171341": "devtools/ymake/bin/ymake for linux-aarch64",
18001808
"5805430188": "devtools/ymake/bin/ymake for linux-aarch64",
18011809
"5829023352": "devtools/ymake/bin/ymake for linux-aarch64",
@@ -1849,6 +1857,7 @@
18491857
"7448911598": "devtools/ymake/bin/ymake for linux-aarch64",
18501858
"7478218007": "devtools/ymake/bin/ymake for linux-aarch64",
18511859
"7522712750": "devtools/ymake/bin/ymake for linux-aarch64",
1860+
"7570914495": "devtools/ymake/bin/ymake for linux-aarch64",
18521861
"5766172695": "devtools/ymake/bin/ymake for win32-clang-cl",
18531862
"5805432230": "devtools/ymake/bin/ymake for win32-clang-cl",
18541863
"5829029743": "devtools/ymake/bin/ymake for win32-clang-cl",
@@ -1902,6 +1911,7 @@
19021911
"7448916360": "devtools/ymake/bin/ymake for win32-clang-cl",
19031912
"7478218861": "devtools/ymake/bin/ymake for win32-clang-cl",
19041913
"7522714072": "devtools/ymake/bin/ymake for win32-clang-cl",
1914+
"7570915900": "devtools/ymake/bin/ymake for win32-clang-cl",
19051915
"4307890075": "flake8_linter for linux",
19061916
"5517245192": "flake8_linter for linux",
19071917
"4307901240": "flake8_linter for linux-aarch64",

‎build/platform/mold/mold.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"by_platform": {
3+
"darwin-arm64": {
4+
"uri": "sbr:7421008516"
5+
},
6+
"darwin-x86_64": {
7+
"uri": "sbr:7421180051"
8+
},
9+
"linux-aarch64": {
10+
"uri": "sbr:7421207790"
11+
},
12+
"linux-x86_64": {
13+
"uri": "sbr:7421606584"
14+
}
15+
}
16+
}

‎build/platform/mold/ya.make‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
RESOURCES_LIBRARY()
2+
3+
TOOLCHAIN(mold)
4+
VERSION(2.34.1)
5+
6+
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(MOLD_ROOT mold.json)
7+
8+
LDFLAGS(
9+
-fuse-ld=mold
10+
--ld-path=${MOLD_ROOT_RESOURCE_GLOBAL}/bin/ld.mold
11+
)
12+
13+
END()

‎build/plugins/_dart_fields.py‎

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -611,15 +611,37 @@ def python_configs(cls, unit, flat_args, spec_args):
611611
def cpp_configs(cls, unit, flat_args, spec_args):
612612
custom_config = spec_args.get('CUSTOM_CONFIG')
613613
if custom_config:
614+
# TODO delete CUSTOM_CONFIG, it's used only by arc
614615
config = custom_config[0]
615616
assert_file_exists(unit, config)
616-
else:
617-
# file with default configs
618-
config = spec_args.get('CONFIGS')[0]
619-
assert_file_exists(unit, config)
620-
name = spec_args['NAME'][0]
621-
config = get_linter_configs(unit, config)[name]
622-
assert_file_exists(unit, config)
617+
return {cls.KEY: serialize_list([config])}
618+
linter_name = spec_args['NAME'][0]
619+
if config_type := spec_args.get('CONFIG_TYPE'):
620+
config_type = config_type[0]
621+
if config_type not in consts.LINTER_CONFIG_TYPES[linter_name]:
622+
message = "Unknown CPP linter config type: {}. Allowed types: {}".format(
623+
config_type, ', '.join(consts.LINTER_CONFIG_TYPES[linter_name])
624+
)
625+
ymake.report_configure_error(message)
626+
raise DartValueError()
627+
if common_configs_dir := unit.get('MODULE_COMMON_CONFIGS_DIR'):
628+
config = os.path.join(common_configs_dir, config_type)
629+
path = unit.resolve(config)
630+
if os.path.exists(path):
631+
config = _common.strip_roots(config)
632+
return {cls.KEY: serialize_list([config])}
633+
message = "File not found: {}".format(path)
634+
ymake.report_configure_error(message)
635+
raise DartValueError()
636+
else:
637+
message = "Config type specifier is only allowed with autoincludes"
638+
ymake.report_configure_error(message)
639+
raise DartValueError()
640+
# default config
641+
config = spec_args.get('CONFIGS')[0]
642+
assert_file_exists(unit, config)
643+
config = get_linter_configs(unit, config)[linter_name]
644+
assert_file_exists(unit, config)
623645
return {cls.KEY: serialize_list([config])}
624646

625647

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,7 @@ class ServiceTags(Enum):
437437
AnyTag = "ya:anytag"
438438

439439

440+
# Linter names must match `NAME` set in `_ADD_*_LINTER_CHECK`
440441
class PythonLinterName(Enum):
441442
Black = "black"
442443
DummyLinter = "dummy_linter"

‎build/plugins/ytest.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,6 +1014,7 @@ def on_add_cpp_linter_check(fields, unit, *args):
10141014
"GLOBAL_RESOURCES": unlimited,
10151015
"FILE_PROCESSING_TIME": 1,
10161016
"EXTRA_PARAMS": unlimited,
1017+
"CONFIG_TYPE": 1,
10171018
}
10181019
_, spec_args = _common.sort_by_keywords(keywords, args)
10191020

‎build/sysincl/darwin.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
- MacTypes.h
3838
- TargetConditionals.h
3939
- architecture/byte_order.h
40+
- arm/cpu_capabilities_public.h
4041
- asl.h
4142
- copyfile.h
4243
- crt_externs.h

‎build/ymake.core.conf‎

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2358,7 +2358,7 @@ multimodule PACKAGE {
23582358
.USE_PEERS_LATE_OUTS=yes
23592359
.PEERDIR_POLICY=as_build_from
23602360
.FINAL_TARGET=yes
2361-
SET(PEERDIR_TAGS CPP_PROTO CPP_PROTO_FROM_SCHEMA CPP_FBS PY2 PY3 PY2_NATIVE PY3_NATIVE YQL_UDF_SHARED __EMPTY__ RESOURCE_LIB DOCSBOOK JAR_RUNNABLE PY3_BIN PY3TEST_PROGRAM DLL GO_PROGRAM PACKAGE_UNION)
2361+
SET(PEERDIR_TAGS CPP_PROTO CPP_PROTO_FROM_SCHEMA CPP_FBS PY2 PY3 PY2_NATIVE PY3_NATIVE YQL_UDF_SHARED __EMPTY__ RESOURCE_LIB DOCSBOOK JAR_RUNNABLE PY3_BIN PY3TEST_PROGRAM DLL GO_PROGRAM TS PACKAGE_UNION)
23622362

23632363
SET(MODULE_SUFFIX .final.pkg.fake)
23642364
SET(DONT_RESOLVE_INCLUDES yes)
@@ -2376,7 +2376,7 @@ multimodule PACKAGE {
23762376
.IGNORED=VCS_INFO_FILE
23772377

23782378
SET(MODULE_SUFFIX .pkg.fake)
2379-
SET(PEERDIR_TAGS CPP_PROTO CPP_PROTO_FROM_SCHEMA CPP_FBS PY2 PY3 PY2_NATIVE PY3_NATIVE YQL_UDF_SHARED __EMPTY__ RESOURCE_LIB DOCSBOOK JAR_RUNNABLE PY3_BIN PY3TEST_PROGRAM DLL GO_PROGRAM PACKAGE_UNION)
2379+
SET(PEERDIR_TAGS CPP_PROTO CPP_PROTO_FROM_SCHEMA CPP_FBS PY2 PY3 PY2_NATIVE PY3_NATIVE YQL_UDF_SHARED __EMPTY__ RESOURCE_LIB DOCSBOOK JAR_RUNNABLE PY3_BIN PY3TEST_PROGRAM DLL GO_PROGRAM TS PACKAGE_UNION)
23802380

23812381
DISABLE(START_TARGET)
23822382
SET(_COPY_FILE_CONTEXT TEXT)
@@ -2423,7 +2423,7 @@ module UNION: _BASE_UNIT {
24232423
SET(MODULE_SUFFIX .pkg.fake)
24242424
SET(DONT_RESOLVE_INCLUDES yes)
24252425
SET(NEED_PLATFORM_PEERDIRS no)
2426-
PEERDIR_TAGS=CPP_PROTO CPP_PROTO_FROM_SCHEMA CPP_FBS PY2 PY2_NATIVE PY3_NATIVE YQL_UDF_SHARED __EMPTY__ RESOURCE_LIB DOCSBOOK JAR_RUNNABLE PY3_BIN DLL PACKAGE_UNION
2426+
PEERDIR_TAGS=CPP_PROTO CPP_PROTO_FROM_SCHEMA CPP_FBS PY2 PY2_NATIVE PY3_NATIVE YQL_UDF_SHARED __EMPTY__ RESOURCE_LIB DOCSBOOK JAR_RUNNABLE PY3_BIN DLL TS PACKAGE_UNION
24272427

24282428
UNION_OUTS=${hide;late_out:AUTO_INPUT}
24292429
when ($_UNION_EXPLICIT_OUTPUTS) {
@@ -3125,9 +3125,26 @@ macro _SRC("ssqls", SRC, SRCFLAGS...) {
31253125
.CMD=${tool:"metrika/core/tools/ssqls"} ${input;notransformbuilddir:SRC} -S $ARCADIA_ROOT -B $ARCADIA_BUILD_ROOT $SRCFLAGS ${output;noext;hide:SRC.cpp} ${output;noext;hide:SRC.h} ${hide;kv:"p SS"} ${hide;kv:"pc yellow"}
31263126
}
31273127

3128+
macro _SRC_f_new(SRC, SRCFLAGS...) {
3129+
.CMD=${tool:"build/platform/flang"} -c ${input:SRC} -o ${output:SRC.o} ${hide;kv:"p FL"} ${hide;kv:"pc light-green"}
3130+
}
3131+
3132+
macro _SRC_f_old(SRC, SRCFLAGS...) {
3133+
.CMD=$YMAKE_PYTHON ${input:"build/scripts/f2c.py"} -t ${tool:"contrib/tools/f2c"} -c ${input:SRC} -o ${output:SRC.c} ${hide;output_include:"f2c.h"} ${hide;kv:"p FT"} ${hide;kv:"pc light-green"}
3134+
}
3135+
3136+
USE_FLANG=no
3137+
3138+
when ($USE_FLANG == "yes") {
3139+
_SRC_FLANG=$_SRC_f_new($SRC, $SRCFLAGS)
3140+
}
3141+
otherwise {
3142+
_SRC_FLANG=$_SRC_f_old($SRC, $SRCFLAGS)
3143+
}
3144+
31283145
# tag:src-processing
31293146
macro _SRC("f", SRC, SRCFLAGS...) {
3130-
.CMD=$YMAKE_PYTHON ${input:"build/scripts/f2c.py"} -t ${tool:"contrib/tools/f2c"} -c ${input:SRC} -o ${output:SRC.c} ${hide;output_include:"f2c.h"} ${hide;kv:"p FT"} ${hide;kv:"pc light-green"}
3147+
.CMD=$_SRC_FLANG
31313148
.PEERDIR=contrib/libs/libf2c
31323149
.ADDINCL=contrib/libs/libf2c
31333150
}
@@ -5837,7 +5854,7 @@ macro _STYLE_CPP(CONFIG...) {
58375854
}
58385855

58395856
# tag:internal
5840-
### @usage: _ADD_CPP_LINTER_CHECK(NAME name LINTER linter [DEPENDS deps] CONFIGS configs_file [GLOBAL_RESOURCES gr] [FILE_PROCESSING_TIME fpt] [EXTRA_PARAMS params] [CUSTOM_CONFIG cc])
5857+
### @usage: _ADD_CPP_LINTER_CHECK(NAME name LINTER linter [DEPENDS deps] CONFIGS configs_file [GLOBAL_RESOURCES gr] [FILE_PROCESSING_TIME fpt] [EXTRA_PARAMS params] [CUSTOM_CONFIG cc] [CONFIG_TYPE ct])
58415858
###
58425859
### Triggers respective plugin
58435860
macro _ADD_CPP_LINTER_CHECK(Args...) {
@@ -5847,12 +5864,12 @@ macro _ADD_CPP_LINTER_CHECK(Args...) {
58475864
}
58485865

58495866
# tag:test
5850-
### @usage STYLE_CPP()
5867+
### @usage STYLE_CPP([CONFIG_TYPE config_type])
58515868
###
58525869
### Run 'ya tool clang-format' test on all cpp sources and headers of the current module
5853-
macro STYLE_CPP() {
5870+
macro STYLE_CPP(CONFIG_TYPE="") {
58545871
.ALLOWED_IN_COMMON=yes
5855-
_ADD_CPP_LINTER_CHECK(NAME clang_format LINTER tools/cpp_style_checker/cpp_style_checker GLOBAL_RESOURCES build/platform/clang/clang-format CONFIGS $CPP_LINTERS_DEFAULT_CONFIGS)
5872+
_ADD_CPP_LINTER_CHECK(NAME clang_format LINTER tools/cpp_style_checker/cpp_style_checker GLOBAL_RESOURCES build/platform/clang/clang-format CONFIGS $CPP_LINTERS_DEFAULT_CONFIGS CONFIG_TYPE $CONFIG_TYPE)
58565873
}
58575874

58585875
### @usage: HEADERS(<Dirs...> [EXCLUDE patterns...])

0 commit comments

Comments
 (0)