Skip to content

Commit

Permalink
Merge pull request #12236 from ydb-platform/mergelibs-241203-0816
Browse files Browse the repository at this point in the history
Library import 241203-0816
  • Loading branch information
maximyurchuk authored Dec 3, 2024
2 parents 7186c0a + 96db4e2 commit e04e58d
Show file tree
Hide file tree
Showing 102 changed files with 3,600 additions and 539 deletions.
10 changes: 5 additions & 5 deletions build/external_resources/ymake/public.resources.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"by_platform": {
"darwin": {
"uri": "sbr:7522713648"
"uri": "sbr:7570915389"
},
"darwin-arm64": {
"uri": "sbr:7522713246"
"uri": "sbr:7570915039"
},
"linux": {
"uri": "sbr:7522714449"
"uri": "sbr:7570916388"
},
"linux-aarch64": {
"uri": "sbr:7522712750"
"uri": "sbr:7570914495"
},
"win32-clang-cl": {
"uri": "sbr:7522714072"
"uri": "sbr:7570915900"
}
}
}
10 changes: 5 additions & 5 deletions build/external_resources/ymake/resources.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"by_platform": {
"darwin": {
"uri": "sbr:7522728679"
"uri": "sbr:7570909413"
},
"darwin-arm64": {
"uri": "sbr:7522728262"
"uri": "sbr:7570909172"
},
"linux": {
"uri": "sbr:7522729575"
"uri": "sbr:7570910246"
},
"linux-aarch64": {
"uri": "sbr:7522727825"
"uri": "sbr:7570908880"
},
"win32-clang-cl": {
"uri": "sbr:7522729138"
"uri": "sbr:7570909765"
}
}
}
10 changes: 10 additions & 0 deletions build/mapping.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -624,6 +624,7 @@
"7448914799": "https://devtools-registry.s3.yandex.net/7448914799",
"7478218557": "https://devtools-registry.s3.yandex.net/7478218557",
"7522713648": "https://devtools-registry.s3.yandex.net/7522713648",
"7570915389": "https://devtools-registry.s3.yandex.net/7570915389",
"5766171800": "https://devtools-registry.s3.yandex.net/5766171800",
"5805430761": "https://devtools-registry.s3.yandex.net/5805430761",
"5829025456": "https://devtools-registry.s3.yandex.net/5829025456",
Expand Down Expand Up @@ -677,6 +678,7 @@
"7448913101": "https://devtools-registry.s3.yandex.net/7448913101",
"7478218228": "https://devtools-registry.s3.yandex.net/7478218228",
"7522713246": "https://devtools-registry.s3.yandex.net/7522713246",
"7570915039": "https://devtools-registry.s3.yandex.net/7570915039",
"5766173070": "https://devtools-registry.s3.yandex.net/5766173070",
"5805432830": "https://devtools-registry.s3.yandex.net/5805432830",
"5829031598": "https://devtools-registry.s3.yandex.net/5829031598",
Expand Down Expand Up @@ -730,6 +732,7 @@
"7448917907": "https://devtools-registry.s3.yandex.net/7448917907",
"7478219259": "https://devtools-registry.s3.yandex.net/7478219259",
"7522714449": "https://devtools-registry.s3.yandex.net/7522714449",
"7570916388": "https://devtools-registry.s3.yandex.net/7570916388",
"5766171341": "https://devtools-registry.s3.yandex.net/5766171341",
"5805430188": "https://devtools-registry.s3.yandex.net/5805430188",
"5829023352": "https://devtools-registry.s3.yandex.net/5829023352",
Expand Down Expand Up @@ -783,6 +786,7 @@
"7448911598": "https://devtools-registry.s3.yandex.net/7448911598",
"7478218007": "https://devtools-registry.s3.yandex.net/7478218007",
"7522712750": "https://devtools-registry.s3.yandex.net/7522712750",
"7570914495": "https://devtools-registry.s3.yandex.net/7570914495",
"5766172695": "https://devtools-registry.s3.yandex.net/5766172695",
"5805432230": "https://devtools-registry.s3.yandex.net/5805432230",
"5829029743": "https://devtools-registry.s3.yandex.net/5829029743",
Expand Down Expand Up @@ -836,6 +840,7 @@
"7448916360": "https://devtools-registry.s3.yandex.net/7448916360",
"7478218861": "https://devtools-registry.s3.yandex.net/7478218861",
"7522714072": "https://devtools-registry.s3.yandex.net/7522714072",
"7570915900": "https://devtools-registry.s3.yandex.net/7570915900",
"4307890075": "https://devtools-registry.s3.yandex.net/4307890075",
"5517245192": "https://devtools-registry.s3.yandex.net/5517245192",
"4307901240": "https://devtools-registry.s3.yandex.net/4307901240",
Expand Down Expand Up @@ -1690,6 +1695,7 @@
"7448914799": "devtools/ymake/bin/ymake for darwin",
"7478218557": "devtools/ymake/bin/ymake for darwin",
"7522713648": "devtools/ymake/bin/ymake for darwin",
"7570915389": "devtools/ymake/bin/ymake for darwin",
"5766171800": "devtools/ymake/bin/ymake for darwin-arm64",
"5805430761": "devtools/ymake/bin/ymake for darwin-arm64",
"5829025456": "devtools/ymake/bin/ymake for darwin-arm64",
Expand Down Expand Up @@ -1743,6 +1749,7 @@
"7448913101": "devtools/ymake/bin/ymake for darwin-arm64",
"7478218228": "devtools/ymake/bin/ymake for darwin-arm64",
"7522713246": "devtools/ymake/bin/ymake for darwin-arm64",
"7570915039": "devtools/ymake/bin/ymake for darwin-arm64",
"5766173070": "devtools/ymake/bin/ymake for linux",
"5805432830": "devtools/ymake/bin/ymake for linux",
"5829031598": "devtools/ymake/bin/ymake for linux",
Expand Down Expand Up @@ -1796,6 +1803,7 @@
"7448917907": "devtools/ymake/bin/ymake for linux",
"7478219259": "devtools/ymake/bin/ymake for linux",
"7522714449": "devtools/ymake/bin/ymake for linux",
"7570916388": "devtools/ymake/bin/ymake for linux",
"5766171341": "devtools/ymake/bin/ymake for linux-aarch64",
"5805430188": "devtools/ymake/bin/ymake for linux-aarch64",
"5829023352": "devtools/ymake/bin/ymake for linux-aarch64",
Expand Down Expand Up @@ -1849,6 +1857,7 @@
"7448911598": "devtools/ymake/bin/ymake for linux-aarch64",
"7478218007": "devtools/ymake/bin/ymake for linux-aarch64",
"7522712750": "devtools/ymake/bin/ymake for linux-aarch64",
"7570914495": "devtools/ymake/bin/ymake for linux-aarch64",
"5766172695": "devtools/ymake/bin/ymake for win32-clang-cl",
"5805432230": "devtools/ymake/bin/ymake for win32-clang-cl",
"5829029743": "devtools/ymake/bin/ymake for win32-clang-cl",
Expand Down Expand Up @@ -1902,6 +1911,7 @@
"7448916360": "devtools/ymake/bin/ymake for win32-clang-cl",
"7478218861": "devtools/ymake/bin/ymake for win32-clang-cl",
"7522714072": "devtools/ymake/bin/ymake for win32-clang-cl",
"7570915900": "devtools/ymake/bin/ymake for win32-clang-cl",
"4307890075": "flake8_linter for linux",
"5517245192": "flake8_linter for linux",
"4307901240": "flake8_linter for linux-aarch64",
Expand Down
16 changes: 16 additions & 0 deletions build/platform/mold/mold.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"by_platform": {
"darwin-arm64": {
"uri": "sbr:7421008516"
},
"darwin-x86_64": {
"uri": "sbr:7421180051"
},
"linux-aarch64": {
"uri": "sbr:7421207790"
},
"linux-x86_64": {
"uri": "sbr:7421606584"
}
}
}
13 changes: 13 additions & 0 deletions build/platform/mold/ya.make
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
RESOURCES_LIBRARY()

