Skip to content

Commit bfc5f0e

Browse files
committed
Merge pull request #27512 from ydb-platform/merge-rightlib-251023-1841
2 parents aa1cb3a + 86412ec commit bfc5f0e

File tree

1,909 files changed

+163028
-182130
lines changed

Some content is hidden

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

1,909 files changed

+163028
-182130
lines changed

build/conf/bison_lex.conf

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,16 @@ macro _SRC("l", SRC, SRCFLAGS...) {
161161

162162
# tag:src-processing
163163
macro _SRC("lex", SRC, SRCFLAGS...) {
164-
.CMD=$_SRC(l $SRC $SRCFLAGS)
164+
# TODO redirection .CMD=$_SRC(l $SRC $SRCFLAGS)
165+
.CMD=$_FLEX_TOOL $LEX_FLAGS ${SRCFLAGS} $_FLEX_HEADER ${hide:_FLEX_GEN_EXT} -o${output;suf=$_FLEX_GEN_EXT:SRC} ${hide;output_include:"util/system/compiler.h"} ${input:SRC} ${hide;kv:"p LX"} ${hide;kv:"pc yellow"}
166+
.STRUCT_CMD=yes
167+
.ADDINCL=$_FLEX_TOOL_DIR
165168
}
166169

167170
# tag:src-processing
168171
macro _SRC("lpp", SRC, SRCFLAGS...) {
169-
.CMD=$_SRC(l $SRC $SRCFLAGS)
170-
#.STRUCT_CMD=yes
172+
# TODO redirection .CMD=$_SRC(l $SRC $SRCFLAGS)
173+
.CMD=$_FLEX_TOOL $LEX_FLAGS ${SRCFLAGS} $_FLEX_HEADER ${hide:_FLEX_GEN_EXT} -o${output;suf=$_FLEX_GEN_EXT:SRC} ${hide;output_include:"util/system/compiler.h"} ${input:SRC} ${hide;kv:"p LX"} ${hide;kv:"pc yellow"}
174+
.STRUCT_CMD=yes
175+
.ADDINCL=$_FLEX_TOOL_DIR
171176
}

build/conf/custom_lint.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ JSON_LINTER_DEFAULT_CONFIGS=build/config/tests/json_style/default_configs.json
33

44
# tag:lint tag:internal
55
macro _CUSTOM_LINT_FILES(GLOB_VAR, EXT, DIRS[], DIRS_RECURSE[]) {
6-
_GLOB(${GLOB_VAR} ${suf=/*.(${EXT}):DIRS} ${suf=/**/*.(${EXT}):DIRS_RECURSE} ${suf=/**/ya.make:DIRS_RECURSE} ${suf=/ya.make:DIRS} EXCLUDE ya.make)
6+
_GLOB(${GLOB_VAR} ${suf=/*.(${EXT}):DIRS} ${suf=/**/*.(${EXT}):DIRS_RECURSE} ${suf=/**/ya.make:DIRS_RECURSE} ${suf=/ya.make:DIRS} EXCLUDE ya.make RESTRICTIONS MAX_MATCHES 10000 MAX_WATCH_DIRS 5000)
77
}
88

99
# tag: internal

build/conf/docs.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ module DOCS_LIBRARY: _DOCS_BARE_UNIT {
107107
macro _DOCS_SRCS(SRCDIR=".", EXCLUDE[], INCLUDE...) {
108108
SET(_VAR_DOCS_SRCS_SALT __SRCDIR__ $SRCDIR __EXCLUDE__ $EXCLUDE __INCLUDE__ $INCLUDE)
109109
SET(_DOCS_SRCS_GLOB uniq_docs_${hash:_VAR_DOCS_SRCS_SALT})
110-
_GLOB(${_DOCS_SRCS_GLOB} ${pre=${SRCDIR}/:INCLUDE} EXCLUDE ${EXCLUDE})
110+
_GLOB(${_DOCS_SRCS_GLOB} ${pre=${SRCDIR}/:INCLUDE} EXCLUDE ${EXCLUDE} RESTRICTIONS MAX_MATCHES 10000 MAX_WATCH_DIRS 5000)
111111
SET_APPEND(_DOCS_SOURCES_VALUE ${input:$_DOCS_SRCS_GLOB})
112112
SET(_YFM_DOCS_DIR_DEFAULT_VALUE __dummy_dir__)
113113
}
@@ -311,7 +311,7 @@ macro _YFM_DOCS_DIR(DIR) {
311311

312312
SET(_VAR_DOCS_DIR_SALT __MODDIR__ $MODDIR __DIR__ $DIR)
313313
SET(_DOCS_DIR_GLOB uniq_docs_dir_${hash:_VAR_DOCS_DIR_SALT})
314-
_LATE_GLOB(${_DOCS_DIR_GLOB} ${ARCADIA_ROOT}/$DIR/**/*)
314+
_LATE_GLOB(${_DOCS_DIR_GLOB} ${ARCADIA_ROOT}/$DIR/**/* RESTRICTIONS MAX_MATCHES 10000 MAX_WATCH_DIRS 5000)
315315
SET_APPEND(_DOCS_IMPLICIT_SRCS_VALUE \${hide;input:$_DOCS_DIR_GLOB})
316316

317317
# We set the value of var _YFM_DOCS_DIR_DEFAULT_VALUE to some non-existing dir. This value

build/conf/go.conf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
###
44
### Recursively collect files for swagger config creation
55
macro COLLECT_GO_SWAGGER_FILES(Varname, Dir) {
6-
_GLOB($Varname $Dir/**/*.go ${ARCADIA_ROOT}/go.mod)
6+
_GLOB($Varname $Dir/**/*.go ${ARCADIA_ROOT}/go.mod RESTRICTIONS MAX_MATCHES 10000 MAX_WATCH_DIRS 5000)
77
}
88

99
# tag:go-specific
@@ -215,6 +215,7 @@ _GO_TOOL_COMMON_FLAGS=\
215215
# tag:go-specific
216216
macro _GO_GEN_COVER_GO(GO_FILE, GO_COVER_OUTPUT, VAR_ID) {
217217
.CMD=${hide:_GO_FAKEID} ${cwd;rootdir;input:GO_FILE} $GO_TOOLS_ROOT/pkg/tool/$_GO_TC_PATH/cover -mode set -var $VAR_ID -o ${output;suf=.cover.go;noext:GO_COVER_OUTPUT} ${rootrel;input:GO_FILE} ${hide;kv:"p go"} ${hide;kv:"pc light-blue"}
218+
.STRUCT_CMD=yes
218219
}
219220

220221
# tag:go-specific
@@ -390,10 +391,10 @@ _GO_EMBED_INPUTS=
390391
macro _GO_EMBED_PATTERN(XTEST?"_xtest":"", PATTERN, IMPORT_PATH) {
391392
SET(VAR_SALT1 $XTEST $PATTERN $IMPORT_PATH 1)
392393
SET(_PATTERN_GLOB1 uniq_embed_${hash:VAR_SALT1})
393-
_GLOB($_PATTERN_GLOB1 ${ARCADIA_ROOT}/${IMPORT_PATH}/${PATTERN}/**/* EXCLUDE ${ARCADIA_ROOT}/${IMPORT_PATH}/${PATTERN}/**/_* ${ARCADIA_ROOT}/${IMPORT_PATH}/${PATTERN}/**/.*)
394+
_GLOB($_PATTERN_GLOB1 ${ARCADIA_ROOT}/${IMPORT_PATH}/${PATTERN}/**/* EXCLUDE ${ARCADIA_ROOT}/${IMPORT_PATH}/${PATTERN}/**/_* ${ARCADIA_ROOT}/${IMPORT_PATH}/${PATTERN}/**/.* RESTRICTIONS MAX_MATCHES 10000 MAX_WATCH_DIRS 5000)
394395
SET(VAR_SALT2 $XTEST $PATTERN $IMPORT_PATH 2)
395396
SET(_PATTERN_GLOB2 _uniq_embed_${hash:VAR_SALT2})
396-
_GLOB($_PATTERN_GLOB2 ${ARCADIA_ROOT}/${IMPORT_PATH}/${PATTERN})
397+
_GLOB($_PATTERN_GLOB2 ${ARCADIA_ROOT}/${IMPORT_PATH}/${PATTERN} RESTRICTIONS MAX_MATCHES 10000 MAX_WATCH_DIRS 5000)
397398
SET_APPEND(_GO_EMBED_VALUE ++embed$XTEST ${ARCADIA_ROOT}/${IMPORT_PATH} $PATTERN \$$_PATTERN_GLOB1 \$$_PATTERN_GLOB2)
398399
SET_APPEND(_GO_EMBED_INPUTS \$$_PATTERN_GLOB1 \$$_PATTERN_GLOB2)
399400
}
@@ -429,7 +430,7 @@ macro GO_XTEST_EMBED_PATTERN(PATTERN) {
429430
macro _GO_EMBED_DIR(XTEST?"_xtest":"", DIR, IMPORT_PATH, ALL?"all:":"", EXCLUDES...) {
430431
SET(VAR_SALT $XTEST $DIR $IMPORT_PATH)
431432
SET(_PATTERN_GLOB uniq_embed_${hash:VAR_SALT})
432-
_GLOB($_PATTERN_GLOB ${ARCADIA_ROOT}/${IMPORT_PATH}/${DIR}/**/* EXCLUDE ${pre=${ARCADIA_ROOT}/${IMPORT_PATH}/${DIR}/**/:EXCLUDES})
433+
_GLOB($_PATTERN_GLOB ${ARCADIA_ROOT}/${IMPORT_PATH}/${DIR}/**/* EXCLUDE ${pre=${ARCADIA_ROOT}/${IMPORT_PATH}/${DIR}/**/:EXCLUDES} RESTRICTIONS MAX_MATCHES 10000 MAX_WATCH_DIRS 5000)
433434
SET_APPEND(_GO_EMBED_VALUE ++embed$XTEST ${ARCADIA_ROOT}/${IMPORT_PATH} $ALL$DIR \$$_PATTERN_GLOB)
434435
SET_APPEND(_GO_EMBED_INPUTS \$$_PATTERN_GLOB)
435436
}

build/conf/java.conf

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,7 @@ EXT_JAVA_VCS_INFO=no
412412
### By default this is disabled.
413413
macro EMBED_JAVA_VCS_INFO() {
414414
.SEM=add_vcs_info_to_mf ${hide;output:"VcsInfoMfDummy.java"}
415+
.STRUCT_SEM=yes
415416
ENABLE(EXT_JAVA_VCS_INFO)
416417
}
417418

@@ -492,7 +493,7 @@ macro _JAVA_SRCS(RESOURCES?"yes":"no", SRCDIR=".", PACKAGE_PREFIX="", EXCLUDE[],
492493
SET_APPEND(ALL_SRCDIRS $SRCDIR)
493494
SET(VAR_SALT $SRCDIR $Globs $EXCLUDE $PACKAGE_PREFIX $RESOURCES $FILES)
494495
SET(JAR_SRCS_GLOB uniq_${hash:VAR_SALT})
495-
_LATE_GLOB(${JAR_SRCS_GLOB} ${pre=${SRCDIR}/:Globs} EXCLUDE ${EXCLUDE})
496+
_LATE_GLOB(${JAR_SRCS_GLOB} ${pre=${SRCDIR}/:Globs} EXCLUDE ${EXCLUDE} RESTRICTIONS MAX_MATCHES 10000 MAX_WATCH_DIRS 5000)
496497
SET_APPEND(LINT_JAVA_SOURCES \${rootrel;ext=.java;input:${JAR_SRCS_GLOB}})
497498
SET_APPEND(ALL_JAR_SOURCES --jsources ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.src.txt --resources ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.res.txt --srcdir ${quo:SRCDIR} \${input:${JAR_SRCS_GLOB}} ${pre=\$\{input\:\";suf=\"\}:FILES})
498499
_FILL_JAR_COPY_RESOURCES_CMD(LINK_JAR_RESOURCES ${quo:SRCDIR} ${BINDIR}/cls ${PACKAGE_PREFIX} ${BINDIR}/misc/${tolower:JAR_SRCS_GLOB}.res.txt)
@@ -519,8 +520,9 @@ macro FULL_JAVA_SRCS(Args...) {
519520
# tag:java-specific
520521
### @usage: DEFAULT_JAVA_SRCS_LAYOUT()
521522
###
522-
### DEFAULT_JAVA_SRCS_LAYOUT() declare all source files can be find at maven/gradle standard path src/main/java **/*.java
523-
### and all resources an be find at maven/gradle standard path src/main/resources **/*
523+
### Configures standard Maven/Gradle directory layout for main sources:
524+
### - Java/Kotlin sources: src/main/java/**/*.java (and Kotlin equivalents)
525+
### - Resources: src/main/resources/**/*
524526
macro DEFAULT_JAVA_SRCS_LAYOUT() {
525527
# Maven default source paths, supported by gradle too
526528
# JAVA_SRCS may be alias of FULL_JAVA_SRCS
@@ -531,8 +533,14 @@ macro DEFAULT_JAVA_SRCS_LAYOUT() {
531533
# tag:java-specific
532534
### @usage: DEFAULT_JUNIT_JAVA_SRCS_LAYOUT()
533535
###
534-
### DEFAULT_JUNIT_JAVA_SRCS_LAYOUT() declare all test source files can be find at maven/gradle standard path src/test/java **/*.java
535-
### and all resources can be find at maven/gradle standard path src/test/resources **/*
536+
### Configures standard Maven/Gradle directory layout for JUnit tests:
537+
### - Java/Kotlin sources: java/**/*.java (and Kotlin equivalents)
538+
### - Test resources: resources/**/*
539+
###
540+
### Note: This macro assumes it's called from within src/test directory context.
541+
### The actual paths will be:
542+
### - Sources: src/test/java/**/*.java
543+
### - Resources: src/test/resources/**/*
536544
macro DEFAULT_JUNIT_JAVA_SRCS_LAYOUT() {
537545
# Maven default test source paths, supported by gradle too
538546
# JAVA_SRCS may be alias of FULL_JAVA_SRCS
@@ -569,12 +577,13 @@ macro JAVA_IGNORE_CLASSPATH_CLASH_FOR(Args...) {
569577
# tag:java-specific
570578
# Fill semantic by RUN_JAVA_PROGRAM()
571579
macro _DO_2_RUN_JAR_PROGRAM(IN_DIRS_VAR="uniq_", IN_DIRS_INPUTS[], IN{input}[], IN_NOPARSE{input}[], IN_DIR[], OUT_NOAUTO{output}[], OUT{output}[], TOOL{tool}[], OUT_DIR[], CLASSPATH[], ADD_SRCS_TO_CLASSPATH?"yes":"no", CWD="${ARCADIA_BUILD_ROOT}", STDOUT="", STDOUT_NOAUTO="", HASH_SUF="hash_suf", Args...) {
572-
_LATE_GLOB(${IN_DIRS_VAR} ${suf=/**/*:IN_DIR})
580+
_LATE_GLOB(${IN_DIRS_VAR} ${suf=/**/*:IN_DIR} RESTRICTIONS MAX_MATCHES 10000 MAX_WATCH_DIRS 5000)
573581
_CHECK_RUN_JAVA_PROG_CLASSPATH($CLASSPATH)
574582
.PEERDIR=build/platform/java/jdk $JDK_RESOURCE_PEERDIR
575583
.CMD=${hide;kv:"p RJ"} ${hide;kv:"pc blue"} ${hide:JAVA_FAKEID} ${cwd:BINDIR} $YMAKE_PYTHON3 ${input:"build/scripts/mkdir.py"} ${OUT_DIR} && ${cwd:CWD} $YMAKE_PYTHON3 ${input:"build/scripts/setup_java_tmpdir.py"} $YMAKE_PYTHON3 ${input:"build/scripts/stdout2stderr.py"} ${pre=--file=:STDOUT} ${hide;output:STDOUT} ${pre=--file=:STDOUT_NOAUTO} ${hide;noauto;output:STDOUT_NOAUTO} $YMAKE_PYTHON3 ${input:"build/scripts/fix_java_command_file_cp.py"} --build-root ${ARCADIA_BUILD_ROOT} $JDK_RESOURCE/bin/java -Dfile.encoding=utf8 -classpath ${RUN_JAR_PROG_CP_PRE}${tool:CLASSPATH}${RUN_JAR_PROG_CP_SUF} ${Args} && $_GENTAR_HELPER(HASH_SUF $HASH_SUF OUT_DIR $OUT_DIR) ${hide;input:IN} ${hide;context=TEXT;input=TEXT:IN_NOPARSE} ${hide;noauto;output:OUT_NOAUTO} ${hide;output:OUT} ${hide;tool:TOOL} ${hide;input:IN_DIRS_INPUTS}
576584
.STRUCT_CMD=yes
577585
.SEM=runs-ITEM && runs-args ${Args} && runs-classpath ${RUN_JAR_PROG_CP_PRE}${tool:CLASSPATH}${RUN_JAR_PROG_CP_SUF} && runs-cwd ${CWD} ${hide;cwd:CWD} && runs-in ${IN} ${hide;input:IN} && runs-in_dir ${IN_DIR} && runs-in_noparse ${IN_NOPARSE} ${hide;context=TEXT;input=TEXT:IN_NOPARSE} && runs-out ${OUT} ${hide;output:OUT} ${OUT_NOAUTO} ${hide;noauto;output:OUT_NOAUTO} $_GENTAR_HELPER(HASH_SUF $HASH_SUF OUT_DIR $OUT_DIR) && runs-out_dir ${OUT_DIR} && runs-tool ${tool:TOOL}
586+
.STRUCT_SEM=yes
578587
}
579588

580589
# tag:java-specific
@@ -893,6 +902,7 @@ macro _JAVAC_RUN_HELPER(JAVAC_CMD_WITH_ARGS...) {
893902
}
894903

895904
# tag:java-specific
905+
ERROR_PRONE_BASE_CHECKS=-Xep:FunctionalInterfaceMethodChanged:WARN -Xep:ReturnValueIgnored:WARN
896906
ERROR_PRONE_JDK16PLUS_ADD_OPENS=-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED -J--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
897907
ERROR_PRONE_2_7_1_FORCED_OPTS=-Xep:InlineMeInliner:OFF -Xep:SameNameButDifferent:OFF
898908
ERROR_PRONE_2_3_7_FORCED_OPTS=--should-stop=ifError=FLOW
@@ -1273,6 +1283,10 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
12731283
PEERDIR+=$ERROR_PRONE_PEERDIR
12741284
RUN_JAVAC_ARGS=--error-prone $ERROR_PRONE_RESOURCE/error_prone.jar
12751285

1286+
JAVAC_FLAGS_VALUE+=$ERROR_PRONE_BASE_CHECKS
1287+
JAVAC_OPTS+=$ERROR_PRONE_BASE_CHECKS
1288+
_JAVAC_SEM+= && javac_flags $ERROR_PRONE_BASE_CHECKS
1289+
12761290
when ($JDK_REAL_VERSION == "17" || $JDK_REAL_VERSION == "21" || $JDK_REAL_VERSION == "22" || $JDK_REAL_VERSION == "23" || $JDK_REAL_VERSION == "24" || $JDK_REAL_VERSION == "25") {
12771291
JAVAC_FLAGS_VALUE+=$ERROR_PRONE_JDK16PLUS_ADD_OPENS
12781292
JAVAC_OPTS+=$ERROR_PRONE_JDK16PLUS_ADD_OPENS

build/conf/proto.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -587,6 +587,7 @@ _PY_EVLOG_CMD_INTERNAL_KV=ext_out_name_for_${suf=__int${_PYTHON_VER}___ev_pb2.py
587587
macro _PY_EVLOG_CMD_INTERNAL(File) {
588588
.CMD=${cwd;rootdir;input:File} $GEN_PY_PROTOS --suffixes $PY_EVLOG_SUFFIXES --input ${rootrel;input:File} --ns /$PROTO_NAMESPACE -- $_PY_EVLOG_CMD_BASE($File __int${_PYTHON_VER}___ev_pb2.py ${hide;kv:_PY_EVLOG_CMD_INTERNAL_KV})
589589
.STRUCT_CMD=yes
590+
.STRUCT_SEM=yes
590591
}
591592

592593
# tag:java-specific tag:proto

build/conf/python.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ module PY_ANY_MODULE: DLL_UNIT {
500500

501501
# -bundle
502502
when ($DARWIN == "yes") {
503-
when ($COMPILER_VERSION == "16" || $COMPILER_VERSION == "18") {
503+
when ($COMPILER_VERSION == "16" || $COMPILER_VERSION == "18" || $COMPILER_VERSION == "20") {
504504
# TODO(pg): also check 19 and beyond
505505
}
506506
otherwise {
@@ -1070,7 +1070,7 @@ _ALL_PY_FILES=
10701070

10711071
# tag:python-specific
10721072
macro _ALL_PY_SRCS2(TOP_LEVEL?"TOP_LEVEL":"", RECURSIVE?"/**":"", ONLY_TEST_FILES?"test_*.py":"*.py", ONLY_TEST_FILES2?"*_test.py":"***", NO_TEST_FILES?"**/test_*.py **/*_test.py":"", NAMESPACE[], REST[], REST2[], EAT_TAIL[]) {
1073-
_GLOB(_ALL_PY_FILES ${suf=${RECURSIVE}/${ONLY_TEST_FILES}:REST} ${suf=${RECURSIVE}/${ONLY_TEST_FILES2}:REST2} ${suf=${RECURSIVE}/ya.make:REST} EXCLUDE ya.make ${NO_TEST_FILES})
1073+
_GLOB(_ALL_PY_FILES ${suf=${RECURSIVE}/${ONLY_TEST_FILES}:REST} ${suf=${RECURSIVE}/${ONLY_TEST_FILES2}:REST2} ${suf=${RECURSIVE}/ya.make:REST} EXCLUDE ya.make ${NO_TEST_FILES} RESTRICTIONS MAX_MATCHES 10000 MAX_WATCH_DIRS 5000)
10741074
}
10751075

10761076
# tag:python-specific
@@ -1116,7 +1116,7 @@ _PY_EXTRA_LINT_FILES_VALUE=
11161116

11171117
# tag:python-specific
11181118
macro _ALL_PY_EXTRA_LINT_FILES2(Dirs...) {
1119-
_GLOB(_ALL_PY_EXTRA_LINT_FILES_VALUE ${suf=/*.py:Dirs})
1119+
_GLOB(_ALL_PY_EXTRA_LINT_FILES_VALUE ${suf=/*.py:Dirs} RESTRICTIONS MAX_MATCHES 10000 MAX_WATCH_DIRS 5000)
11201120
}
11211121

11221122
# tag:python-specific

build/conf/swig.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ when ($USE_SYSTEM_JDK == "yes" || $OS_ANDROID == "yes") {
2929
macro _SWIG_PYTHON_CPP(Src, DstSubPrefix) {
3030
.CMD=$_SWIG_TOOL -I$ARCADIA_BUILD_ROOT -I$ARCADIA_ROOT -I$_SWIG_LIBRARY_ABS/python -I$_SWIG_LIBRARY_ABS -c++ -python -module ${nopath:DstSubPrefix} -interface ${suf=_swg;nopath:DstSubPrefix} -o ${output;suf=.swg.cpp:DstSubPrefix} ${input:Src} ${hide;noauto;output;suf=.py:DstSubPrefix} ${hide;kv:"p SW"} ${hide;kv:"pc yellow"}
3131
.STRUCT_CMD=yes
32+
.STRUCT_SEM=yes
3233
.PEERDIR=contrib/tools/swig/Lib/python
3334
}
3435

@@ -39,6 +40,7 @@ macro _SWIG_PYTHON_CPP(Src, DstSubPrefix) {
3940
macro _SWIG_PYTHON_C(Src, DstSubPrefix) {
4041
.CMD=$_SWIG_TOOL -I$ARCADIA_BUILD_ROOT -I$ARCADIA_ROOT -I$_SWIG_LIBRARY_ABS/python -I$_SWIG_LIBRARY_ABS -python -module ${nopath:DstSubPrefix} -interface ${suf=_swg;nopath:DstSubPrefix} -o ${output;suf=.swg.c:DstSubPrefix} ${input:Src} ${hide;noauto;output;suf=.py:DstSubPrefix} ${hide;kv:"p SW"} ${hide;kv:"pc yellow"}
4142
.STRUCT_CMD=yes
43+
.STRUCT_SEM=yes
4244
.PEERDIR=contrib/tools/swig/Lib/python
4345
}
4446

build/conf/ts/ts.conf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,10 @@ _TS_LINT_SRCS_VALUE=
141141
macro _TS_CONFIG_EPILOGUE() {
142142
### Fill $TS_GLOB_FILES with potential inputs.
143143
### It will be reduced later in _TS_CONFIGURE based on `tsconfig.json` rules.
144-
_GLOB(TS_GLOB_FILES $TS_GLOB_INCLUDE EXCLUDE $TS_GLOB_EXCLUDE)
145-
_GLOB(TS_GLOB_TEST_FILES $TS_GLOB_TESTS)
144+
_GLOB(TS_GLOB_FILES $TS_GLOB_INCLUDE EXCLUDE $TS_GLOB_EXCLUDE RESTRICTIONS MAX_MATCHES 10000 MAX_WATCH_DIRS 5000)
145+
_GLOB(TS_GLOB_TEST_FILES $TS_GLOB_TESTS RESTRICTIONS MAX_MATCHES 10000 MAX_WATCH_DIRS 5000)
146146

147-
_GLOB(_TS_LINT_SRCS_VALUE **/*.(ts|tsx|js|jsx) EXCLUDE $TS_EXCLUDE_DIR_GLOB $TS_COMMON_OUTDIR_GLOB $TS_GLOB_EXCLUDE_ADDITIONAL)
147+
_GLOB(_TS_LINT_SRCS_VALUE **/*.(ts|tsx|js|jsx) EXCLUDE $TS_EXCLUDE_DIR_GLOB $TS_COMMON_OUTDIR_GLOB $TS_GLOB_EXCLUDE_ADDITIONAL RESTRICTIONS MAX_MATCHES 10000 MAX_WATCH_DIRS 5000)
148148

149149
_SETUP_BUILD_ENV()
150150
}
@@ -164,6 +164,7 @@ TSYNDEXER_CMD=${cwd:ARCADIA_BUILD_ROOT} \
164164
### The macro is called from nots.py plugin in case we have `TS_YNDEXING=yes` flag set.
165165
macro _DO_TS_YNDEXING() {
166166
.CMD=$TSYNDEXER_CMD
167+
.STRUCT_CMD=yes
167168
}
168169

169170
# Used as inputs in TS_COMPILE through `$_AS_HIDDEN_INPUTS(IN $TS_INPUT_FILES)`
@@ -213,7 +214,7 @@ macro TS_FILES(Files...) {
213214
### Adds files to output by glob, e.g. TS_FILES_GLOB(**/*.css)
214215
### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/TS_PACKAGE#ts-files-glob
215216
macro TS_FILES_GLOB(Glob...) {
216-
_GLOB(FILES_BY_GLOB ${Glob})
217+
_GLOB(FILES_BY_GLOB ${Glob} RESTRICTIONS MAX_MATCHES 10000 MAX_WATCH_DIRS 5000)
217218
TS_FILES(${FILES_BY_GLOB})
218219
}
219220

build/conf/ts/ts_test.conf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,10 @@ _TS_TEST_EXTRA_SRCS_VALUE=
214214
###
215215
### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/macros#ts-test-srcs
216216
macro TS_TEST_SRCS(DIRS...) {
217-
_GLOB(_TS_TEST_SRCS_VALUE ${suf=/**/*.$TS_TEST_EXTENSION:DIRS})
217+
_GLOB(_TS_TEST_SRCS_VALUE ${suf=/**/*.$TS_TEST_EXTENSION:DIRS} RESTRICTIONS MAX_MATCHES 10000 MAX_WATCH_DIRS 5000)
218218
SRCS($_TS_TEST_SRCS_VALUE)
219219

220-
_GLOB(_TS_TEST_EXTRA_SRCS_VALUE ${suf=$TS_TEST_EXTRA_SRCS_MASK:DIRS})
220+
_GLOB(_TS_TEST_EXTRA_SRCS_VALUE ${suf=$TS_TEST_EXTRA_SRCS_MASK:DIRS} RESTRICTIONS MAX_MATCHES 10000 MAX_WATCH_DIRS 5000)
221221
SRCS($_TS_TEST_EXTRA_SRCS_VALUE)
222222
}
223223

@@ -237,7 +237,7 @@ _TS_TEST_DATA_DIRS_RENAME_VALUE=
237237
### It is possible to specify multiple renaming rules in the following format "dir1:dir2;dir3/foo:dir4/bar", where "dir1" and "dir3" folders in curdir.
238238
### - GLOBS... - globs to tests data files, symbolic links will be created to their folders. For example - "tests_data/**/*".
239239
macro TS_TEST_DATA(RENAME="", GLOBS...) {
240-
_GLOB(_TS_TEST_DATA_VALUE $GLOBS)
240+
_GLOB(_TS_TEST_DATA_VALUE $GLOBS RESTRICTIONS MAX_MATCHES 10000 MAX_WATCH_DIRS 5000)
241241
SET(_TS_TEST_DATA_DIRS_RENAME_VALUE $RENAME)
242242
}
243243

@@ -309,5 +309,5 @@ macro TS_STYLELINT(_CONFIG) {
309309
ENABLE(_TS_STYLELINT_VALUE)
310310
SET(_TS_STYLELINT_CONFIG $_CONFIG)
311311

312-
_GLOB(_TS_STYLELINT_FILES **/*(.css|.scss|.less) EXCLUDE $TS_EXCLUDE_DIR_GLOB $TS_COMMON_OUTDIR_GLOB $TS_GLOB_EXCLUDE_ADDITIONAL)
312+
_GLOB(_TS_STYLELINT_FILES **/*(.css|.scss|.less) EXCLUDE $TS_EXCLUDE_DIR_GLOB $TS_COMMON_OUTDIR_GLOB $TS_GLOB_EXCLUDE_ADDITIONAL RESTRICTIONS MAX_MATCHES 10000 MAX_WATCH_DIRS 5000)
313313
}

0 commit comments

Comments
 (0)