Enable the new command engine in miscellaneous macros, batch #3

commit_hash:ce8c8489d62f829b7e76ff6f785e9b746c8480f9

Author: authorius

build/conf/bison_lex.conf

@@ -165,4 +165,5 @@ macro _SRC("lex", SRC, SRCFLAGS...) {
 # tag:src-processing
 macro _SRC("lpp", SRC, SRCFLAGS...) {
     .CMD=$_SRC(l $SRC $SRCFLAGS)
+    #.STRUCT_CMD=yes
 }

build/conf/java.conf

@@ -1,14 +1,11 @@
 macro _INPUT_WITH_FLAG(Flag, IN[]) {
-    .CMD=$_INPUT_WITH_FLAG_IMPL(${pre=$Flag :IN} IN $IN)
-}
-
-macro _INPUT_WITH_FLAG_IMPL(IN{input}[], Args...) {
-    .CMD=$Args ${hide;input:IN}
+    .CMD=${pre=$Flag ;input:IN}
 }
 
 macro ACCELEO(XSD{input}[], MTL{input}[], MTL_ROOT="${MODDIR}", LANG{input}[], OUT{output}[], OUT_NOAUTO{output}[], OUTPUT_INCLUDES[], DEBUG?"stdout2stderr":"stderr2stdout") {
     .PEERDIR=build/platform/java/jdk $JDK_RESOURCE_PEERDIR
     .CMD=${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON ${input;pre=build/scripts/;suf=.py:DEBUG} $JDK_RESOURCE/bin/java -Dfile.encoding=utf8 -classpath ${RUN_JAR_PROG_CP_PRE}${tool:"tools/acceleo"}${RUN_JAR_PROG_CP_SUF} ru.yandex.se.logsng.tool.Cli $_INPUT_WITH_FLAG(--xsd IN $XSD) $_INPUT_WITH_FLAG(--mtl IN $MTL) $_INPUT_WITH_FLAG(--lang IN $LANG) --output-dir $BINDIR --build-root ${ARCADIA_BUILD_ROOT} --source-root ${ARCADIA_ROOT}  --mtl-root $MTL_ROOT ${hide;output_include:OUTPUT_INCLUDES} ${hide;output:OUT} ${hide;noauto;output:OUT_NOAUTO} ${hide;kv:"p JV"} ${hide;kv:"pc light-blue"} ${hide;kv:"show_out"}
+    .STRUCT_CMD=yes
 }
 
 ### @usage: JAVA_LIBRARY()

build/conf/project_specific/other.conf

@@ -8,4 +8,5 @@ BUILD_CATBOOST_SCRIPT=build/scripts/build_catboost.py
 ### CatBoost specific macro.
 macro BUILD_CATBOOST(CbModel, CbName) {
     .CMD=$YMAKE_PYTHON ${input:BUILD_CATBOOST_SCRIPT} build_cb_f $ARCADIA_ROOT $ARCH_TOOL ${input:CbModel} $CbName ${output;pre=cb.;suf=.cpp:CbName} ${hide;output;pre=CB_External_;suf=.rodata:CbName} ${hide;output_include:"kernel/catboost/catboost_calcer.h"} ${hide;kv:"p CB"} ${hide;kv:"pc yellow"}
+    .STRUCT_CMD=yes
 }

build/ymake.core.conf

@@ -2828,6 +2828,7 @@ macro JOIN_SRCS(Out, Src...) {
 ### You should specify file name with the extension as Out. Further processing will be done according to this extension.
 macro JOIN_SRCS_GLOBAL(Out, Src...) {
     .CMD=$YMAKE_PYTHON3 ${input:"build/scripts/gen_join_srcs.py"} ${hide;input:"build/scripts/process_command_files.py"} ${noauto;output:Out} --ya-start-command-file ${rootrel;context=TEXT;input=TEXT:Src} --ya-end-command-file ${hide;from_input;output_include:Src} ${hide;kv:"p JS"} ${hide;kv:"pc magenta"}
+    .STRUCT_CMD=yes
     SRCS(GLOBAL $Out)
 }
 
@@ -2838,6 +2839,7 @@ macro JOIN_SRCS_GLOBAL(Out, Src...) {
 ### You should specify file name with the extension as Out. Further processing will be done according to this extension.
 macro FLAT_JOIN_SRCS_GLOBAL(Out, Src...) {
     .CMD=$FS_TOOLS cat ${noauto;output:Out} --ya-start-command-file ${context=TEXT;input=TEXT:Src} --ya-end-command-file ${hide;from_input;output_include:Src} ${hide;kv:"p JS"} ${hide;kv:"pc magenta"}
+    .STRUCT_CMD=yes
     SRCS(GLOBAL $Out)
 }
 
@@ -3484,7 +3486,8 @@ macro _SRC_masm(SRC, SRCFLAGS...) {
 ### Compile LUA source file to object code using LUA 2.0
 ### Optionally override import name which is by default reflects Src name
 macro COMPILE_LUA(Src, NAME="") {
-    .CMD=$_SRC(lua, $Src, ${pre=-n :NAME})
+    .CMD=$_SRC(lua $Src ${pre=-n :NAME})
+    #.STRUCT_CMD=yes
 }
 
 # tag:lua-specific
@@ -3502,7 +3505,8 @@ macro _SRC_lua_21(SRC, SRCFLAGS...) {
 ### Compile LUA source file to object code using LUA 2.1
 ### Optionally override import name which is by default reflects Src name
 macro COMPILE_LUA_21(Src, NAME="") {
-    .CMD=$_SRC_lua_21($Src, ${pre=-n :NAME})
+    .CMD=$_SRC_lua_21($Src ${pre=-n :NAME})
+    .STRUCT_CMD=yes
 }
 
 # tag:lua-specific
@@ -3545,6 +3549,7 @@ YDL_DESC_FLAGS=
 # tag:src-processing tag:ydl-specific
 macro _SRC("ydl", SRC, SRCFLAGS...) {
     .CMD=${tool:"statbox/ydl/compiler/tooling/ydl/bin"} c $YDL_FLAGS --cpp-output-header ${output;suf=.h:SRC} --cpp-output-source ${output;suf=.cpp:SRC} ${input:SRC} ${hide;output_include:"statbox/ydl/runtime/cpp/gen_support/standard_includes.h"} ${hide;kv:"p YDL"} ${hide;kv:"pc yellow"}
+    .STRUCT_CMD=yes
     .PEERDIR+=statbox/ydl/runtime/cpp
 }
 
@@ -3562,6 +3567,7 @@ macro _SRC("ydl", SRC, SRCFLAGS...) {
 ### This will parse file ../types.ydl, generate a descriptor for a symbol Event defined in the said file, and put the descriptor to the Event.ydld.
 macro BUILD_YDL_DESC(Input, Symbol, Output) {
     .CMD=${tool:"statbox/ydl/compiler/tooling/ydl/bin"} ti $YDL_FLAGS $YDL_DESC_FLAGS -o ${noauto;output:Output} ${input:Input} ${Symbol} ${hide;kv:"p YDL"} ${hide;kv:"pc yellow"}
+    .STRUCT_CMD=yes
 }
 
 # tag:ydl-specific
@@ -4476,12 +4482,14 @@ SCHEEME2_STRUCT_INFO_FLAGS=-f "const static ui32 RecordSig" -u "RecordSig" --gcc
 ### See tools/structparser for more details.
 macro GEN_SCHEEME2(ScheemeName, FromFile) {
     .CMD=$CXX_COMPILER_OLD $C_FLAGS_PLATFORM -c ${stdout;tmp;suf=.cph:FromFile} $SCHEEME2_CFLAGS ${input:FromFile} ${pre=-I:_C__INCLUDE} $CXXFLAGS -Wno-error && ${tool:"tools/structparser"} -o ${output;suf=.inc:ScheemeName} -n N${ScheemeName}SchemeInfo $SCHEEME2_STRUCT_INFO_FLAGS $DATAWORK_SCHEEME_EXPORT_FLAGS ${tmp;suf=.cph:FromFile} ${stdout;noauto;output;suf=.inc.log:ScheemeName} ${hide;kv:"p SH"} ${hide;kv:"pc yellow"}
+    .STRUCT_CMD=yes
 }
 
 ### @usage: SYMLINK(from to)
 ### Add symlink
 macro SYMLINK(From, To) {
-    .CMD=$YMAKE_PYTHON ${input:"build/scripts/symlink.py"} ${input;dirallowed:From} ${noauto;output:To} ${hide;kv:"p LN"} ${hide;kv:"pc light-cyan"}
+    .CMD=$YMAKE_PYTHON ${input:"build/scripts/symlink.py"} ${dirallowed;input:From} ${noauto;output:To} ${hide;kv:"p LN"} ${hide;kv:"pc light-cyan"}
+    #.STRUCT_CMD=yes
 }
 
 macro _FMT_INDUCED_DEPS(For, Deps...) {
@@ -4806,6 +4814,7 @@ macro USE_LLVM_BC18() {
 ### Note: Output name is used as is, no extension added.
 macro CLANG_EMIT_AST_CXX(Input, Output, Opts...) {
     .CMD=$YMAKE_PYTHON ${input:"build/scripts/clang_wrapper.py"} $WINDOWS ${CLANG_RESOURCE_GLOBAL}/bin/clang++ ${pre=-I:_C__INCLUDE} $CXXFLAGS $C_FLAGS_PLATFORM $LLVM_OPTS -emit-ast -c ${input:Input} -o ${noauto;output:Output} $Opts ${hide;kv:"p ST"} ${hide;kv:"pc light-green"}
+    .STRUCT_CMD=yes
     PEERDIR(build/platform/clang)
 }
 
@@ -4859,7 +4868,8 @@ when($OS_LINUX) {
 ### Emit eBPF bytecode from .c file.
 ### Note: Output name is used as is, no extension added.
 macro BPF_STATIC(Input, Output, Opts...) {
-    .CMD=$YMAKE_PYTHON ${input:"build/scripts/clang_wrapper.py"} $WINDOWS ${CLANG_RESOURCE_GLOBAL}/bin/clang ${pre=-I:_C__INCLUDE} $C_FLAGS_PLATFORM -target bpf -c ${input:Input} -o ${noauto;output:Output} $Opts ${hide;kv:"p BP"} ${hide;kv:"pc light-green"} && ${cwd:BINDIR} $LLD_ROOT_RESOURCE_GLOBAL/bin/$LD_BINARY_NAME -r -b binary -m elf_x86_64 -o ${noauto;output;suf=.bpf.o:Input} ${noauto;nopath:Output}
+    .CMD=$YMAKE_PYTHON ${input:"build/scripts/clang_wrapper.py"} $WINDOWS ${CLANG_RESOURCE_GLOBAL}/bin/clang ${pre=-I:_C__INCLUDE} $C_FLAGS_PLATFORM -target bpf -c ${input:Input} -o ${noauto;output:Output} $Opts ${hide;kv:"p BP"} ${hide;kv:"pc light-green"} && ${cwd:BINDIR} $LLD_ROOT_RESOURCE_GLOBAL/bin/$LD_BINARY_NAME -r -b binary -m elf_x86_64 -o ${noauto;output;suf=.bpf.o:Input} ${nopath:Output}
+    .STRUCT_CMD=yes
     PEERDIR(build/platform/clang build/platform/lld)
 }
 
@@ -4869,6 +4879,7 @@ macro BPF_STATIC(Input, Output, Opts...) {
 ### Note: Output name is used as is, no extension added.
 macro LLVM_COMPILE_LL(Input, Output, Opts...) {
     .CMD=${CLANG_BC_ROOT}/bin/llvm-as ${input:Input} -o ${noauto;output:Output} ${hide;kv:"p BC"} ${hide;kv:"pc light-green"}
+    .STRUCT_CMD=yes
     .SEM=custom_runs-ITEM && custom_runs-depends ${input:Input} && custom_runs-command ${LLVMAS} ${input:Input} -o ${noauto;output:Output} && custom_runs-outputs ${noauto;output:Output}
     PEERDIR(build/platform/clang)
 }
@@ -4901,7 +4912,8 @@ macro LLVM_OPT(Input, Output, Opts...) {
 ###
 ### Note: Output name is calculated as concatenation of Src name and platform specific object file extension.
 macro LLVM_LLC(Src, Opts...) {
-    .CMD=${tool:LLVM_LLC_TOOL} ${input:Src} --filetype obj -o ${output;suf=$OBJECT_SUF;noauto:Src} $Opts ${hide;kv:"p LC"} ${hide;kv:"pc yellow"}
+    .CMD=${tool:LLVM_LLC_TOOL} ${input:Src} --filetype obj -o ${noauto;output;suf=$OBJECT_SUF:Src} $Opts ${hide;kv:"p LC"} ${hide;kv:"pc yellow"}
+    .STRUCT_CMD=yes
     .SEM=custom_runs-ITEM && custom_runs-depends ${input:Src} && custom_runs-command ${LLVMLLC} --filetype obj ${input:Src} -o ${output;suf=$OBJECT_SUF;noauto:Src} $Opts && custom_runs-outputs ${output;suf=$OBJECT_SUF;noauto:Src}
     PEERDIR(build/platform/clang)
 }
@@ -4943,6 +4955,7 @@ PACK_TGZ=${cwd:ARCADIA_BUILD_ROOT} tar -czf ${rootrel:OUTPUT} ${rootrel:INPUT} $
 ### Just introduce outputs
 macro TOUCH(Outputs...) {
     .CMD=$YMAKE_PYTHON ${input:"build/scripts/touch.py"} ${output:Outputs}
+    .STRUCT_CMD=yes
 }
 
 TOUCH_UNIT=$YMAKE_PYTHON3 ${input:"build/scripts/touch.py"} ${hide;kv:"p UN"} ${hide;kv:"pc light-cyan"} $TARGET
@@ -5832,12 +5845,14 @@ CFLAGS+=$_CFLAGS_VISIBILITY
 # tag:cpp-specific
 macro SDBUS_CPP_ADAPTOR(File) {
     .CMD=${tool:"contrib/libs/sdbus-cpp/tools/xml2cpp-codegen"} --adaptor=${output;suf=.adaptor.h;nopath;noext:File} ${input:File}
+    .STRUCT_CMD=yes
     .PEERDIR=contrib/libs/sdbus-cpp
 }
 
 # tag:cpp-specific
 macro SDBUS_CPP_PROXY(File) {
     .CMD=${tool:"contrib/libs/sdbus-cpp/tools/xml2cpp-codegen"} --proxy=${output;suf=.proxy.h;nopath;noext:File} ${input:File}
+    .STRUCT_CMD=yes
     .PEERDIR=contrib/libs/sdbus-cpp
 }