Merge pull request #7538 from ydb-platform/mergelibs-240807-1311

Library import 240807-1311

build/conf/bison_lex.conf

@@ -3,6 +3,8 @@
 # This specilizes _SRC() macro, so should be imported after generic version definition
 # Thus uses _ADD_HIDDEN_INPUTS() macro from ymake.core.conf
 
+M4_PATH=contrib/tools/m4
+
 LEX_FLAGS=
 BISON_FLAGS=-v
 
@@ -133,7 +135,7 @@ macro USE_OLD_FLEX() {
 
 macro _SRC("y", SRC, SRCFLAGS...) {
     .PEERDIR=build/induced/by_bison
-    .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
+    .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
     .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'
 }
 

build/conf/compilers/gnu_compiler.conf

@@ -204,31 +204,8 @@ _C_CPP_KV_STYLE_NEW=${hide;kv:_C_CPP_KV_STYLE_P} ${hide;kv:_C_CPP_KV_STYLE_PC}
 _C_CPP_KV_STYLE_P=p CC
 _C_CPP_KV_STYLE_PC=pc green
 
-_CPP_ARGS=\
-    $CLANG_STATIC_ANALYZER_OPTIONS && \
-    $CLANG_TIDY_ARGS \
-    $YNDEXER_ARGS \
-    $RETRY_ARGS \
-    $CXX_COMPILER_OLD \
-    $C_FLAGS_PLATFORM \
-    $GCC_COMPILE_FLAGS \
-    $CXXFLAGS \
-    $CL_MACRO_INFO \
-    $CL_MACRO_INFO_DISABLE_CACHE__NO_UID__ \
-    $_COMPILER_TIME_TRACE_FLAGS \
-    $EXTRA_OUTPUT \
-    $SRCFLAGS \
-    $_LANG_CFLAGS_VALUE \
-    ${input:SRC} \
-    $TOOLCHAIN_ENV \
-    $YNDEXER_OUTPUT \
-    && $_COMPILER_TIME_TRACE_POSTPROCESS \
-    $_C_CPP_KV_STYLE
-
-_CPP_ARGS_NEW_CMD_0=\
-    $CLANG_STATIC_ANALYZER_OPTIONS_NEW
-
-_CPP_ARGS_NEW_CMD_1_1=\
+_CPP_ARGS_NEW=\
+    $CLANG_STATIC_ANALYZER_OPTIONS_NEW && \
     $CLANG_TIDY_ARGS \
     $YNDEXER_ARGS \
     $RETRY_ARGS \
@@ -239,36 +216,14 @@ _CPP_ARGS_NEW_CMD_1_1=\
     $CL_MACRO_INFO \
     $CL_MACRO_INFO_DISABLE_CACHE__NO_UID__ \
     $_COMPILER_TIME_TRACE_FLAGS \
-    $EXTRA_OUTPUT
-_CPP_ARGS_NEW_CMD_1_2=\
-    $SRCFLAGS \
-    $_LANG_CFLAGS_VALUE_NEW \
-    ${input:SRC} \
-    $TOOLCHAIN_ENV \
-    $YNDEXER_OUTPUT
-_CPP_ARGS_NEW_CMD_2=\
-    $_COMPILER_TIME_TRACE_POSTPROCESS \
-    $_C_CPP_KV_STYLE_NEW \
-    $SCU_NAME_KV_NEW
-
-_C_ARGS=\
-    $CLANG_TIDY_ARGS \
-    $YNDEXER_ARGS \
-    $RETRY_ARGS \
-    $C_COMPILER_OLD \
-    $C_FLAGS_PLATFORM \
-    $GCC_COMPILE_FLAGS \
-    $CFLAGS \
-    $CL_MACRO_INFO \
-    $CL_MACRO_INFO_DISABLE_CACHE__NO_UID__ \
-    $_COMPILER_TIME_TRACE_FLAGS \
-    $CONLYFLAGS \
     $EXTRA_OUTPUT \
     $SRCFLAGS \
+    $_LANG_CFLAGS_VALUE_NEW \
     ${input:SRC} \
     $TOOLCHAIN_ENV \
     $YNDEXER_OUTPUT \
-    $_C_CPP_KV_STYLE
+    && $_COMPILER_TIME_TRACE_POSTPROCESS \
+    $_C_CPP_KV_STYLE_NEW
 
 _C_ARGS_NEW=\
     $CLANG_TIDY_ARGS \
@@ -313,10 +268,7 @@ _SRC_C_NODEPS_CMD=\
 
 _FORCE_CPP_FLAGS=-x c++
 
-_SRC_CPP_CMD=$_CPP_ARGS
-_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
-_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
-_SRC_C_CMD=$_C_ARGS
+_SRC_CPP_CMD_NEW=$_CPP_ARGS_NEW
 _SRC_C_CMD_NEW=$_C_ARGS_NEW
 _SRC_M_CMD=$SRC_c($SRC $SRCFLAGS)
 _SRC_MASM_CMD=$_EMPTY_CMD

build/conf/compilers/msvc_compiler.conf

@@ -28,10 +28,8 @@ when ($IDE_MSVS == "yes") {
     DEBUG_INFO_FLAGS=/Zi /FS
 }
 
-# For the flags regarding runtime library selection, see
-# https://msdn.microsoft.com/en-us/library/abx4dbyh.aspx
-CFLAGS_DEBUG   = /Od /Ob0 /Oi /D_DEBUG /MTd
-CFLAGS_RELEASE = /O2 /Ob2 /Oi /DNDEBUG /MT
+CFLAGS_DEBUG   = /Od /Ob0 /Oi
+CFLAGS_RELEASE = /O2 /Ob2 /Oi
 
 MASMFLAGS=
 _MASM_IO=/nologo /c /Fo${output;suf=${OBJECT_SUF}:SRC} ${input:SRC}
@@ -92,10 +90,7 @@ _C_CPP_KV_STYLE_P=p CC
 _C_CPP_KV_STYLE_PC=pc yellow
 
 _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"}
-_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"}
 _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}
