Restoring authorship annotation for <somov@yandex-team.ru>. Commit 1 of 2.

1 files changed, 153 insertions, 153 deletions

diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 081833998b..801289a085 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -52,7 +52,7 @@ when ($USE_YMAKE_RESOURCE == "yes") {
 
 __COMMA__=${comma:""}
 
-ARCADIA_TEST_ROOT=../arcadia_tests_data/
+ARCADIA_TEST_ROOT=../arcadia_tests_data/ 
 DEFAULT_REQUIREMENTS=network:restricted cpu:1 ram:32
 CC_REQUIREMENTS=$DEFAULT_REQUIREMENTS
 LIB_REQUIREMENTS=$DEFAULT_REQUIREMENTS
@@ -140,12 +140,12 @@ when ($OS_CYGWIN == "yes") {
 CFLAGS+=$COVERAGE_FLAGS
 LDFLAGS+=$COVERAGE_FLAGS
 
-CHECKFLAG=
-LEX_FLAGS=
-NO_MAPREDUCE=
+CHECKFLAG= 
+LEX_FLAGS= 
+NO_MAPREDUCE= 
 
-when ($NO_MAPREDUCE ==  "yes") {
-    C_DEFINES+=-DNO_MAPREDUCE
+when ($NO_MAPREDUCE ==  "yes") { 
+    C_DEFINES+=-DNO_MAPREDUCE 
 }
 
 when ($OS_ANDROID == "yes") {
@@ -163,15 +163,15 @@ when ($MAPSMOBI_BUILD_TARGET == "yes" && $OS_IOS == "yes") {
     }
 }
 
-# USE_INTERNAL_STL is an internal flag (set on by default) but may be used externally to
-# select system standard C++ library when USE_INTERNAL_STL=no is set.
-#
-# USE_STL_SYSTEM=yes is a regular way to select system standard C++ library.
-#
+# USE_INTERNAL_STL is an internal flag (set on by default) but may be used externally to 
+# select system standard C++ library when USE_INTERNAL_STL=no is set. 
+# 
+# USE_STL_SYSTEM=yes is a regular way to select system standard C++ library. 
+# 
 when ($USE_STL_SYSTEM == "yes") {
     USE_INTERNAL_STL=no
 }
-
+ 
 when ($USE_INTERNAL_STL == "no") {
     USE_STL_SYSTEM=yes
 }
@@ -192,10 +192,10 @@ otherwise {
 }
 
 # tag:linux-specific
-when ($OS_LINUX && $OS_SDK == "ubuntu-14" && $MUSL != "yes") {
-    USE_UBUNTU_COMPATIBILITY=yes
-}
-
+when ($OS_LINUX && $OS_SDK == "ubuntu-14" && $MUSL != "yes") { 
+    USE_UBUNTU_COMPATIBILITY=yes 
+} 
+ 
 USE_ARCADIA_PYTHON=yes
 USE_ARCADIA_LIBM=no
 USE_EAT_MY_DATA=no
@@ -213,25 +213,25 @@ when ($HAVE_MKL == "") {
 SFDL_TMP_OUT= ${output;tmp:SRC.tmp}
 
 # tag:perl-specific
-when ($USE_LOCAL_TOOLS == "yes") {
-    PERL=$LOCAL_PERL
-    PERL_VERSION=$LOCAL_PERL_VERSION
-    PERL_PRIVLIB=$LOCAL_PERL_PRIVLIB
-    PERL_ARCHLIB=$LOCAL_PERL_ARCHLIB
-    when ($LOCAL_PERL_LIBS) {
-        PERL_LIBS=$LOCAL_PERL_LIBS
-    }
-}
-otherwise {
-    PERL=NO-PERL-SELECTED
-    PERL_VERSION=NO-PERL-SELECTED-VERSION
-    PERL_PRIVLIB=NO-PERL-SELECTED-PRIVLIB
-    PERL_ARCHLIB=NO-PERL-SELECTED-ARCHLIB
-}
-
+when ($USE_LOCAL_TOOLS == "yes") { 
+    PERL=$LOCAL_PERL 
+    PERL_VERSION=$LOCAL_PERL_VERSION 
+    PERL_PRIVLIB=$LOCAL_PERL_PRIVLIB 
+    PERL_ARCHLIB=$LOCAL_PERL_ARCHLIB 
+    when ($LOCAL_PERL_LIBS) { 
+        PERL_LIBS=$LOCAL_PERL_LIBS 
+    } 
+} 
+otherwise { 
+    PERL=NO-PERL-SELECTED 
+    PERL_VERSION=NO-PERL-SELECTED-VERSION 
+    PERL_PRIVLIB=NO-PERL-SELECTED-PRIVLIB 
+    PERL_ARCHLIB=NO-PERL-SELECTED-ARCHLIB 
+} 
+ 
 # tag:perl-specific
-PERL_LD_LIBRARY_PATH=
-PERL_INCLUDE=
+PERL_LD_LIBRARY_PATH= 
+PERL_INCLUDE= 
 USE_PERL_SYSTEM=yes
 when ($USE_PERL_SYSTEM == "yes") {
     select ($PERL_SDK) {
@@ -272,17 +272,17 @@ when ($USE_PERL_SYSTEM == "yes") {
     # so default Perl module directories should be prepended to perl command lines when using non-local perl.
     PERL_INCLUDE=-I${PERL_ARCHLIB} -I${PERL_PRIVLIB}
 }
-PERL_DEFAULT_PEERDIR=yes
-
+PERL_DEFAULT_PEERDIR=yes 
+ 
 # tag:perl-specific
-PERLSUFFIX=-csuffix .cpp
+PERLSUFFIX=-csuffix .cpp 
 PERLOUTPUT=${stdout;output:SRC.cpp}
 when ($PERLC == "yes") {
     PERLSUFFIX=-csuffix .c
     PERLOUTPUT=${stdout;output:SRC.c}
 }
-XSUBPPFLAGS=
-
+XSUBPPFLAGS= 
+ 
 # tag:tool-specific
 ARCH_TOOL=${tool:"tools/archiver"}
 
@@ -329,16 +329,16 @@ elsewhen ($OS_WINDOWS) {
     CYTHON_OPTIONS += -E UNAME_SYSNAME=Windows
 }
 
-when ($USE_LOCAL_SWIG != "yes") {
-    _SWIG_TOOL=${tool:"contrib/tools/swig"}
-    _SWIG_LIBRARY=contrib/tools/swig/Lib
-    _SWIG_LIBRARY_ABS=$ARCADIA_ROOT/$_SWIG_LIBRARY
-}
-otherwise {
-    _SWIG_TOOL=$SWIG_TOOL
-    _SWIG_LIBRARY=$SWIG_LIBRARY
-    _SWIG_LIBRARY_ABS=$SWIG_LIBRARY
-}
+when ($USE_LOCAL_SWIG != "yes") { 
+    _SWIG_TOOL=${tool:"contrib/tools/swig"} 
+    _SWIG_LIBRARY=contrib/tools/swig/Lib 
+    _SWIG_LIBRARY_ABS=$ARCADIA_ROOT/$_SWIG_LIBRARY 
+} 
+otherwise { 
+    _SWIG_TOOL=$SWIG_TOOL 
+    _SWIG_LIBRARY=$SWIG_LIBRARY 
+    _SWIG_LIBRARY_ABS=$SWIG_LIBRARY 
+} 
 SWIG_IMPLICIT_INCLUDES = swig.swg go.swg java.swg perl5.swg python.swg
 
 FATAL_ERROR_MODULE=no
@@ -1011,8 +1011,8 @@ when ($ALLOCATOR == "LF") {
 }
 
 # tag:sanitize
-SANITIZER_CFLAGS=
-
+SANITIZER_CFLAGS= 
+ 
 # tag:proto tag:grpc
 ### @usage: GRPC()
 ###
@@ -1214,10 +1214,10 @@ module _BASE_UNIT: _BARE_UNIT {
             }
         }
     }
-
+ 
     when ($HARDENING == "yes") {
         when ($CLANG) {
-            CFLAGS+=-fstack-protector-all -D_hardening_enabled_
+            CFLAGS+=-fstack-protector-all -D_hardening_enabled_ 
             LDFLAGS+=-z relro -z now -z noexecstack
             PIE=yes
         }
@@ -1230,10 +1230,10 @@ module _BASE_UNIT: _BARE_UNIT {
         }
         when ($CLANG) {
             CFLAGS+=-flto
-            LDFLAGS+=-flto
+            LDFLAGS+=-flto 
         }
     }
-
+ 
     when ($USE_THINLTO == "yes") {
         when ($GCC) {
             CFLAGS+=-flto=thin
@@ -1269,19 +1269,19 @@ module _BASE_UNIT: _BARE_UNIT {
     # cause troubles in contrib/libs/libc_compat/ubuntu_14 under musl
     # Workaround this issue by setting variable with PEERDIR in trigger
     # and then adding PEERDIR to it's value	unconditionally.
-    when ($USE_UBUNTU_COMPATIBILITY == "yes" && $NEED_PLATFORM_PEERDIRS == "yes") {
-        _UBUNTU_COMPAT_PEERDIR=contrib/libs/libc_compat/ubuntu_14
-    }
-    otherwise {
-        _UBUNTU_COMPAT_PEERDIR=
-    }
-    PEERDIR+=$_UBUNTU_COMPAT_PEERDIR
-
+    when ($USE_UBUNTU_COMPATIBILITY == "yes" && $NEED_PLATFORM_PEERDIRS == "yes") { 
+        _UBUNTU_COMPAT_PEERDIR=contrib/libs/libc_compat/ubuntu_14 
+    } 
+    otherwise { 
+        _UBUNTU_COMPAT_PEERDIR= 
+    } 
+    PEERDIR+=$_UBUNTU_COMPAT_PEERDIR 
+ 
     when ($NORUNTIME != "yes") {
         PEERDIR+=contrib/libs/cxxsupp
-        when ($MAPSMOBI_BUILD_TARGET == "yes") {
-            PEERDIR+=build/platform/mapkit
-        }
+        when ($MAPSMOBI_BUILD_TARGET == "yes") { 
+            PEERDIR+=build/platform/mapkit 
+        } 
     }
 
     when ($NOUTIL != "yes") {
@@ -1303,7 +1303,7 @@ module _BASE_UNIT: _BARE_UNIT {
     when ($USE_INTERNAL_STL == "yes" && $MSVC != "yes") {
         CXXFLAGS += -nostdinc++
     }
-
+ 
     when ($CODENAVIGATION && $NOCODENAVIGATION != "yes") {
         PEERDIR += build/external_resources/codenavigation
     }
@@ -1336,10 +1336,10 @@ module _BASE_UNIT: _BARE_UNIT {
 
     DEFAULT(PACKAGE_PREFIX_ARGS)
 
-    DEFAULT(BYACC_FLAGS -v)
-    DEFAULT(SWIG_LANG python)
-    DEFAULT(BISON_FLAGS -v)
-    DEFAULT(GP_FLAGS -CtTLANSI-C -Dk* -c)
+    DEFAULT(BYACC_FLAGS -v) 
+    DEFAULT(SWIG_LANG python) 
+    DEFAULT(BISON_FLAGS -v) 
+    DEFAULT(GP_FLAGS -CtTLANSI-C -Dk* -c) 
 
     when ($NEED_BINUTILS_PEERDIR && $BINUTILS_USED && $NEED_PLATFORM_PEERDIRS == "yes") {
         PEERDIR+=build/platform/binutils
@@ -1416,10 +1416,10 @@ when ($COMMON_LINK_SETTINGS == "yes") {
         PEERDIR+=contrib/libs/libm
     }
     when ($USE_ARCADIA_LIBM == "no") {
-        C_SYSTEM_LIBRARIES+=-lm
+        C_SYSTEM_LIBRARIES+=-lm 
     }
 
-    when (($MUSL != "yes" && $WITH_VALGRIND == "yes") || $SANITIZER_DEFINED == "yes") {
+    when (($MUSL != "yes" && $WITH_VALGRIND == "yes") || $SANITIZER_DEFINED == "yes") { 
         when ($ALLOCATOR in [ "TCMALLOC", "TCMALLOC_SMALL_BUT_SLOW", "TCMALLOC_NUMA_256K", "TCMALLOC_NUMA_LARGE_PAGES", "TCMALLOC_256K", "GOOGLE", "J", "LF", "LF_YT", "LF_DBG", "B", "BM", "C", "LOCKLESS", "YT", "MIM", "HU" ]) {
             PEERDIR+=library/cpp/malloc/system
         }
@@ -1498,7 +1498,7 @@ when ($COMMON_LINK_SETTINGS == "yes") {
             C_WARNING_OPTS += $WERROR_FLAG
         }
     }
-
+ 
     when ($ICC == "yes") {
         PEERDIR+=contrib/libs/intel/core
     }
@@ -1660,10 +1660,10 @@ module _BASE_PROGRAM: _LINK_UNIT {
     when ($IDE_MSVS == "yes") {
         PEERDIR+=build/scripts/c_templates
     }
-
-    when ($_CUSTOM_LINK_STEP_SCRIPT) {
-        LINK_SCRIPT_EXE_FLAGS+=--python=$YMAKE_PYTHON --custom-step=${input:_CUSTOM_LINK_STEP_SCRIPT}
-    }
+ 
+    when ($_CUSTOM_LINK_STEP_SCRIPT) { 
+        LINK_SCRIPT_EXE_FLAGS+=--python=$YMAKE_PYTHON --custom-step=${input:_CUSTOM_LINK_STEP_SCRIPT} 
+    } 
 }
 
 CPP_PROGRAM_SEM=add_executable $MODDIR $REALPRJNAME ${hide:TARGET} ${hide:AUTO_INPUT} && vcs_info && target_link_flags PUBLIC $OBJADDE_LIB $OBJADDE
@@ -1822,15 +1822,15 @@ macro EXPORT_ALL_DYNAMIC_SYMBOLS() {
     ENABLE(EXPORT_ALL_DYNAMIC_SYMBOLS)
 }
 
-### @usage: CUSTOM_LINK_STEP_SCRIPT(name)
-###
-### Specifies name of a script for custom link step. The scripts
-### should be placed in the build/scripts directory and are subject to
-### review by devtools@.
-macro CUSTOM_LINK_STEP_SCRIPT(Name) {
-    SET(_CUSTOM_LINK_STEP_SCRIPT build/scripts/$Name)
-}
-
+### @usage: CUSTOM_LINK_STEP_SCRIPT(name) 
+### 
+### Specifies name of a script for custom link step. The scripts 
+### should be placed in the build/scripts directory and are subject to 
+### review by devtools@. 
+macro CUSTOM_LINK_STEP_SCRIPT(Name) { 
+    SET(_CUSTOM_LINK_STEP_SCRIPT build/scripts/$Name) 
+} 
+ 
 ### @usage: _BASE_UNITTEST  # internal
 ###
 ### Module with base logic for all unit-test modules: it makes code runnable as unit-test by Arcadia testing machinery.
@@ -2395,7 +2395,7 @@ module _LIBRARY: _BASE_UNIT {
             C_WARNING_OPTS += $WERROR_FLAG
         }
     }
-
+ 
     when ($WITH_VALGRIND == "yes") {
         PEERDIR+=contrib/libs/valgrind
     }
@@ -2608,7 +2608,7 @@ module DLL_UNIT: _LINK_UNIT {
     when ($MSVC == "yes" || $CYGWIN == "yes") {
         MODULE_SUFFIX=.dll
     }
-    elsewhen ($DARWIN == "yes" || $OS_IOS == "yes") {
+    elsewhen ($DARWIN == "yes" || $OS_IOS == "yes") { 
         MODULE_PREFIX=lib
         MODULE_SUFFIX=.dylib
     }
@@ -2636,10 +2636,10 @@ module DLL_UNIT: _LINK_UNIT {
         }
     }
 
-    when ($DARWIN == "yes") {
-        LDFLAGS += -undefined dynamic_lookup
-    }
-
+    when ($DARWIN == "yes") { 
+        LDFLAGS += -undefined dynamic_lookup 
+    } 
+ 
     when ($CLANG_COVERAGE && $CLANG_COVERAGE != "no") {
         PEERDIR+=library/cpp/testing/dump_clang_coverage
     }
@@ -2687,7 +2687,7 @@ module PY_ANY_MODULE: DLL_UNIT {
 
     # -bundle
     when ($DARWIN == "yes") {
-        LDFLAGS+=-flat_namespace
+        LDFLAGS+=-flat_namespace 
     }
 
     when ($MSVC == "yes" || $CYGWIN == "yes") {
@@ -4139,9 +4139,9 @@ module _BASE_PY_PROGRAM: _BASE_PROGRAM {
     ALLOCATOR($_MY_ALLOCATOR)
     STRIP()
 
-    when ($BUILD_TYPE == "DEBUG") {
-        NO_STRIP=yes
-    }
+    when ($BUILD_TYPE == "DEBUG") { 
+        NO_STRIP=yes 
+    } 
     when ($SANITIZER_TYPE && $SANITIZER_TYPE != "no") {
         NO_STRIP=yes
     }
@@ -4193,9 +4193,9 @@ module _BASE_PY3_PROGRAM: _BASE_PROGRAM {
     when ($NO_PYTHON_INCLS != "yes") {
         PEERDIR+=contrib/libs/python
     }
-    when ($BUILD_TYPE == "DEBUG") {
-        NO_STRIP=yes
-    }
+    when ($BUILD_TYPE == "DEBUG") { 
+        NO_STRIP=yes 
+    } 
     when ($SANITIZER_TYPE && $SANITIZER_TYPE != "no") {
         NO_STRIP=yes
     }
@@ -5222,10 +5222,10 @@ macro USE_PYTHON3() {
 }
 
 # tag:python-specific
-when ($PERL_DEFAULT_PEERDIR == "yes") {
-    when (($PERLXS == "yes") || ($PERLXSCPP == "yes") || ($USE_PERL == "yes")) {
-        PEERDIR+=build/platform/perl
-    }
+when ($PERL_DEFAULT_PEERDIR == "yes") { 
+    when (($PERLXS == "yes") || ($PERLXSCPP == "yes") || ($USE_PERL == "yes")) { 
+        PEERDIR+=build/platform/perl 
+    } 
 }
 
 # tag:perl-specific
@@ -5236,14 +5236,14 @@ macro USE_PERL_LIB() {
 }
 
 # tag:perl-specific
-### @usage: USE_PERL_514_LIB()
-### Add dependency on Perl 5.14 to your LIBRARY
-macro USE_PERL_514_LIB() {
-    SET(PERL_SDK ubuntu-12)
-    SET(PERL_DEFAULT_PEERDIR no)
-    PEERDIR(build/platform/perl/5.14)
-}
-
+### @usage: USE_PERL_514_LIB() 
+### Add dependency on Perl 5.14 to your LIBRARY 
+macro USE_PERL_514_LIB() { 
+    SET(PERL_SDK ubuntu-12) 
+    SET(PERL_DEFAULT_PEERDIR no) 
+    PEERDIR(build/platform/perl/5.14) 
+} 
+ 
 # tag:perl-specific
 ### @usage: ADD_PERL_MODULE(Dir ModuleName)
 ### Add dependency on specified Perl module to the library
@@ -5601,7 +5601,7 @@ macro FLAT_JOIN_SRCS_GLOBAL(Out, Src...) {
 }
 
 # tag:cpu
-PIC_CFLAGS=
+PIC_CFLAGS= 
 SSE2_CFLAGS=
 SSE3_CFLAGS=
 SSSE3_CFLAGS=
@@ -5623,7 +5623,7 @@ SSE4_CFLAGS=
 # tag:cpu
 when (($ARCH_X86_64 || $ARCH_I386) && $DISABLE_INSTRUCTION_SETS != "yes") {
     when ($CLANG || $CLANG_CL || $GCC) {
-        PIC_CFLAGS=-fPIC
+        PIC_CFLAGS=-fPIC 
         SSE2_CFLAGS=-msse2
         SSE3_CFLAGS=-msse3
         SSSE3_CFLAGS=-mssse3
@@ -6214,12 +6214,12 @@ macro SRC_C_AVX2(FILE, FLAGS...) {
 }
 
 # tag:cpu tag:src-processing
-### @usage SRC_CPP_PIC(File Flags...)
-### Compile single .c-file with -fPIC and extra Flags.
-macro SRC_CPP_PIC(FILE, FLAGS...) {
-    _SRC(cpp $FILE $PIC_CFLAGS $FLAGS)
-}
-
+### @usage SRC_CPP_PIC(File Flags...) 
+### Compile single .c-file with -fPIC and extra Flags. 
+macro SRC_CPP_PIC(FILE, FLAGS...) { 
+    _SRC(cpp $FILE $PIC_CFLAGS $FLAGS) 
+} 
+ 
 # tag:cpu tag:src-processing
 ### @usage SRC_CPP_SSE2(File Flags...)
 ### Compile single .cpp-file with SSE2 and extra Flags.
@@ -6332,7 +6332,7 @@ macro _BUILDWITH_CYTHON_C_API_H(Src, Dep, Options...) {
 ### Run swig on Src to produce DstSubPrefix.py and DstSubPrefix_swg.cpp that
 ### provides DstSubPrefix_swg python module.
 macro _SWIG_PYTHON_CPP(Src, DstSubPrefix) {
-    .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 ${nopath;suf=_swg:DstSubPrefix} -o ${output;suf=.swg.cpp:DstSubPrefix} ${input:Src} ${output;noauto;hide;suf=.py:DstSubPrefix} ${kv;hide:"p SW"} ${kv;hide:"pc yellow"}
+    .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 ${nopath;suf=_swg:DstSubPrefix} -o ${output;suf=.swg.cpp:DstSubPrefix} ${input:Src} ${output;noauto;hide;suf=.py:DstSubPrefix} ${kv;hide:"p SW"} ${kv;hide:"pc yellow"} 
     ADDINCL(FOR swig $_SWIG_LIBRARY/python FOR swig $_SWIG_LIBRARY)
 }
 
@@ -6341,7 +6341,7 @@ macro _SWIG_PYTHON_CPP(Src, DstSubPrefix) {
 ###
 ### Like _SWIG_PYTHON_CPP but generate DstSubPrefix_swg.c.
 macro _SWIG_PYTHON_C(Src, DstSubPrefix) {
-    .CMD=$_SWIG_TOOL -I$ARCADIA_BUILD_ROOT -I$ARCADIA_ROOT -I$_SWIG_LIBRARY_ABS/python -I$_SWIG_LIBRARY_ABS -python -module ${nopath:DstSubPrefix} -interface ${nopath;suf=_swg:DstSubPrefix} -o ${output;suf=.swg.c:DstSubPrefix} ${input:Src} ${output;noauto;hide;suf=.py:DstSubPrefix} ${kv;hide:"p SW"} ${kv;hide:"pc yellow"}
+    .CMD=$_SWIG_TOOL -I$ARCADIA_BUILD_ROOT -I$ARCADIA_ROOT -I$_SWIG_LIBRARY_ABS/python -I$_SWIG_LIBRARY_ABS -python -module ${nopath:DstSubPrefix} -interface ${nopath;suf=_swg:DstSubPrefix} -o ${output;suf=.swg.c:DstSubPrefix} ${input:Src} ${output;noauto;hide;suf=.py:DstSubPrefix} ${kv;hide:"p SW"} ${kv;hide:"pc yellow"} 
     ADDINCL(FOR swig $_SWIG_LIBRARY/python FOR swig $_SWIG_LIBRARY)
 }
 
@@ -8999,10 +8999,10 @@ when ($TENSORFLOW_WITH_CUDA) {
     CUDA_REQUIRED=yes
 }
 
-when (!$TENSORRT_VERSION) {
-    TENSORRT_VERSION=5
-}
-
+when (!$TENSORRT_VERSION) { 
+    TENSORRT_VERSION=5 
+} 
+ 
 ANDROID_APK_TEST_ACTIVITY_VALUE=com.yandex.test.unittests/.RunTestsActivity
 
 MAVEN_BIN=$MAVEN_RESOURCE_GLOBAL/bin
@@ -9138,41 +9138,41 @@ macro NGINX_MODULES(Modules...) {
     PEERDIR(${Modules})
     RUN_PROGRAM(nginx/module_gen ${Modules} CWD ${ARCADIA_ROOT} IN ${suf=/modules.json:Modules} OUTPUT_INCLUDES contrib/nginx/core/src/core/ngx_config.h contrib/nginx/core/src/core/ngx_core.h STDOUT ngx_modules.c)
 }
-
-# Experimental: container as output. https://st.yandex-team.ru/DTCC-179
-
+ 
+# Experimental: container as output. https://st.yandex-team.ru/DTCC-179 
+ 
 # tag:external-build
-CONTAINER_LAYER_CMD=$YMAKE_PYTHON ${input:"devtools/experimental/solar/selfcontainer/scripts/make_container_layer.py"} -o $TARGET $AUTO_INPUT ${cwd:ARCADIA_BUILD_ROOT} ${kv;hide:"p CL"} ${kv;hide:"pc blue"}
-CONTAINER_CMD=$YMAKE_PYTHON ${input:"devtools/experimental/solar/selfcontainer/scripts/make_container.py"} -o $TARGET ${rootrel:PEERS} ${cwd:ARCADIA_BUILD_ROOT} ${kv;hide:"p CN"} ${kv;hide:"pc blue"}
-
+CONTAINER_LAYER_CMD=$YMAKE_PYTHON ${input:"devtools/experimental/solar/selfcontainer/scripts/make_container_layer.py"} -o $TARGET $AUTO_INPUT ${cwd:ARCADIA_BUILD_ROOT} ${kv;hide:"p CL"} ${kv;hide:"pc blue"} 
+CONTAINER_CMD=$YMAKE_PYTHON ${input:"devtools/experimental/solar/selfcontainer/scripts/make_container.py"} -o $TARGET ${rootrel:PEERS} ${cwd:ARCADIA_BUILD_ROOT} ${kv;hide:"p CN"} ${kv;hide:"pc blue"} 
+ 
 # tag:external-build
 module CONTAINER_LAYER: _BARE_UNIT {
-    .CMD=CONTAINER_LAYER_CMD
-
-    MODULE_SUFFIX=.container_layer
-}
-
+    .CMD=CONTAINER_LAYER_CMD 
+ 
+    MODULE_SUFFIX=.container_layer 
+} 
+ 
 # tag:external-build
 module CONTAINER: _BARE_UNIT {
-    .NODE_TYPE=Bundle
-    .PEERDIR_POLICY=as_build_from
-    .FINAL_TARGET=yes
-    .CMD=CONTAINER_CMD
-}
+    .NODE_TYPE=Bundle 
+    .PEERDIR_POLICY=as_build_from 
+    .FINAL_TARGET=yes 
+    .CMD=CONTAINER_CMD 
+} 
 
 # tag:external-build
-CUSTOM_BUILD_LIBRARY_USE=
-CUSTOM_BUILD_LIBRARY_CMD=$GENERATE_MF && ${tool:"devtools/experimental/solar/outbuild/runner"} ${hide:PEERS} --script=${input:CUSTOM_SCRIPT} --output $TARGET --python=${tool:"contrib/tools/python3"} --isolator=${tool:"devtools/experimental/solar/outbuild/isolator"} $CUSTOM_BUILD_LIBRARY_USE
-
+CUSTOM_BUILD_LIBRARY_USE= 
+CUSTOM_BUILD_LIBRARY_CMD=$GENERATE_MF && ${tool:"devtools/experimental/solar/outbuild/runner"} ${hide:PEERS} --script=${input:CUSTOM_SCRIPT} --output $TARGET --python=${tool:"contrib/tools/python3"} --isolator=${tool:"devtools/experimental/solar/outbuild/isolator"} $CUSTOM_BUILD_LIBRARY_USE 
+ 
 # tag:external-build
-module CUSTOM_BUILD_LIBRARY: LIBRARY {
-    .NODE_TYPE=Bundle
-    .PEERDIR_POLICY=as_build_from
-    .PROXY=yes
-    .CMD=CUSTOM_BUILD_LIBRARY_CMD
-    DISABLE(NEED_ADD_FAKE_SRC)
-}
-
+module CUSTOM_BUILD_LIBRARY: LIBRARY { 
+    .NODE_TYPE=Bundle 
+    .PEERDIR_POLICY=as_build_from 
+    .PROXY=yes 
+    .CMD=CUSTOM_BUILD_LIBRARY_CMD 
+    DISABLE(NEED_ADD_FAKE_SRC) 
+} 
+ 
 ### @usage: ORIGINAL_SOURCE(Source)
 ###
 ### This macro specifies the source repository for contrib