TOOLCHAIN(mold)
VERSION(2.34.1)

DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(MOLD_ROOT mold.json)

LDFLAGS(
-fuse-ld=mold
--ld-path=${MOLD_ROOT_RESOURCE_GLOBAL}/bin/ld.mold
)

END()
36 changes: 29 additions & 7 deletions build/plugins/_dart_fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -611,15 +611,37 @@ def python_configs(cls, unit, flat_args, spec_args):
def cpp_configs(cls, unit, flat_args, spec_args):
custom_config = spec_args.get('CUSTOM_CONFIG')
if custom_config:
# TODO delete CUSTOM_CONFIG, it's used only by arc
config = custom_config[0]
assert_file_exists(unit, config)
else:
# file with default configs
config = spec_args.get('CONFIGS')[0]
assert_file_exists(unit, config)
name = spec_args['NAME'][0]
config = get_linter_configs(unit, config)[name]
assert_file_exists(unit, config)
return {cls.KEY: serialize_list([config])}
linter_name = spec_args['NAME'][0]
if config_type := spec_args.get('CONFIG_TYPE'):
config_type = config_type[0]
if config_type not in consts.LINTER_CONFIG_TYPES[linter_name]:
message = "Unknown CPP linter config type: {}. Allowed types: {}".format(
config_type, ', '.join(consts.LINTER_CONFIG_TYPES[linter_name])
)
ymake.report_configure_error(message)
raise DartValueError()
if common_configs_dir := unit.get('MODULE_COMMON_CONFIGS_DIR'):
config = os.path.join(common_configs_dir, config_type)
path = unit.resolve(config)
if os.path.exists(path):
config = _common.strip_roots(config)
return {cls.KEY: serialize_list([config])}
message = "File not found: {}".format(path)
ymake.report_configure_error(message)
raise DartValueError()
else:
message = "Config type specifier is only allowed with autoincludes"
ymake.report_configure_error(message)
raise DartValueError()
# default config
config = spec_args.get('CONFIGS')[0]
assert_file_exists(unit, config)
config = get_linter_configs(unit, config)[linter_name]
assert_file_exists(unit, config)
return {cls.KEY: serialize_list([config])}