-_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}
-_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"}
 _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}
 _SRC_M_CMD=$_EMPTY_CMD
 _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

@@ -270,11 +270,11 @@ elsewhen ($CGO_ENABLED == "yes") {
 }
 
 # tag:go-specific
-GO_PACKAGE_VALUE=
+_GO_PACKAGE_VALUE=
 ### @usage: GO_PACKAGE_NAME(Name)
 ### Override name of a Go package.
 macro GO_PACKAGE_NAME(NAME) {
-    SET(GO_PACKAGE_VALUE $NAME)
+    SET(_GO_PACKAGE_VALUE $NAME)
 }
 
 # tag:go-specific tag:internal

build/conf/linkers/ld.conf

@@ -227,6 +227,7 @@ REAL_LINK_EXE_TIDY=\
 
 REAL_LINK_EXEC_DYN_LIB_CMDLINE =\
     $YMAKE_PYTHON ${input:"build/scripts/link_dyn_lib.py"} \
+    ${hide;input:"build/scripts/link_exe.py"} \
     --target $TARGET
 REAL_LINK_EXEC_DYN_LIB_CMDLINE+=$_LD_LINKER_OUTPUT
 REAL_LINK_EXEC_DYN_LIB_CMDLINE+=\
@@ -253,6 +254,7 @@ LINK_DYN_LIB_FLAGS=
 
 REAL_LINK_DYN_LIB_CMDLINE =\
     $YMAKE_PYTHON ${input:"build/scripts/link_dyn_lib.py"} \
+    ${hide;input:"build/scripts/link_exe.py"} \
     --target $TARGET
 REAL_LINK_DYN_LIB_CMDLINE+=$_LD_LINKER_OUTPUT
 REAL_LINK_DYN_LIB_CMDLINE+=\

build/conf/proto.conf

@@ -639,12 +639,12 @@ macro LIST_PROTO(TO="files.proto", Files...) {
 }
 
 # tag:proto
-macro _PROTO_DESC_CMD(File) {
-    .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}
+macro _PROTO_DESC_RAWPROTO_CMD(File) {
+    .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}
 }
 
-_PROTO_DESC_MERGE_CMD=$YMAKE_PYTHON ${input:"build/scripts/merge_files.py"} $TARGET $AUTO_INPUT ${kv;hide:"p PD"} ${kv;hide:"pc light-cyan"}
-_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"}
+_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}
+_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}
 
 NEED_GOOGLE_PROTO_PEERDIRS=yes
 
