Skip to content

Commit 56eea33

Browse files
maximyurchukmaximyurchuk
authored
Merge pull request #9418 from ydb-platform/mergelibs-240918-0758
Library import 240918-0758
2 parents a3307aa + e0b8ee3 commit 56eea33

File tree

107 files changed

+15663
-14924
lines changed

Some content is hidden

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

107 files changed

+15663
-14924
lines changed

‎build/conf/autoincludes.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎build/conf/compilers/gnu_compiler.conf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,16 @@ when ($ARCH_XTENSA == "yes") {
7575
when ($OS_EMSCRIPTEN == "yes") {
7676
FSTACK=-fno-stack-protector
7777
CFLAGS+=-D__EMSCRIPTEN__
78+
}
79+
80+
when ($ARCH_WASM64 == "yes") {
7881
CFLAGS+=-D_LIBCPP_HAS_MUSL_LIBC
7982
}
8083

84+
when ($ARCH_WASM32 == "yes") {
85+
CFLAGS+=-D_musl_
86+
}
87+
8188
CFLAGS+=$_C_FLAGS $DEBUG_INFO_FLAGS $_C_FOPTIONS $C_WARNING_OPTS $GCC_PREPROCESSOR_OPTS $USER_CFLAGS $USER_CFLAGS_GLOBAL
8289
CXXFLAGS+=$CFLAGS $_STD_CXX $CXX_WARNING_OPTS $USER_CXXFLAGS $USER_CXXFLAGS_GLOBAL
8390
CONLYFLAGS+=$USER_CONLYFLAGS $USER_CONLYFLAGS_GLOBAL

‎build/conf/java.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -585,6 +585,7 @@ module JAVA_CONTRIB_PROXY: _JAR_BASE {
585585
.SEM=JAVA_CONTRIB_PROXY_SEM
586586

587587
_DONT_REQUIRE_LICENSE()
588+
WITHOUT_VERSION()
588589
}
589590

590591
# tag:java-specific

‎build/conf/proto.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ multimodule PROTO_LIBRARY {
796796

797797
module TS_PROTO: _TS_PROTO_IMPL {
798798
# opt-in. We don't want to have TS_PROTO by default
799-
# To include TS_PROTO user have to set INCLUDE_TAGS(TS_PROTO) in ya.make
799+
# To include TS_PROTO user have to set INCLUDE_TAGS(TS_PROTO TS_PREPARE_DEPS) in ya.make
800800
.INCLUDE_TAG=no
801801
.EPILOGUE=_TS_CONFIG_EPILOGUE
802802
.PEERDIRSELF=TS_PREPARE_DEPS

‎build/conf/python.conf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,7 @@ module PY2TEST: PYTEST_BIN {
364364
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)
365365
NO_CLANG_TIDY()
366366
_DONT_REQUIRE_LICENSE()
367+
WITHOUT_VERSION()
367368
}
368369

369370
# tag:python-specific tag:deprecated tag:test
@@ -406,11 +407,13 @@ multimodule PY3TEST {
406407

407408
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)
408409
_DONT_REQUIRE_LICENSE()
410+
WITHOUT_VERSION()
409411
}
410412

411413
module PY3TEST_LIBRARY: PY3_LIBRARY {
412414
PEERDIR+=library/python/pytest
413415
_DONT_REQUIRE_LICENSE()
416+
WITHOUT_VERSION()
414417
}
415418
}
416419

@@ -1118,6 +1121,7 @@ multimodule PY23_TEST {
11181121
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/py2test/result.json)
11191122

11201123
_DONT_REQUIRE_LICENSE()
1124+
WITHOUT_VERSION()
11211125
}
11221126
module PY3TEST_PROGRAM: PY3TEST_BIN {
11231127
.FINAL_TARGET=yes
@@ -1129,6 +1133,7 @@ multimodule PY23_TEST {
11291133
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/py3test/result.json)
11301134

11311135
_DONT_REQUIRE_LICENSE()
1136+
WITHOUT_VERSION()
11321137
}
11331138