Expand Down
1 change: 1 addition & 0 deletions build/plugins/lib/test_const/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,7 @@ class ServiceTags(Enum):
AnyTag = "ya:anytag"


# Linter names must match `NAME` set in `_ADD_*_LINTER_CHECK`
class PythonLinterName(Enum):
Black = "black"
DummyLinter = "dummy_linter"
Expand Down
1 change: 1 addition & 0 deletions build/plugins/ytest.py
Original file line number Diff line number Diff line change
Expand Up @@ -1014,6 +1014,7 @@ def on_add_cpp_linter_check(fields, unit, *args):
"GLOBAL_RESOURCES": unlimited,
"FILE_PROCESSING_TIME": 1,
"EXTRA_PARAMS": unlimited,
"CONFIG_TYPE": 1,
}
_, spec_args = _common.sort_by_keywords(keywords, args)

Expand Down
1 change: 1 addition & 0 deletions build/sysincl/darwin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
- MacTypes.h
- TargetConditionals.h
- architecture/byte_order.h
- arm/cpu_capabilities_public.h
- asl.h
- copyfile.h
- crt_externs.h
Expand Down
33 changes: 25 additions & 8 deletions build/ymake.core.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2358,7 +2358,7 @@ multimodule PACKAGE {
.USE_PEERS_LATE_OUTS=yes
.PEERDIR_POLICY=as_build_from
.FINAL_TARGET=yes
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)
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)

SET(MODULE_SUFFIX .final.pkg.fake)
SET(DONT_RESOLVE_INCLUDES yes)
Expand All @@ -2376,7 +2376,7 @@ multimodule PACKAGE {
.IGNORED=VCS_INFO_FILE

SET(MODULE_SUFFIX .pkg.fake)
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)
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)

