Skip to content

Commit ac9f050

Browse files
maximyurchukmaximyurchuk
authored
Merge pull request #9054 from ydb-platform/mergelibs-240911-0600
Library import 240911-0600
2 parents efdd4c7 + 497973c commit ac9f050

File tree

148 files changed

+1254
-981
lines changed

Some content is hidden

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

148 files changed

+1254
-981
lines changed

‎build/conf/a.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
service: ya_make
2+
title: build/conf
3+
4+
arcanum:
5+
auto_merge:
6+
enabled: true
7+
requirements:
8+
- system: arcanum
9+
type: merge_time_fits
10+
alias: Merge time intervals (YMAKE-1194)
11+
data:
12+
merge_intervals_utc:
13+
# 20:00..11:00 MSK
14+
- from: "17:00"
15+
to: "08:00"

‎build/conf/linkers/ld.conf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ when (($TIME_TRACE == "yes" || $LINKER_TIME_TRACE == "yes") && $_DEFAULT_LINKER_
143143
_LINKER_TIME_TRACE_FLAG=\
144144
-Wl,--time-trace \
145145
-Wl,--time-trace-granularity=$_LINKER_TIME_TRACE_GRANULARITY \
146-
-Wl,--time-trace-file=${output;rootrel;pre=$MODULE_PREFIX;suf=$MODULE_SUFFIX.time_trace.json:REALPRJNAME}
146+
-Wl,--time-trace-file=${rootrel;output;pre=$MODULE_PREFIX;suf=$MODULE_SUFFIX.time_trace.json:REALPRJNAME}
147147
}
148148

149149
_EXE_FLAGS=\
@@ -187,10 +187,10 @@ _ROOT_FLAGS=--source-root $ARCADIA_ROOT --build-root $(BUILD_ROOT)
187187

188188
# Program
189189
GENERATE_MF_CMD=\
190-
$YMAKE_PYTHON ${input:"build/scripts/generate_mf.py"} ${input;hide:"build/scripts/process_command_files.py"} \
190+
$YMAKE_PYTHON ${input:"build/scripts/generate_mf.py"} ${hide;input:"build/scripts/process_command_files.py"} \
191191
--build-root $ARCADIA_BUILD_ROOT \
192192
--module-name $REALPRJNAME \
193-
-o ${output;rootrel;pre=$MODULE_PREFIX;suf=$MODULE_SUFFIX.mf:REALPRJNAME} \
193+
-o ${rootrel;output;pre=$MODULE_PREFIX;suf=$MODULE_SUFFIX.mf:REALPRJNAME} \
194194
-t $MODULE_TYPE \
195195
--ya-start-command-file \
196196
-Ya,lics $LICENSE_NAMES \
@@ -361,11 +361,11 @@ macro _FAT_OBJECT_ARGS_BASE(Flag, Lib) {
361361
}
362362

363363
# FIXME: pre=lib here is weird legacy
364-
_FAT_OBJECT_ARGS=--obj=${pre=lib;output:REALPRJNAME.o}
364+
_FAT_OBJECT_ARGS=--obj=${output;pre=lib;suf=.o:REALPRJNAME}
365365
_LD_LINK_FAT_SRCS_GLOBALS=$_LD_LINK_FAT_SRCS_GLOBALS_WA
366366

367367
macro PACK_GLOBALS_IN_LIBRARY() {
368-
SET(_FAT_OBJECT_ARGS $_FAT_OBJECT_ARGS_BASE(--globals-lib, \${output;pre=$MODULE_PREFIX:REALPRJNAME.globals.a}))
368+
SET(_FAT_OBJECT_ARGS $_FAT_OBJECT_ARGS_BASE(--globals-lib, \${output;pre=$MODULE_PREFIX;suf=.globals.a:REALPRJNAME}))
369369
}
370370