11341139
module PY3TEST_LIBRARY: PY3_LIBRARY {
@@ -1137,5 +1142,6 @@ multimodule PY23_TEST {
11371142
RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON $CYTHON_SCRIPT
11381143

11391144
_DONT_REQUIRE_LICENSE()
1145+
WITHOUT_VERSION()
11401146
}
11411147
}

‎build/conf/settings.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,3 +129,5 @@ _FOLDABLE_VARS=\
129129

130130
ARCADIA_TEST_ROOT=../arcadia_tests_data/
131131
DEFAULT_REQUIREMENTS=network:restricted cpu:1 ram:32
132+
133+
AUTOINCLUDE_PATHS=build/conf/autoincludes.json

‎build/conf/ts/ts_proto.conf

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
_TS_PROTO_SRCS_FILES=
1+
_TS_PROTO_OPT=
22
_TS_PROTO_IMPL_CMD=$TOUCH_UNIT \
33
&& $_TS_FILES_COPY_CMD \
44
&& $NOTS_TOOL $NOTS_TOOL_BASE_ARGS build-ts-proto $NOTS_TOOL_COMMON_BUILDER_ARGS \
5+
${_TS_PROTO_OPT} \
56
--protoc-bin $PROTOC \
67
--proto-srcs $_TS_PROTO_SRCS_FILES \
78
--proto-paths ./$PROTO_NAMESPACE $ARCADIA_ROOT/$PROTO_NAMESPACE $_PROTO__INCLUDE $ARCADIA_BUILD_ROOT $PROTOBUF_INCLUDE_PATH \
@@ -45,3 +46,22 @@ module _TS_PROTO_IMPL: _TS_BASE_UNIT {
4546
macro _TS_PROTO_SRCS(FILES...) {
4647
_SET_APPEND_WITH_DIRECTIVE(_TS_PROTO_SRCS_FILES input $FILES)
4748
}
49+
50+
### @usage: TS_PROTO_OPT(key1=value1 key2=value2)
51+
###
52+
### Overrides default options for `--ts_proto_opt`
53+
### ([supported options](https://github.com/stephenh/ts-proto?tab=readme-ov-file#supported-options)).
54+
###
55+
### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/PROTO_LIBRARY#ts_proto_opt
56+
###
57+
### @example
58+
###
59+
### TS_PROTO_OPT(env=browser)
60+
### TS_PROTO_OPT(
61+
### useJsonName=true
62+
### useJsonWireFormat=true
63+
### )
64+
###
65+
macro TS_PROTO_OPT(OPTS...) {
66+
SET_APPEND(_TS_PROTO_OPT ${pre=--ts-proto-opt :OPTS})
67+
}

‎build/conf/ts/ts_test.conf

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,38 @@ module TS_TEST_PLAYWRIGHT_FOR: _TS_TEST_BASE {
113113
_TS_TEST_FOR_CONFIGURE(playwright playwright.config.ts workspace_node_modules.tar)
114114
}
115115

116+
TS_TEST_PLAYWRIGHT_LARGE_CMD=$TOUCH_UNIT \
117+
&& ${cwd:BINDIR} $MOVE_FILE ${input:TS_TEST_NM} ${output:"workspace_node_modules.tar"} \
118+
${kv;hide:"p TSPW"} ${kv;hide:"pc magenta"}
119+
120+
### @usage: TS_TEST_PLAYWRIGHT_LARGE_FOR(Path)
121+
###
122+
### Defines testing module with playwright test runner.
123+
###
124+
### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/TS_TEST_PLAYWRIGHT_FOR
125+
###
126+
### @example
127+
###
128+
### TS_TEST_PLAYWRIGHT_LARGE_FOR(path/to/module)
129+
### TS_TEST_SRCS(../src)
130+
### TS_TEST_CONFIG(../playwright.config.js)
131+
### END()
132+
###
133+
module TS_TEST_PLAYWRIGHT_LARGE_FOR: _TS_TEST_BASE {
134+
.CMD=TS_TEST_PLAYWRIGHT_LARGE_CMD
135+
136+
# for multimodule peers we should choose TS
137+
SET(PEERDIR_TAGS TS)
138+
139+
# compatibility with old TS_TEST_SRCS
140+
SET(TS_TEST_EXTENSION (playwright|spec).(ts|js))
141+
142+
TS_TEST_DEPENDS_ON_BUILD()
143+
_DEPENDS_ON_MOD()
144+
_PEERDIR_TS_RESOURCE(nodejs playwright)
145+
_TS_TEST_FOR_CONFIGURE(playwright_large playwright.config.ts workspace_node_modules.tar)
146+
}
147+
116148
### # internal
117149
module _TS_TEST_BASE: _BARE_UNIT {
118150
# ignore SRCS macro

‎build/export_generators/cmake/cmake/conan_provider.cmake

Lines changed: 37 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -210,24 +210,44 @@ function(detect_lib_cxx lib_cxx)
210210
endfunction()
211211

212212

213-
function(detect_compiler compiler compiler_version compiler_runtime compiler_runtime_type)
213+
214+
function(detect_compiler_and_version language compiler compiler_version compiler_is_clang_cl)
215+
if (${CMAKE_${language}_COMPILER_ID} STREQUAL Clang
216+
AND "${CMAKE_${language}_COMPILER_FRONTEND_VARIANT}" STREQUAL "MSVC"
217+
AND "${CMAKE_${language}_SIMULATE_ID}" STREQUAL "MSVC")
218+
219+
# set it to MSVC because some packages like 'OpenSSL 1.1.1t' have issues with clang-cl.
220+
set(_compiler MSVC)
221+
set(${compiler_is_clang_cl} 1 PARENT_SCOPE)
222+
else()
223+
set(_compiler ${CMAKE_${language}_COMPILER_ID})
224+
set(${compiler_is_clang_cl} 0 PARENT_SCOPE)
225+
endif()
226+
if(_compiler MATCHES MSVC)
227+
string(SUBSTRING ${MSVC_VERSION} 0 3 _compiler_version)
228+
else()
229+
set(_compiler_version ${CMAKE_${language}_COMPILER_VERSION})
230+
endif()
231+
set(${compiler} ${_compiler} PARENT_SCOPE)
232+
set(${compiler_version} ${_compiler_version} PARENT_SCOPE)
233+
endfunction()
234+
235+
236+
function(detect_compiler compiler compiler_version compiler_runtime compiler_runtime_type compiler_is_clang_cl)
214237
if(DEFINED CMAKE_CXX_COMPILER_ID)
215-
set(_compiler ${CMAKE_CXX_COMPILER_ID})
216-
set(_compiler_version ${CMAKE_CXX_COMPILER_VERSION})
238+
detect_compiler_and_version(CXX _compiler _compiler_version _compiler_is_clang_cl)
217239
else()
218240
if(NOT DEFINED CMAKE_C_COMPILER_ID)
219241
message(FATAL_ERROR "C or C++ compiler not defined")
220242
endif()
221-
set(_compiler ${CMAKE_C_COMPILER_ID})
222-
set(_compiler_version ${CMAKE_C_COMPILER_VERSION})
243+
detect_compiler_and_version(C _compiler _compiler_version _compiler_is_clang_cl)
223244
endif()
224245

225246
message(STATUS "CMake-Conan: CMake compiler=${_compiler}")
226247
message(STATUS "CMake-Conan: CMake compiler version=${_compiler_version}")
227248

228249
if(_compiler MATCHES MSVC)
229250
set(_compiler "msvc")
230-
string(SUBSTRING ${MSVC_VERSION} 0 3 _compiler_version)
231251
# Configure compiler.runtime and compiler.runtime_type settings for MSVC
232252
if(CMAKE_MSVC_RUNTIME_LIBRARY)
233253
set(_msvc_runtime_library ${CMAKE_MSVC_RUNTIME_LIBRARY})
@@ -293,6 +313,7 @@ function(detect_compiler compiler compiler_version compiler_runtime compiler_run
293313
set(${compiler_version} ${_compiler_version} PARENT_SCOPE)
294314
set(${compiler_runtime} ${_compiler_runtime} PARENT_SCOPE)
295315
set(${compiler_runtime_type} ${_compiler_runtime_type} PARENT_SCOPE)
316+
set(${compiler_is_clang_cl} ${_compiler_is_clang_cl} PARENT_SCOPE)
296317
endfunction()
297318

298319

@@ -328,23 +349,23 @@ macro(append_compiler_executables_configuration)
328349
set(_conan_rc_compiler "")
329350
set(_conan_compilers_list "")
330351
if(CMAKE_C_COMPILER)
331-
set(_conan_c_compiler "\"c\":\"${CMAKE_C_COMPILER}\"")
352+
set(_conan_c_compiler "\"c\":\"\\\"${CMAKE_C_COMPILER}\\\"\"")
332353
set_conan_compiler_if_appleclang(C cc _conan_c_compiler)
333354
list(APPEND _conan_compilers_list ${_conan_c_compiler})
334355
else()
335356
message(WARNING "CMake-Conan: The C compiler is not defined. "
336357
"Please define CMAKE_C_COMPILER or enable the C language.")
337358
endif()
338359
if(CMAKE_CXX_COMPILER)
339-
set(_conan_cpp_compiler "\"cpp\":\"${CMAKE_CXX_COMPILER}\"")
360+
set(_conan_cpp_compiler "\"cpp\":\"\\\"${CMAKE_CXX_COMPILER}\\\"\"")
340361
set_conan_compiler_if_appleclang(CXX c++ _conan_cpp_compiler)
341362
list(APPEND _conan_compilers_list ${_conan_cpp_compiler})
342363
else()
343364
message(WARNING "CMake-Conan: The C++ compiler is not defined. "
344365
"Please define CMAKE_CXX_COMPILER or enable the C++ language.")
345366
endif()
346367
if(CMAKE_RC_COMPILER)
347-
set(_conan_rc_compiler "\"rc\":\"${CMAKE_RC_COMPILER}\"")
368+
set(_conan_rc_compiler "\"rc\":\"\\\"${CMAKE_RC_COMPILER}\\\"\"")
348369
list(APPEND _conan_compilers_list ${_conan_rc_compiler})
349370
# Not necessary to warn if RC not defined
350371
endif()
@@ -362,7 +383,7 @@ endmacro()
362383
function(detect_host_profile output_file)
363384
detect_os(os os_api_level os_sdk os_subsystem os_version)
364385
detect_arch(arch)
365-
detect_compiler(compiler compiler_version compiler_runtime compiler_runtime_type)
386+
detect_compiler(compiler compiler_version compiler_runtime compiler_runtime_type compiler_is_clang_cl)
366387
detect_cxx_standard(compiler_cppstd)
367388
detect_lib_cxx(compiler_libcxx)
368389
detect_build_type(build_type)
@@ -418,8 +439,12 @@ function(detect_host_profile output_file)
418439
string(APPEND profile "[conf]\n")
419440
string(APPEND profile "tools.cmake.cmaketoolchain:generator=${CMAKE_GENERATOR}\n")
420441

421-
# propagate compilers via profile
422-
append_compiler_executables_configuration()
442+
if (NOT compiler_is_clang_cl)
443+
# propagate compilers via profile
444+
append_compiler_executables_configuration()
445+
else()
446+
message(STATUS "CMake-Conan: do not propagate compilers via profile for clang-cl")
447+
endif()
423448

424449
if(os STREQUAL "Android")
425450
string(APPEND profile "tools.android:ndk_path=${CMAKE_ANDROID_NDK}\n")

‎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:7070261862"
4+
"uri": "sbr:7095381929"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:7070261345"
7+
"uri": "sbr:7095381018"
88
},
99
"linux": {
10-
"uri": "sbr:7070262933"
10+
"uri": "sbr:7095384078"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:7070260816"
13+
"uri": "sbr:7095380204"
1414
},
1515
"win32-clang-cl": {
16-
"uri": "sbr:7070262364"
16+
"uri": "sbr:7095382771"
1717
}
1818
}
1919
}

0 commit comments

Comments
 (0)