DISABLE(START_TARGET)
SET(_COPY_FILE_CONTEXT TEXT)
Expand Down Expand Up @@ -2423,7 +2423,7 @@ module UNION: _BASE_UNIT {
SET(MODULE_SUFFIX .pkg.fake)
SET(DONT_RESOLVE_INCLUDES yes)
SET(NEED_PLATFORM_PEERDIRS no)
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
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

UNION_OUTS=${hide;late_out:AUTO_INPUT}
when ($_UNION_EXPLICIT_OUTPUTS) {
Expand Down Expand Up @@ -3125,9 +3125,26 @@ macro _SRC("ssqls", SRC, SRCFLAGS...) {
.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"}
}

macro _SRC_f_new(SRC, SRCFLAGS...) {
.CMD=${tool:"build/platform/flang"} -c ${input:SRC} -o ${output:SRC.o} ${hide;kv:"p FL"} ${hide;kv:"pc light-green"}
}

macro _SRC_f_old(SRC, SRCFLAGS...) {
.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"}
}

USE_FLANG=no

when ($USE_FLANG == "yes") {
_SRC_FLANG=$_SRC_f_new($SRC, $SRCFLAGS)
}
otherwise {
_SRC_FLANG=$_SRC_f_old($SRC, $SRCFLAGS)
}

# tag:src-processing
macro _SRC("f", SRC, SRCFLAGS...) {
.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"}
.CMD=$_SRC_FLANG
.PEERDIR=contrib/libs/libf2c
.ADDINCL=contrib/libs/libf2c
}
Expand Down Expand Up @@ -5837,7 +5854,7 @@ macro _STYLE_CPP(CONFIG...) {
}

# tag:internal
### @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])
### @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])
###
### Triggers respective plugin
macro _ADD_CPP_LINTER_CHECK(Args...) {
Expand All @@ -5847,12 +5864,12 @@ macro _ADD_CPP_LINTER_CHECK(Args...) {
}

# tag:test
### @usage STYLE_CPP()
### @usage STYLE_CPP([CONFIG_TYPE config_type])
###
### Run 'ya tool clang-format' test on all cpp sources and headers of the current module
macro STYLE_CPP() {
macro STYLE_CPP(CONFIG_TYPE="") {
.ALLOWED_IN_COMMON=yes
_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)
_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)
}

### @usage: HEADERS(<Dirs...> [EXCLUDE patterns...])
Expand Down
2 changes: 0 additions & 2 deletions contrib/libs/clang14-rt/lib/asan/ya.make
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ LICENSE(

LICENSE_TEXTS(.yandex_meta/licenses.list.txt)

SUBSCRIBER(g:cpp-contrib)

ADDINCL(
contrib/libs/clang14-rt/lib
)
Expand Down
2 changes: 0 additions & 2 deletions contrib/libs/clang14-rt/lib/asan_cxx/ya.make
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ LICENSE(

LICENSE_TEXTS(.yandex_meta/licenses.list.txt)

SUBSCRIBER(g:cpp-contrib)

ADDINCL(
contrib/libs/clang14-rt/lib
)
Expand Down
2 changes: 0 additions & 2 deletions contrib/libs/clang14-rt/lib/asan_static/ya.make
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ LICENSE(

LICENSE_TEXTS(.yandex_meta/licenses.list.txt)

SUBSCRIBER(g:cpp-contrib)

ADDINCL(
contrib/libs/clang14-rt/lib
)
Expand Down
2 changes: 0 additions & 2 deletions contrib/libs/clang14-rt/lib/msan/ya.make
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ LICENSE(

LICENSE_TEXTS(.yandex_meta/licenses.list.txt)

SUBSCRIBER(g:cpp-contrib)

ADDINCL(
contrib/libs/clang14-rt/lib
)
Expand Down
2 changes: 0 additions & 2 deletions contrib/libs/clang14-rt/lib/msan_cxx/ya.make
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ LICENSE(

LICENSE_TEXTS(.yandex_meta/licenses.list.txt)

SUBSCRIBER(g:cpp-contrib)

ADDINCL(
contrib/libs/clang14-rt/lib
)
Expand Down
2 changes: 0 additions & 2 deletions contrib/libs/clang14-rt/lib/tsan/ya.make
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ LICENSE(

LICENSE_TEXTS(.yandex_meta/licenses.list.txt)

SUBSCRIBER(g:cpp-contrib)

ADDINCL(
contrib/libs/clang14-rt/lib
)
Expand Down
2 changes: 0 additions & 2 deletions contrib/libs/clang14-rt/lib/tsan_cxx/ya.make
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ LICENSE(

LICENSE_TEXTS(.yandex_meta/licenses.list.txt)

SUBSCRIBER(g:cpp-contrib)

ADDINCL(
contrib/libs/clang14-rt/lib
)
Expand Down
2 changes: 0 additions & 2 deletions contrib/libs/clang18-rt/lib/asan/ya.make
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ LICENSE(

LICENSE_TEXTS(.yandex_meta/licenses.list.txt)

SUBSCRIBER(g:cpp-contrib)

VERSION(18.1.8)

ADDINCL(
Expand Down
2 changes: 0 additions & 2 deletions contrib/libs/clang18-rt/lib/asan_cxx/ya.make
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ LICENSE(

LICENSE_TEXTS(.yandex_meta/licenses.list.txt)

SUBSCRIBER(g:cpp-contrib)

VERSION(18.1.8)

ADDINCL(
Expand Down
2 changes: 0 additions & 2 deletions contrib/libs/clang18-rt/lib/asan_static/ya.make
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ LICENSE(

LICENSE_TEXTS(.yandex_meta/licenses.list.txt)

SUBSCRIBER(g:cpp-contrib)

VERSION(18.1.8)

ADDINCL(
Expand Down
Loading

0 comments on commit e04e58d

Please sign in to comment.