371371
when ($OS_ANDROID == "yes") {

‎build/conf/linkers/msvc_linker.conf

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,10 @@ when ($_UNDER_WINE_LINK != "yes") {
122122
GENERATE_COMMON_LIB_VFS=${GENERATE_COMMON_LIB_VFS_CMD}
123123
}
124124

125-
LINK_IMPLIB=/IMPLIB:${output;noext;rootrel;pre=$MODULE_PREFIX:REALPRJNAME.lib}
125+
LINK_IMPLIB=/IMPLIB:${rootrel;output;pre=$MODULE_PREFIX;suf=.lib;noext:REALPRJNAME}
126126
_LINK_EXTRA_OUTPUT=
127127
when (!$NO_DEBUGINFO || $NO_DEBUGINFO == "no" || $NO_DEBUGINFO == "0") {
128-
_LINK_EXTRA_OUTPUT=/PDB:${output;noext;rootrel;pre=$MODULE_PREFIX:REALPRJNAME.pdb}
128+
_LINK_EXTRA_OUTPUT=/PDB:${rootrel;output;pre=$MODULE_PREFIX;suf=.pdb;noext:REALPRJNAME}
129129
}
130130
LINK_EXTRA_OUTPUT=$_LINK_EXTRA_OUTPUT
131131

@@ -151,10 +151,10 @@ when ($EXPORTS_FILE) {
151151
}
152152

153153
GENERATE_MF_CMD=\
154-
$YMAKE_PYTHON ${input:"build/scripts/generate_mf.py"} ${input;hide:"build/scripts/process_command_files.py"} \
154+
$YMAKE_PYTHON ${input:"build/scripts/generate_mf.py"} ${hide;input:"build/scripts/process_command_files.py"} \
155155
--build-root $ARCADIA_BUILD_ROOT \
156156
--module-name $REALPRJNAME \
157-
-o ${output;rootrel;pre=$MODULE_PREFIX;suf=$MODULE_SUFFIX.mf:REALPRJNAME} \
157+
-o ${rootrel;output;pre=$MODULE_PREFIX;suf=$MODULE_SUFFIX.mf:REALPRJNAME} \
158158
-t $MODULE_TYPE \
159159
--ya-start-command-file \
160160
-Ya,lics $LICENSE_NAMES \
@@ -191,7 +191,7 @@ REAL_LINK_DYN_LIB_CMDLINE=\
191191
--ya-start-command-file \
192192
${VCS_C_OBJ_RR} \
193193
${qe;rootrel:AUTO_INPUT} \
194-
${qe;rootrel;ext=.lib:PEERS} ${qe;rootrel;ext=.dll;noext;suf=.lib:PEERS} \
194+
${qe;rootrel;ext=.lib;tags_cut:PEERS} ${qe;rootrel;ext=.dll;noext;suf=.lib;tags_cut:PEERS} \
195195
$LINK_EXE_FLAGS \
196196
$LINK_STDLIBS $LDFLAGS \
197197
$LDFLAGS_GLOBAL \
@@ -236,13 +236,13 @@ LINK_EXE_CMDLINE=\
236236
$LDFLAGS \
237237
$LDFLAGS_GLOBAL \
238238
$OBJADDE \
239-
${qe;rootrel;ext=.lib:PEERS} ${qe;rootrel;ext=.dll;noext;suf=.lib:PEERS} \
239+
${qe;rootrel;ext=.lib;tags_cut:PEERS} ${qe;rootrel;suf=.lib;noext;ext=.dll;tags_cut:PEERS} \
240240
--ya-end-command-file \
241241
${hide;kv:"soe"} ${hide;kv:"p LD"} ${hide;kv:"pc blue"}
242242

243243
LINK_EXE=$LINK_EXE_IMPL($_WHOLE_ARCHIVE_PEERS_VALUE)
244244

245-
LINK_DYN_LIB=${GENERATE_MF} && $GENERATE_VCS_C_INFO_NODEP && $REAL_LINK_DYN_LIB ${hide;kv:"soe"} ${hide;kv:"p LD"} ${hide;kv:"pc blue"}
245+
LINK_DYN_LIB=${GENERATE_MF} && $GENERATE_VCS_C_INFO_NODEP && $REAL_LINK_DYN_LIB && ${hide;kv:"soe"} ${hide;kv:"p LD"} ${hide;kv:"pc blue"}
246246

247247
LINK_EXEC_DYN_LIB_CMDLINE=\
248248
${GENERATE_MF} && \
@@ -262,7 +262,7 @@ LINK_EXEC_DYN_LIB_CMDLINE=\
262262
'--ya-start-command-file \
263263
${VCS_C_OBJ_RR} \
264264
${qe;rootrel:AUTO_INPUT} \
265-
${qe;rootrel;ext=.lib:PEERS} ${qe;rootrel;ext=.dll;noext;suf=.lib:PEERS} \
265+
${qe;rootrel;ext=.lib;tags_cut:PEERS} ${qe;rootrel;ext=.dll;noext;suf=.lib;tags_cut:PEERS} \
266266
$LINK_EXE_FLAGS \
267267
$LINK_STDLIBS \
268268
$LDFLAGS $LDFLAGS_GLOBAL \
@@ -281,7 +281,7 @@ LINK_GLOBAL_FAT_OBJECT=\
281281
${cwd:ARCADIA_BUILD_ROOT} \
282282
${LIB_WRAPPER} \
283283
${LINK_LIB_CMD} \
284-
/OUT:${output;qe;rootrel:REALPRJNAME.global.lib} \
284+
/OUT:${qe;rootrel;output;suf=.global.lib:REALPRJNAME} \
285285
--ya-start-command-file \
286286
${qe;rootrel;ext=.lib:SRCS_GLOBAL} \
287287
${qe;rootrel;ext=.obj:SRCS_GLOBAL} \
@@ -294,7 +294,7 @@ LINK_PEERS_FAT_OBJECT=\
294294
${cwd:ARCADIA_BUILD_ROOT} \
295295
${LIB_WRAPPER} \
296296
${LINK_LIB_CMD} \
297-
/OUT:${qe;rootrel;output:TARGET} \
297+
/OUT:${qe;rootrel:TARGET} \
298298
--ya-start-command-file \
299299
${qe;rootrel:PEERS} \
300300
$LINK_LIB_FLAGS \

‎build/conf/project_specific/yql_udf.conf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ when ($SANITIZER_TYPE || $USE_ARCADIA_PYTHON == "no" || $UDF_NO_PROBE == "yes" |
33
YQL_UDF_LINK_PRG_CMD=$LINK_EXEC_DYN_LIB
44
}
55
otherwise {
6-
YQL_UDF_LINK_CMD=$LINK_DYN_LIB && ${tool:"contrib/ydb/library/yql/tools/udf_probe"} $TARGET ${kv;hide:"p UD"}
7-
YQL_UDF_LINK_PRG_CMD=$LINK_EXEC_DYN_LIB && ${tool:"contrib/ydb/library/yql/tools/udf_probe"} $TARGET ${kv;hide:"p UD"}
6+
YQL_UDF_LINK_CMD=$LINK_DYN_LIB && ${tool:"contrib/ydb/library/yql/tools/udf_probe"} $TARGET ${hide;kv:"p UD"}
7+
YQL_UDF_LINK_PRG_CMD=$LINK_EXEC_DYN_LIB && ${tool:"contrib/ydb/library/yql/tools/udf_probe"} $TARGET ${hide;kv:"p UD"}
88
}
99

1010
### @usage: UDF_BASE(name [EXPORTS symlist_file] [PREFIX prefix]) #internal
@@ -149,25 +149,25 @@ macro _MAKE_YQL_UDF_CONTRIB() {
149149
###
150150
### https://yql.yandex-team.ru/docs/yt/udf/cpp/
151151
module YQL_UDF_MODULE: UDF_BASE {
152-
.CMD=YQL_UDF_LINK_CMD
152+
.CMD=$YQL_UDF_LINK_CMD
153153
_MAKE_YQL_UDF()
154154
PROVIDES(YqlServicePolicy)
155155
}
156156

157157
module YQL_UDF_YDB_MODULE: UDF_BASE {
158-
.CMD=YQL_UDF_LINK_CMD
158+
.CMD=$YQL_UDF_LINK_CMD
159159
_MAKE_YQL_UDF_YDB()
160160
PROVIDES(YqlServicePolicy)
161161
}
162162

163163
module YQL_UDF_MODULE_CONTRIB: UDF_BASE {
164-
.CMD=YQL_UDF_LINK_CMD
164+
.CMD=$YQL_UDF_LINK_CMD
165165
_MAKE_YQL_UDF_CONTRIB()
166166
PROVIDES(YqlServicePolicy)
167167
}
168168

169169
module _YQL_UDF_PROGRAM_BASE: SO_PROGRAM {
170-
.CMD=YQL_UDF_LINK_PRG_CMD
170+
.CMD=$YQL_UDF_LINK_PRG_CMD
171171
_MAKE_YQL_UDF()
172172
}
173173

‎build/conf/python.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ module PY3_LIBRARY: _LIBRARY {
629629
###
630630
### Documentation: https://wiki.yandex-team.ru/devtools/commandsandvars/py_srcs/
631631
module _BASE_PY_PROGRAM: _BASE_PROGRAM {
632-
.CMD=PY_PROGRAM_LINK_EXE
632+
.CMD=$PY_PROGRAM_LINK_EXE
633633
_ARCADIA_PYTHON_ADDINCL()
634634

635635
when ($SANITIZER_TYPE && $SANITIZER_TYPE != "no") {
@@ -693,7 +693,7 @@ otherwise {
693693
###
694694
### Documentation: https://wiki.yandex-team.ru/devtools/commandsandvars/py_srcs/
695695
module _BASE_PY3_PROGRAM: _BASE_PROGRAM {
696-
.CMD=PY3_PROGRAM_LINK_EXE
696+
.CMD=$PY3_PROGRAM_LINK_EXE
697697
_ARCADIA_PYTHON3_ADDINCL()
698698
RUN_CYTHON_SCRIPT=$YMAKE_PYTHON3 $CYTHON_SCRIPT
699699
RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON3 $CYTHON_SCRIPT

‎build/export_generators/cmake/cmake/FindAIO.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
find_path(AIO_INCLUDE_DIR
88
libaio.h
9-
HINTS $ENV{AIO_ROOT}/include)
9+
HINTS $ENV{AIO_ROOT}/include /usr/include REQUIRED)
1010

1111
find_library(AIO_LIBRARIES
1212
aio
13-
HINTS $ENV{AIO_ROOT}/lib)
13+
HINTS $ENV{AIO_ROOT}/lib REQUIRED)
1414

1515
include(FindPackageHandleStandardArgs)
1616
find_package_handle_standard_args(AIO DEFAULT_MSG AIO_LIBRARIES AIO_INCLUDE_DIR)

‎build/export_generators/cmake/cmake/FindIDN.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
find_path(IDN_INCLUDE_DIR
88
idna.h
9-
HINTS $ENV{IDN_ROOT}/include)
9+
HINTS $ENV{IDN_ROOT}/include /usr/include REQUIRED)
1010

1111
find_library(IDN_LIBRARIES
1212
idn
13-
HINTS $ENV{IDN_ROOT}/lib)
13+
HINTS $ENV{IDN_ROOT}/lib REQUIRED)
1414

1515
include(FindPackageHandleStandardArgs)
1616
find_package_handle_standard_args(IDN DEFAULT_MSG IDN_LIBRARIES IDN_INCLUDE_DIR)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class App(ConanFile):
1515

1616
settings = "os", "compiler", "build_type", "arch"
1717

18-
options = {
18+
default_options = {
1919
{%- for conan_option in conan.options -%}
2020
{%- set option_and_value = rsplit(conan_option, "=", 2) %}"{{ option_and_value[0] }}": "{{ option_and_value[1] }}"
2121
{%- if not loop.last -%}, {% endif -%}

‎build/export_generators/cmake/generator.toml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,24 @@ copy=[
399399
]
400400
add_values=[{attr="includes", values=["cmake/swig.cmake"]}]
401401

402+
[[rules]]
403+
attrs=[
404+
"packages-name=IDN",
405+
]
406+
copy=[
407+
"cmake/FindIDN.cmake",
408+
]
409+
add_values=[{attr="includes", values=["cmake/FindIDN.cmake"]}]
410+
411+
[[rules]]
412+
attrs=[
413+
"packages-name=AIO",
414+
]
415+
copy=[
416+
"cmake/FindAIO.cmake",
417+
]
418+
add_values=[{attr="includes", values=["cmake/FindAIO.cmake"]}]
419+
402420
# Conan profiles for platforms
403421
[[rules]]
404422
platforms=[

‎build/export_generators/hardcoded-cmake/cmake/FindAIO.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
find_path(AIO_INCLUDE_DIR
88
libaio.h
9-
HINTS $ENV{AIO_ROOT}/include)
9+
HINTS $ENV{AIO_ROOT}/include /usr/include REQUIRED)
1010

1111
find_library(AIO_LIBRARIES
1212
aio
13-
HINTS $ENV{AIO_ROOT}/lib)
13+
HINTS $ENV{AIO_ROOT}/lib REQUIRED)
1414

1515
include(FindPackageHandleStandardArgs)
1616
find_package_handle_standard_args(AIO DEFAULT_MSG AIO_LIBRARIES AIO_INCLUDE_DIR)

‎build/export_generators/hardcoded-cmake/cmake/FindIDN.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
find_path(IDN_INCLUDE_DIR
88
idna.h
9-
HINTS $ENV{IDN_ROOT}/include)
9+
HINTS $ENV{IDN_ROOT}/include /usr/include REQUIRED)
1010

1111
find_library(IDN_LIBRARIES
1212
idn
13-
HINTS $ENV{IDN_ROOT}/lib)
13+
HINTS $ENV{IDN_ROOT}/lib REQUIRED)
1414

1515
include(FindPackageHandleStandardArgs)
1616
find_package_handle_standard_args(IDN DEFAULT_MSG IDN_LIBRARIES IDN_INCLUDE_DIR)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class App(ConanFile):
1212

1313
settings = "os", "compiler", "build_type", "arch"
1414

15-
options = {
15+
default_options = {
1616
{%- for conan_option in conan_options -%}
1717
{%- set option_and_value = rsplit(conan_option, "=", 2) %}"{{ option_and_value[0] }}": "{{ option_and_value[1] }}"
1818
{%- if not loop.last -%}, {% endif -%}

‎build/export_generators/hardcoded-cmake/generator.toml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,24 @@ copy=[
211211
]
212212
add_values=[{attr="includes", values=["cmake/swig.cmake"]}]
213213

214+
[[rules]]
215+
attrs=[
216+
"find_package=IDN",
217+
]
218+
copy=[
219+
"cmake/FindIDN.cmake",
220+
]
221+
add_values=[{attr="includes", values=["cmake/FindIDN.cmake"]}]
222+
223+
[[rules]]
224+
attrs=[
225+
"find_package=AIO",
226+
]
227+
copy=[
228+
"cmake/FindAIO.cmake",
229+
]
230+
add_values=[{attr="includes", values=["cmake/FindAIO.cmake"]}]
231+
214232
# Conan profiles for platforms
215233
[[rules]]
216234
platforms=[

‎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:6976467840"
4+
"uri": "sbr:7025204048"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:6976467045"
7+
"uri": "sbr:7025203483"
88
},
99
"linux": {
10-
"uri": "sbr:6976469309"
10+
"uri": "sbr:7025205086"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:6976466498"
13+
"uri": "sbr:7025202905"
1414
},
1515
"win32-clang-cl": {
16-
"uri": "sbr:6976468552"
16+
"uri": "sbr:7025204551"
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:6976470248"
4+
"uri": "sbr:7025197838"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:6976469418"
7+
"uri": "sbr:7025197245"
88
},
99
"linux": {
10-
"uri": "sbr:6976471430"
10+
"uri": "sbr:7025199206"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:6976468560"
13+
"uri": "sbr:7025196577"
1414
},
1515
"win32-clang-cl": {
16-
"uri": "sbr:6976470807"
16+
"uri": "sbr:7025198615"
1717
}
1818
}
1919
}

0 commit comments

Comments
 (0)