Skip to content

Commit 207f846

Browse files
maximyurchukmaximyurchuk
authored
Merge pull request #7538 from ydb-platform/mergelibs-240807-1311
Library import 240807-1311
2 parents d1f17fc + 88460fb commit 207f846

File tree

930 files changed

+53419
-28900
lines changed

Some content is hidden

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

930 files changed

+53419
-28900
lines changed

‎build/conf/bison_lex.conf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
# This specilizes _SRC() macro, so should be imported after generic version definition
44
# Thus uses _ADD_HIDDEN_INPUTS() macro from ymake.core.conf
55

6+
M4_PATH=contrib/tools/m4
7+
68
LEX_FLAGS=
79
BISON_FLAGS=-v
810

@@ -133,7 +135,7 @@ macro USE_OLD_FLEX() {
133135

134136
macro _SRC("y", SRC, SRCFLAGS...) {
135137
.PEERDIR=build/induced/by_bison
136-
.CMD=${tool:"contrib/tools/bison"} $BISON_FLAGS --m4=${tool:"contrib/tools/m4"} $_BISON_HEADER ${hide:_BISON_GEN_EXT} -o ${nopath;output;suf=$_BISON_GEN_EXT:SRC} ${input:SRC} ${SRCFLAGS} ${kv;hide:"p YC"} ${kv;hide:"pc light-green"} && $_BISON_PP
138+
.CMD=${tool:"contrib/tools/bison"} $BISON_FLAGS ${env:"M4=${tool:M4_PATH}"} ${env:"BISON_PKGDATADIR=${ARCADIA_ROOT}/${_BISON_DATA_DIR}"} $_BISON_HEADER ${hide:_BISON_GEN_EXT} -o ${nopath;output;suf=$_BISON_GEN_EXT:SRC} ${input:SRC} ${SRCFLAGS} ${kv;hide:"p YC"} ${kv;hide:"pc light-green"} && $_BISON_PP
137139
.SEM=target_bison_parser PRIVATE ${input:SRC} ${output;nopath;noext;hide;suf=${OBJ_SUF}.o:SRC} ${nopath;noext;output;hide:SRC.h} ${nopath;noext;output;addincl;hide:SRC.h} && set_global_flags BISON_FLAGS $BISON_FLAGS && conan_require_tool m4/1.4.19 && conan_import '"bin, m4* -> ./bin/m4/bin"' && conan_require_tool bison/3.8.2 && conan_import '"bin, bison* -> ./bin/bison/bin"' && conan_import '"res, * -> ./bin/bison/res"' && target_macroses-ITEM && target_macroses-macro target_bison_parser && target_macroses-args PRIVATE ${input:SRC} ${output;nopath;noext;hide;suf=${OBJ_SUF}.o:SRC} ${nopath;noext;output;hide:SRC.h} ${nopath;noext;output;addincl;hide:SRC.h} && platform_vars-BISON_FLAGS ${quo:BISON_FLAGS} && conan-tool_requires m4/1.4.19 && conan-imports 'bin, m4* -> ./bin/m4/bin' && conan-tool_requires bison/3.8.2 && conan-imports 'bin, bison* -> ./bin/bison/bin' && conan-imports 'res, * -> ./bin/bison/res'
138140
}
139141

‎build/conf/compilers/gnu_compiler.conf

Lines changed: 6 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -204,31 +204,8 @@ _C_CPP_KV_STYLE_NEW=${hide;kv:_C_CPP_KV_STYLE_P} ${hide;kv:_C_CPP_KV_STYLE_PC}
204204
_C_CPP_KV_STYLE_P=p CC
205205
_C_CPP_KV_STYLE_PC=pc green
206206

207-
_CPP_ARGS=\
208-
$CLANG_STATIC_ANALYZER_OPTIONS && \
209-
$CLANG_TIDY_ARGS \
210-
$YNDEXER_ARGS \
211-
$RETRY_ARGS \
212-
$CXX_COMPILER_OLD \
213-
$C_FLAGS_PLATFORM \
214-
$GCC_COMPILE_FLAGS \
215-
$CXXFLAGS \
216-
$CL_MACRO_INFO \
217-
$CL_MACRO_INFO_DISABLE_CACHE__NO_UID__ \
218-
$_COMPILER_TIME_TRACE_FLAGS \
219-
$EXTRA_OUTPUT \
220-
$SRCFLAGS \
221-
$_LANG_CFLAGS_VALUE \
222-
${input:SRC} \
223-
$TOOLCHAIN_ENV \
224-
$YNDEXER_OUTPUT \
225-
&& $_COMPILER_TIME_TRACE_POSTPROCESS \
226-
$_C_CPP_KV_STYLE
227-
228-
_CPP_ARGS_NEW_CMD_0=\
229-
$CLANG_STATIC_ANALYZER_OPTIONS_NEW
230-
231-
_CPP_ARGS_NEW_CMD_1_1=\
207+
_CPP_ARGS_NEW=\
208+
$CLANG_STATIC_ANALYZER_OPTIONS_NEW && \
232209
$CLANG_TIDY_ARGS \
233210
$YNDEXER_ARGS \
234211
$RETRY_ARGS \
@@ -239,36 +216,14 @@ _CPP_ARGS_NEW_CMD_1_1=\
239216
$CL_MACRO_INFO \
240217
$CL_MACRO_INFO_DISABLE_CACHE__NO_UID__ \
241218
$_COMPILER_TIME_TRACE_FLAGS \
242-
$EXTRA_OUTPUT
243-
_CPP_ARGS_NEW_CMD_1_2=\
244-
$SRCFLAGS \
245-
$_LANG_CFLAGS_VALUE_NEW \
246-
${input:SRC} \
247-
$TOOLCHAIN_ENV \
248-
$YNDEXER_OUTPUT
249-
_CPP_ARGS_NEW_CMD_2=\
250-
$_COMPILER_TIME_TRACE_POSTPROCESS \
251-
$_C_CPP_KV_STYLE_NEW \
252-
$SCU_NAME_KV_NEW
253-
254-
_C_ARGS=\
255-
$CLANG_TIDY_ARGS \
256-
$YNDEXER_ARGS \
257-
$RETRY_ARGS \
258-
$C_COMPILER_OLD \
259-
$C_FLAGS_PLATFORM \
260-
$GCC_COMPILE_FLAGS \
261-
$CFLAGS \
262-
$CL_MACRO_INFO \
263-
$CL_MACRO_INFO_DISABLE_CACHE__NO_UID__ \
264-
$_COMPILER_TIME_TRACE_FLAGS \
265-
$CONLYFLAGS \
266219
$EXTRA_OUTPUT \
267220
$SRCFLAGS \
221+
$_LANG_CFLAGS_VALUE_NEW \
268222
${input:SRC} \
269223
$TOOLCHAIN_ENV \
270224
$YNDEXER_OUTPUT \
271-
$_C_CPP_KV_STYLE
225+
&& $_COMPILER_TIME_TRACE_POSTPROCESS \
226+
$_C_CPP_KV_STYLE_NEW
272227

273228
_C_ARGS_NEW=\
274229
$CLANG_TIDY_ARGS \
@@ -313,10 +268,7 @@ _SRC_C_NODEPS_CMD=\
313268

314269
_FORCE_CPP_FLAGS=-x c++
315270

316-
_SRC_CPP_CMD=$_CPP_ARGS
317-
_SRC_CPP_CMD_NEW= $_CPP_ARGS_NEW_CMD_0 && $_CPP_ARGS_NEW_CMD_1_1 $_CPP_ARGS_NEW_CMD_1_2 && $_CPP_ARGS_NEW_CMD_2
318-
_SRC_CPP_CMD_NEW_FORCED=$_CPP_ARGS_NEW_CMD_0 $CLANG_STATIC_ANALYZER_OPTIONS_NEW_FORCED && $_CPP_ARGS_NEW_CMD_1_1 $_FORCE_CPP_FLAGS $_CPP_ARGS_NEW_CMD_1_2 && $_CPP_ARGS_NEW_CMD_2
319-
_SRC_C_CMD=$_C_ARGS
271+
_SRC_CPP_CMD_NEW=$_CPP_ARGS_NEW
320272
_SRC_C_CMD_NEW=$_C_ARGS_NEW
321273
_SRC_M_CMD=$SRC_c($SRC $SRCFLAGS)
322274
_SRC_MASM_CMD=$_EMPTY_CMD

‎build/conf/compilers/msvc_compiler.conf

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,8 @@ when ($IDE_MSVS == "yes") {
2828
DEBUG_INFO_FLAGS=/Zi /FS
2929
}
3030

31-
# For the flags regarding runtime library selection, see
32-
# https://msdn.microsoft.com/en-us/library/abx4dbyh.aspx
33-
CFLAGS_DEBUG = /Od /Ob0 /Oi /D_DEBUG /MTd
34-
CFLAGS_RELEASE = /O2 /Ob2 /Oi /DNDEBUG /MT
31+
CFLAGS_DEBUG = /Od /Ob0 /Oi
32+
CFLAGS_RELEASE = /O2 /Ob2 /Oi
3533

3634
MASMFLAGS=
3735
_MASM_IO=/nologo /c /Fo${output;suf=${OBJECT_SUF}:SRC} ${input:SRC}
@@ -92,10 +90,7 @@ _C_CPP_KV_STYLE_P=p CC
9290
_C_CPP_KV_STYLE_PC=pc yellow
9391

9492
_SRC_C_NODEPS_CMD=${TOOLCHAIN_ENV} ${CL_WRAPPER} ${C_COMPILER} /c /Fo${OUTFILE} ${SRC} ${EXTRA_C_FLAGS} ${pre=/I :INC} ${CFLAGS} ${hide;kv:"soe"} ${hide;kv:"p CC"} ${hide;kv:"pc yellow"}
95-
_SRC_CPP_CMD=${TOOLCHAIN_ENV} ${CL_WRAPPER} ${CXX_COMPILER_OLD} /c /Fo$_COMPILE_OUTPUTS ${input:SRC} ${EXTRA_C_FLAGS} ${pre=/I :_C__INCLUDE} ${CXXFLAGS} ${SRCFLAGS} ${_LANG_CFLAGS_VALUE} ${hide;kv:"soe"} ${hide;kv:"p CC"} ${hide;kv:"pc yellow"}
9693
_SRC_CPP_CMD_NEW=${TOOLCHAIN_ENV} ${CL_WRAPPER} ${CXX_COMPILER} /c /Fo$_COMPILE_OUTPUTS ${input:SRC} ${EXTRA_C_FLAGS} ${pre=/I :_C__INCLUDE} ${CXXFLAGS} ${SRCFLAGS} ${_LANG_CFLAGS_VALUE_NEW} ${hide;kv:"soe"} ${hide;kv:_C_CPP_KV_STYLE_P} ${hide;kv:_C_CPP_KV_STYLE_PC}
97-
_SRC_CPP_CMD_NEW_FORCED=${TOOLCHAIN_ENV} ${CL_WRAPPER} ${CXX_COMPILER} /c /Fo$_COMPILE_OUTPUTS ${input:SRC} ${EXTRA_C_FLAGS} ${pre=/I :_C__INCLUDE} ${CXXFLAGS} $_FORCE_CPP_FLAGS ${SRCFLAGS} ${_LANG_CFLAGS_VALUE_NEW} ${hide;kv:"soe"} ${hide;kv:_C_CPP_KV_STYLE_P} ${hide;kv:_C_CPP_KV_STYLE_PC}
98-
_SRC_C_CMD=${TOOLCHAIN_ENV} ${CL_WRAPPER} ${C_COMPILER_OLD} /c /Fo$_COMPILE_OUTPUTS ${input:SRC} ${EXTRA_C_FLAGS} ${pre=/I :_C__INCLUDE} ${CFLAGS} ${CONLYFLAGS} ${SRCFLAGS} ${hide;kv:"soe"} ${hide;kv:"p CC"} ${hide;kv:"pc yellow"}
9994
_SRC_C_CMD_NEW=${TOOLCHAIN_ENV} ${CL_WRAPPER} ${C_COMPILER} /c /Fo$_COMPILE_OUTPUTS ${input:SRC} ${EXTRA_C_FLAGS} ${pre=/I :_C__INCLUDE} ${CFLAGS} ${CONLYFLAGS} ${SRCFLAGS} ${hide;kv:"soe"} ${hide;kv:_C_CPP_KV_STYLE_P} ${hide;kv:_C_CPP_KV_STYLE_PC}
10095
_SRC_M_CMD=$_EMPTY_CMD
10196
_SRC_MASM_CMD=${cwd:ARCADIA_BUILD_ROOT} ${TOOLCHAIN_ENV} ${ML_WRAPPER} ${MASM_COMPILER_OLD} ${MASMFLAGS} ${SRCFLAGS} $_MASM_IO ${hide;kv:"p AS"} ${hide;kv:"pc yellow"}

‎build/conf/go.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,11 +270,11 @@ elsewhen ($CGO_ENABLED == "yes") {
270270
}
271271

272272
# tag:go-specific
273-
GO_PACKAGE_VALUE=
273+
_GO_PACKAGE_VALUE=
274274
### @usage: GO_PACKAGE_NAME(Name)
275275
### Override name of a Go package.
276276
macro GO_PACKAGE_NAME(NAME) {
277-
SET(GO_PACKAGE_VALUE $NAME)
277+
SET(_GO_PACKAGE_VALUE $NAME)
278278
}
279279

280280
# tag:go-specific tag:internal

‎build/conf/linkers/ld.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ REAL_LINK_EXE_TIDY=\
227227

228228
REAL_LINK_EXEC_DYN_LIB_CMDLINE =\
229229
$YMAKE_PYTHON ${input:"build/scripts/link_dyn_lib.py"} \
230+
${hide;input:"build/scripts/link_exe.py"} \
230231
--target $TARGET
231232
REAL_LINK_EXEC_DYN_LIB_CMDLINE+=$_LD_LINKER_OUTPUT
232233
REAL_LINK_EXEC_DYN_LIB_CMDLINE+=\
@@ -253,6 +254,7 @@ LINK_DYN_LIB_FLAGS=
253254

254255
REAL_LINK_DYN_LIB_CMDLINE =\
255256
$YMAKE_PYTHON ${input:"build/scripts/link_dyn_lib.py"} \
257+
${hide;input:"build/scripts/link_exe.py"} \
256258
--target $TARGET
257259
REAL_LINK_DYN_LIB_CMDLINE+=$_LD_LINKER_OUTPUT
258260
REAL_LINK_DYN_LIB_CMDLINE+=\

‎build/conf/proto.conf

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -639,12 +639,12 @@ macro LIST_PROTO(TO="files.proto", Files...) {
639639
}
640640

641641
# tag:proto
642-
macro _PROTO_DESC_CMD(File) {
643-
.CMD=${cwd;rootdir;input:File} $PROTOC -I=./$PROTO_NAMESPACE -I=$ARCADIA_ROOT/$PROTO_NAMESPACE ${pre=-I=:_PROTO__INCLUDE} -I=$ARCADIA_BUILD_ROOT -I=$PROTOBUF_INCLUDE_PATH --descriptor_set_out=${output;suf=.desc:File} --include_source_info $_PROTOC_FLAGS ${input;rootrel:File} ${hide:PROTO_FAKEID}
642+
macro _PROTO_DESC_RAWPROTO_CMD(File) {
643+
.CMD=${cwd;rootdir;input:File} $YMAKE_PYTHON3 ${input:"build/scripts/desc_rawproto_wrapper.py"} --desc-output ${output;suf=.desc:File} --rawproto-output ${output;norel;suf=.${_MODDIR_HASH}.rawproto:File} --proto-file ${input;rootrel:File} -- $PROTOC -I=./$PROTO_NAMESPACE -I=$ARCADIA_ROOT/$PROTO_NAMESPACE ${pre=-I=:_PROTO__INCLUDE} -I=$ARCADIA_BUILD_ROOT -I=$PROTOBUF_INCLUDE_PATH --include_source_info $_PROTOC_FLAGS ${hide:PROTO_FAKEID}
644644
}
645645

646-
_PROTO_DESC_MERGE_CMD=$YMAKE_PYTHON ${input:"build/scripts/merge_files.py"} $TARGET $AUTO_INPUT ${kv;hide:"p PD"} ${kv;hide:"pc light-cyan"}
647-
_PROTO_DESC_MERGE_PEERS_CMD=$YMAKE_PYTHON ${input:"build/scripts/merge_files.py"} $TARGET $PEERS ${ext=.protodesc:SRCS_GLOBAL} ${kv;hide:"p PD"} ${kv;hide:"pc light-cyan"}
646+
_PROTO_DESC_MERGE_CMD=$YMAKE_PYTHON3 ${input:"build/scripts/merge_files.py"} $TARGET ${ext=.desc:AUTO_INPUT} ${kv;hide:"p PD"} ${kv;hide:"pc light-cyan"} && ${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON3 ${input:"build/scripts/collect_rawproto.py"} --output ${output;suf=.protosrc:REALPRJNAME} ${rootrel;ext=.rawproto:AUTO_INPUT}
647+
_PROTO_DESC_MERGE_PEERS_CMD=$YMAKE_PYTHON3 ${input:"build/scripts/merge_files.py"} $TARGET $PEERS ${ext=.protodesc:SRCS_GLOBAL} ${kv;hide:"p PD"} ${kv;hide:"pc light-cyan"} && ${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON3 ${input:"build/scripts/merge_protosrc.py"} --output ${output;suf=.tar:REALPRJNAME} ${rootrel:PEERS}
648648

649649
NEED_GOOGLE_PROTO_PEERDIRS=yes
650650

@@ -807,15 +807,17 @@ multimodule PROTO_LIBRARY {
807807
module DESC_PROTO: _BARE_UNIT {
808808
.CMD=_PROTO_DESC_MERGE_CMD
809809
.SEM=IGNORED
810-
.EXTS=.desc
810+
.EXTS=.desc .rawproto
811811
.NODE_TYPE=Library
812812
.IGNORED=GENERATE_ENUM_SERIALIZATION GENERATE_ENUM_SERIALIZATION_WITH_HEADER YMAPS_SPROTO RESOURCE GO_PROTO_PLUGIN GRPC
813+
.ALIASES=SRCS=_SRCS_NO_GLOBAL
813814

814815
SET(PEERDIR_TAGS DESC_PROTO)
815816
ENABLE(DESC_PROTO)
816817
DISABLE(_NEED_SBOM_INFO)
817818
MODULE_SUFFIX=.self.protodesc
818819
SET(MODULE_TYPE LIBRARY)
820+
SET(_MODDIR_HASH ${hash:MODDIR})
819821

820822
_EVLOG_CMDLINE=$_PROTO_DESC_CMDLINE
821823
_PROTO_CMDLINE=$_PROTO_DESC_CMDLINE
@@ -869,6 +871,6 @@ _CPP_PROTO_EVLOG_CMDLINE=$_CPP_PROTO_EVLOG_CMD($SRC)
869871
_CPP_VANILLA_PROTO_CMDLINE=$_CPP_VANILLA_PROTO_CMD($SRC)
870872
_JAVA_EVLOG_CMDLINE=$_JAVA_EVLOG_CMD($SRC)
871873
_JAVA_PROTO_CMDLINE=$_JAVA_PROTO_CMD($SRC)
872-
_PROTO_DESC_CMDLINE=$_PROTO_DESC_CMD($SRC)
874+
_PROTO_DESC_CMDLINE=$_PROTO_DESC_RAWPROTO_CMD($SRC)
873875
_PY_EVLOG_CMDLINE=$_PY_EVLOG_CMD($SRC)
874876
_PY_PROTO_CMDLINE=$_PY_PROTO_CMD($SRC)

‎build/conf/python.conf

Lines changed: 39 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,42 @@ CYTHON_SCRIPT=${input:"${ARCADIA_ROOT}/contrib/tools/cython/cython.py"} ${hide:C
33
RUN_CYTHON_SCRIPT=$YMAKE_PYTHON $CYTHON_SCRIPT
44
RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON $CYTHON_SCRIPT
55
PYTHON_TYPE_FOR_CYTHON=PY2
6+
7+
8+
CYTHON_EMBEDED_FILES=\
9+
contrib/tools/cython/Cython/Utility/Buffer.c \
10+
contrib/tools/cython/Cython/Utility/Builtins.c \
11+
contrib/tools/cython/Cython/Utility/CMath.c \
12+
contrib/tools/cython/Cython/Utility/Capsule.c \
13+
contrib/tools/cython/Cython/Utility/CommonTypes.c \
14+
contrib/tools/cython/Cython/Utility/Complex.c \
15+
contrib/tools/cython/Cython/Utility/Coroutine.c \
16+
contrib/tools/cython/Cython/Utility/CythonFunction.c \
17+
contrib/tools/cython/Cython/Utility/Embed.c \
18+
contrib/tools/cython/Cython/Utility/Exceptions.c \
19+
contrib/tools/cython/Cython/Utility/ExtensionTypes.c \
20+
contrib/tools/cython/Cython/Utility/FunctionArguments.c \
21+
contrib/tools/cython/Cython/Utility/ImportExport.c \
22+
contrib/tools/cython/Cython/Utility/MemoryView_C.c \
23+
contrib/tools/cython/Cython/Utility/ModuleSetupCode.c \
24+
contrib/tools/cython/Cython/Utility/ObjectHandling.c \
25+
contrib/tools/cython/Cython/Utility/Optimize.c \
26+
contrib/tools/cython/Cython/Utility/Overflow.c \
27+
contrib/tools/cython/Cython/Utility/Printing.c \
28+
contrib/tools/cython/Cython/Utility/Profile.c \
29+
contrib/tools/cython/Cython/Utility/StringTools.c \
30+
contrib/tools/cython/Cython/Utility/TestUtilityLoader.c \
31+
contrib/tools/cython/Cython/Utility/TypeConversion.c
32+
33+
macro _UNWRAP_TEXT_INPUTS(Files...) {
34+
.CMD=${input;context=TEXT;hide:Files}
35+
}
36+
37+
macro _UNWRAP_OUTPUT_INCLUDES(Files...) {
38+
.CMD=${output_include;hide:Files}
39+
}
40+
41+
642
CYTHON_OUTPUT_INCLUDES=\
743
${output_include;hide:"contrib/libs/python/Include/compile.h"} \
844
${output_include;hide:"contrib/libs/python/Include/frameobject.h"} \
@@ -13,36 +49,14 @@ ${output_include;hide:"contrib/libs/python/Include/pythread.h"} \
1349
${output_include;hide:"contrib/libs/python/Include/structmember.h"} \
1450
${output_include;hide:"contrib/libs/python/Include/traceback.h"} \
1551
${output_include;hide:"contrib/tools/cython/generated_c_headers.h"} \
16-
${output_include;hide:"omp.h"}
52+
${output_include;hide:"omp.h"} \
53+
$_UNWRAP_OUTPUT_INCLUDES($CYTHON_EMBEDED_FILES)
1754

1855
# tag:cython-specific
1956
CYTHON_CPP_OUTPUT_INCLUDES=${output_include;hide:"contrib/tools/cython/generated_cpp_headers.h"}
2057

2158
# tag:cython-specific
22-
CYTHON_PREDEFINED_INCLUDES=\
23-
${input;hide:"contrib/tools/cython/Cython/Utility/Buffer.c"} \
24-
${input;hide:"contrib/tools/cython/Cython/Utility/Builtins.c"} \
25-
${input;hide:"contrib/tools/cython/Cython/Utility/CMath.c"} \
26-
${input;hide:"contrib/tools/cython/Cython/Utility/Capsule.c"} \
27-
${input;hide:"contrib/tools/cython/Cython/Utility/CommonTypes.c"} \
28-
${input;hide:"contrib/tools/cython/Cython/Utility/Complex.c"} \
29-
${input;hide:"contrib/tools/cython/Cython/Utility/Coroutine.c"} \
30-
${input;hide:"contrib/tools/cython/Cython/Utility/CythonFunction.c"} \
31-
${input;hide:"contrib/tools/cython/Cython/Utility/Embed.c"} \
32-
${input;hide:"contrib/tools/cython/Cython/Utility/Exceptions.c"} \
33-
${input;hide:"contrib/tools/cython/Cython/Utility/ExtensionTypes.c"} \
34-
${input;hide:"contrib/tools/cython/Cython/Utility/FunctionArguments.c"} \
35-
${input;hide:"contrib/tools/cython/Cython/Utility/ImportExport.c"} \
36-
${input;hide:"contrib/tools/cython/Cython/Utility/MemoryView_C.c"} \
37-
${input;hide:"contrib/tools/cython/Cython/Utility/ModuleSetupCode.c"} \
38-
${input;hide:"contrib/tools/cython/Cython/Utility/ObjectHandling.c"} \
39-
${input;hide:"contrib/tools/cython/Cython/Utility/Optimize.c"} \
40-
${input;hide:"contrib/tools/cython/Cython/Utility/Overflow.c"} \
41-
${input;hide:"contrib/tools/cython/Cython/Utility/Printing.c"} \
42-
${input;hide:"contrib/tools/cython/Cython/Utility/Profile.c"} \
43-
${input;hide:"contrib/tools/cython/Cython/Utility/StringTools.c"} \
44-
${input;hide:"contrib/tools/cython/Cython/Utility/TestUtilityLoader.c"} \
45-
${input;hide:"contrib/tools/cython/Cython/Utility/TypeConversion.c"}
59+
CYTHON_PREDEFINED_INCLUDES=$_UNWRAP_TEXT_INPUTS($CYTHON_EMBEDED_FILES)
4660

4761
# tag:cython-specific
4862
CYTHON_PREDEFINED_INDUCED=\

‎build/conf/settings.conf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ FORCE_RESOLVE_MACRO_INCLS=yes
1414
ENABLE_RERESOLVE_FOR_GENERATED_FILES=yes
1515
REPORT_ALL_DUPSRC=yes
1616
DEPS_CACHE_CONTROL_UIDS_CACHE=yes
17+
INCLUDE_ISOLATED_PROJECTS_TO_CONF_HASH=yes
1718

1819
when ($YMAKE_USE_OLD_UIDS != "yes") {
1920
YMAKE_USE_NEW_UIDS=yes
@@ -41,11 +42,9 @@ _FOLDABLE_VARS=\
4142
_COMPILER_TIME_TRACE_FLAGS \
4243
_COMPILER_TIME_TRACE_GRANULARITY \
4344
_COMPILER_TIME_TRACE_POSTPROCESS \
44-
_CPP_ARGS \
4545
_CROSS_SUFFIX \
4646
_CXX_DEFINES \
4747
_CXX_FLAGS \
48-
_C_ARGS \
4948
_C_CPP_KV_STYLE \
5049
_C_FLAGS \
5150
_C_FOPTIONS \

‎build/conf/ts/ts.conf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ TS_LOCAL_CLI=no
66
TS_YNDEXING=no
77
# Use outdir defined in tsconfig (actual not for bundlers, they use own way to define output directory)
88
TS_CONFIG_USE_OUTDIR=
9+
TS_USE_PREBUILT_NOTS_TOOL=yes
910
NOTS_TOOL=${tool:"devtools/frontend_build_platform/nots/builder"}
1011

1112

@@ -16,6 +17,8 @@ TS_CONFIG_PATH=tsconfig.json
1617
### Macro sets the path for "TypeScript Config".
1718
###
1819
### - ConfigPath - config path (one at least)
20+
###
21+
### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/macros#ts-config
1922
macro TS_CONFIG(FirstConfigPath, ConfigPath...) {
2023
SET(TS_CONFIG_PATH $FirstConfigPath $ConfigPath)
2124
}
@@ -59,6 +62,8 @@ TS_GLOB_EXCLUDE_ADDITIONAL=
5962
### These files won't be copied to BINDIR.
6063
###
6164
### - GlobExpression - glob expression
65+
###
66+
### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/macros#ts-exclude-files-glob
6267
macro TS_EXCLUDE_FILES_GLOB(GlobExpression) {
6368
SET(TS_GLOB_EXCLUDE_ADDITIONAL $GlobExpression)
6469
}
@@ -99,6 +104,8 @@ ESLINT_CONFIG_PATH=.eslintrc.js
99104
### Macro sets the path for ESLint config file.
100105
###
101106
### - ConfigPath - config path
107+
###
108+
### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/macros#ts-eslint-config
102109
macro TS_ESLINT_CONFIG(ConfigName) {
103110
SET(ESLINT_CONFIG_PATH $ConfigName)
104111
}

‎build/conf/ts/ts_next.conf

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ TS_NEXT_CONFIG_PATH=next.config.js
44
###
55
### Macro sets the config path for TS_NEXT module.
66
###
7-
### - ConfigPath - config path
7+
### - ConfigPath - config path. Default value: next.config.js
8+
###
9+
### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/TS_NEXT#ts-next-config
810
macro TS_NEXT_CONFIG(ConfigPath) {
911
SET(TS_NEXT_CONFIG_PATH $ConfigPath)
1012
}
@@ -16,7 +18,9 @@ TS_NEXT_OUTPUT_DIR=.next
1618
###
1719
### Macro sets the output directory name for TS_NEXT module.
1820
###
19-
### - DirName - output directory name
21+
### - DirName - output directory name. Default value: .next.
22+
###
23+
### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/TS_NEXT#ts-next-output
2024
macro TS_NEXT_OUTPUT(DirName) {
2125
SET(TS_NEXT_OUTPUT_DIR $DirName)
2226
}
@@ -32,12 +36,14 @@ TS_NEXT_CMD=$TOUCH_UNIT \
3236
${output;hide:"package.json"} \
3337
${kv;hide:"pc magenta"} ${kv;hide:"p TS_NXT"}
3438

35-
### @usage: TS_NEXT()
39+
### @usage: TS_NEXT([name])
3640
###
3741
### NextJS app, built with `next build`. Requires sources to be under /src folder.
3842
### /pages and /app on the root level ar not supported.
3943
### Build results are output.tar.
4044
###
45+
### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/TS_NEXT
46+
###
4147
### @example
4248
###
4349
### TS_NEXT()

0 commit comments

Comments
 (0)