@@ -807,15 +807,17 @@ multimodule PROTO_LIBRARY {
     module DESC_PROTO: _BARE_UNIT {
         .CMD=_PROTO_DESC_MERGE_CMD
         .SEM=IGNORED
-        .EXTS=.desc
+        .EXTS=.desc .rawproto
         .NODE_TYPE=Library
         .IGNORED=GENERATE_ENUM_SERIALIZATION GENERATE_ENUM_SERIALIZATION_WITH_HEADER YMAPS_SPROTO RESOURCE GO_PROTO_PLUGIN GRPC
+        .ALIASES=SRCS=_SRCS_NO_GLOBAL
 
         SET(PEERDIR_TAGS DESC_PROTO)
         ENABLE(DESC_PROTO)
         DISABLE(_NEED_SBOM_INFO)
         MODULE_SUFFIX=.self.protodesc
         SET(MODULE_TYPE LIBRARY)
+        SET(_MODDIR_HASH ${hash:MODDIR})
 
         _EVLOG_CMDLINE=$_PROTO_DESC_CMDLINE
         _PROTO_CMDLINE=$_PROTO_DESC_CMDLINE
@@ -869,6 +871,6 @@ _CPP_PROTO_EVLOG_CMDLINE=$_CPP_PROTO_EVLOG_CMD($SRC)
 _CPP_VANILLA_PROTO_CMDLINE=$_CPP_VANILLA_PROTO_CMD($SRC)
 _JAVA_EVLOG_CMDLINE=$_JAVA_EVLOG_CMD($SRC)
 _JAVA_PROTO_CMDLINE=$_JAVA_PROTO_CMD($SRC)
-_PROTO_DESC_CMDLINE=$_PROTO_DESC_CMD($SRC)
+_PROTO_DESC_CMDLINE=$_PROTO_DESC_RAWPROTO_CMD($SRC)
 _PY_EVLOG_CMDLINE=$_PY_EVLOG_CMD($SRC)
 _PY_PROTO_CMDLINE=$_PY_PROTO_CMD($SRC)

build/conf/python.conf

@@ -3,6 +3,42 @@ CYTHON_SCRIPT=${input:"${ARCADIA_ROOT}/contrib/tools/cython/cython.py"} ${hide:C
 RUN_CYTHON_SCRIPT=$YMAKE_PYTHON $CYTHON_SCRIPT
 RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON $CYTHON_SCRIPT
 PYTHON_TYPE_FOR_CYTHON=PY2
+
+
+CYTHON_EMBEDED_FILES=\
+contrib/tools/cython/Cython/Utility/Buffer.c \
+contrib/tools/cython/Cython/Utility/Builtins.c \
+contrib/tools/cython/Cython/Utility/CMath.c \
+contrib/tools/cython/Cython/Utility/Capsule.c \
+contrib/tools/cython/Cython/Utility/CommonTypes.c \
+contrib/tools/cython/Cython/Utility/Complex.c \
+contrib/tools/cython/Cython/Utility/Coroutine.c \
+contrib/tools/cython/Cython/Utility/CythonFunction.c \
+contrib/tools/cython/Cython/Utility/Embed.c \
+contrib/tools/cython/Cython/Utility/Exceptions.c \
+contrib/tools/cython/Cython/Utility/ExtensionTypes.c \
+contrib/tools/cython/Cython/Utility/FunctionArguments.c \
+contrib/tools/cython/Cython/Utility/ImportExport.c \
+contrib/tools/cython/Cython/Utility/MemoryView_C.c \
+contrib/tools/cython/Cython/Utility/ModuleSetupCode.c \
+contrib/tools/cython/Cython/Utility/ObjectHandling.c \
+contrib/tools/cython/Cython/Utility/Optimize.c \
+contrib/tools/cython/Cython/Utility/Overflow.c \
+contrib/tools/cython/Cython/Utility/Printing.c \
+contrib/tools/cython/Cython/Utility/Profile.c \
+contrib/tools/cython/Cython/Utility/StringTools.c \
+contrib/tools/cython/Cython/Utility/TestUtilityLoader.c \
+contrib/tools/cython/Cython/Utility/TypeConversion.c
+
+macro _UNWRAP_TEXT_INPUTS(Files...) {
+    .CMD=${input;context=TEXT;hide:Files}
+}
+
+macro _UNWRAP_OUTPUT_INCLUDES(Files...) {
+    .CMD=${output_include;hide:Files}
+}
+
+
 CYTHON_OUTPUT_INCLUDES=\
 ${output_include;hide:"contrib/libs/python/Include/compile.h"} \
 ${output_include;hide:"contrib/libs/python/Include/frameobject.h"} \
@@ -13,36 +49,14 @@ ${output_include;hide:"contrib/libs/python/Include/pythread.h"} \
 ${output_include;hide:"contrib/libs/python/Include/structmember.h"} \
 ${output_include;hide:"contrib/libs/python/Include/traceback.h"} \
 ${output_include;hide:"contrib/tools/cython/generated_c_headers.h"} \
-${output_include;hide:"omp.h"}
+${output_include;hide:"omp.h"} \
+$_UNWRAP_OUTPUT_INCLUDES($CYTHON_EMBEDED_FILES)
 
 # tag:cython-specific
 CYTHON_CPP_OUTPUT_INCLUDES=${output_include;hide:"contrib/tools/cython/generated_cpp_headers.h"}
 
 # tag:cython-specific
-CYTHON_PREDEFINED_INCLUDES=\
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Buffer.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Builtins.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/CMath.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Capsule.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/CommonTypes.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Complex.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Coroutine.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/CythonFunction.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Embed.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Exceptions.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/ExtensionTypes.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/FunctionArguments.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/ImportExport.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/MemoryView_C.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/ModuleSetupCode.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/ObjectHandling.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Optimize.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Overflow.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Printing.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/Profile.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/StringTools.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/TestUtilityLoader.c"} \
-    ${input;hide:"contrib/tools/cython/Cython/Utility/TypeConversion.c"}
+CYTHON_PREDEFINED_INCLUDES=$_UNWRAP_TEXT_INPUTS($CYTHON_EMBEDED_FILES)
 
 # tag:cython-specific
 CYTHON_PREDEFINED_INDUCED=\

build/conf/settings.conf

@@ -14,6 +14,7 @@ FORCE_RESOLVE_MACRO_INCLS=yes
 ENABLE_RERESOLVE_FOR_GENERATED_FILES=yes
 REPORT_ALL_DUPSRC=yes
 DEPS_CACHE_CONTROL_UIDS_CACHE=yes
+INCLUDE_ISOLATED_PROJECTS_TO_CONF_HASH=yes
 
 when ($YMAKE_USE_OLD_UIDS != "yes") {
     YMAKE_USE_NEW_UIDS=yes
@@ -41,11 +42,9 @@ _FOLDABLE_VARS=\
     _COMPILER_TIME_TRACE_FLAGS \
     _COMPILER_TIME_TRACE_GRANULARITY \
     _COMPILER_TIME_TRACE_POSTPROCESS \
-    _CPP_ARGS \
     _CROSS_SUFFIX \
     _CXX_DEFINES \
     _CXX_FLAGS \
-    _C_ARGS \
     _C_CPP_KV_STYLE \
     _C_FLAGS \
     _C_FOPTIONS \

build/conf/ts/ts.conf

@@ -6,6 +6,7 @@ TS_LOCAL_CLI=no
 TS_YNDEXING=no
 # Use outdir defined in tsconfig (actual not for bundlers, they use own way to define output directory)
 TS_CONFIG_USE_OUTDIR=
+TS_USE_PREBUILT_NOTS_TOOL=yes
 NOTS_TOOL=${tool:"devtools/frontend_build_platform/nots/builder"}
 
 
@@ -16,6 +17,8 @@ TS_CONFIG_PATH=tsconfig.json
 ### Macro sets the path for "TypeScript Config".
 ###
 ### - ConfigPath - config path (one at least)
+###
+### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/macros#ts-config
 macro TS_CONFIG(FirstConfigPath, ConfigPath...) {
     SET(TS_CONFIG_PATH $FirstConfigPath $ConfigPath)
 }
@@ -59,6 +62,8 @@ TS_GLOB_EXCLUDE_ADDITIONAL=
 ### These files won't be copied to BINDIR.
 ###
 ### - GlobExpression - glob expression
+###
+### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/macros#ts-exclude-files-glob
 macro TS_EXCLUDE_FILES_GLOB(GlobExpression) {
   SET(TS_GLOB_EXCLUDE_ADDITIONAL $GlobExpression)
 }
@@ -99,6 +104,8 @@ ESLINT_CONFIG_PATH=.eslintrc.js
 ### Macro sets the path for ESLint config file.
 ###
 ### - ConfigPath - config path
+###
+### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/macros#ts-eslint-config
 macro TS_ESLINT_CONFIG(ConfigName) {
   SET(ESLINT_CONFIG_PATH $ConfigName)
 }

build/conf/ts/ts_next.conf

@@ -4,7 +4,9 @@ TS_NEXT_CONFIG_PATH=next.config.js
 ###
 ### Macro sets the config path for TS_NEXT module.
 ###
-### - ConfigPath - config path
+### - ConfigPath - config path. Default value: next.config.js
+###
+### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/TS_NEXT#ts-next-config
 macro TS_NEXT_CONFIG(ConfigPath) {
     SET(TS_NEXT_CONFIG_PATH $ConfigPath)
 }
@@ -16,7 +18,9 @@ TS_NEXT_OUTPUT_DIR=.next
 ###
 ### Macro sets the output directory name for TS_NEXT module.
 ###
-### - DirName - output directory name
+### - DirName - output directory name. Default value: .next.
+###
+### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/TS_NEXT#ts-next-output
 macro TS_NEXT_OUTPUT(DirName) {
     SET(TS_NEXT_OUTPUT_DIR $DirName)
 }
@@ -32,12 +36,14 @@ TS_NEXT_CMD=$TOUCH_UNIT \
     ${output;hide:"package.json"} \
     ${kv;hide:"pc magenta"} ${kv;hide:"p TS_NXT"}
 
-### @usage: TS_NEXT()
+### @usage: TS_NEXT([name])
 ###
 ### NextJS app, built with `next build`. Requires sources to be under /src folder.
 ### /pages and /app on the root level ar not supported.
 ### Build results are output.tar.
 ###
+### Documentation: https://docs.yandex-team.ru/frontend-in-arcadia/references/TS_NEXT
+###
 ### @example
 ###
 ###     TS_NEXT()