Enable the new command engine in LIBRARY() and PROGRAM()

df060b20e3d184ebea5f4893d74bac84002752a9

2 files changed, 14 insertions, 14 deletions

diff --git a/build/conf/linkers/ld.conf b/build/conf/linkers/ld.conf
index 326d165f6d..e42fbea8b5 100644
--- a/build/conf/linkers/ld.conf
+++ b/build/conf/linkers/ld.conf
@@ -187,10 +187,10 @@ _ROOT_FLAGS=--source-root $ARCADIA_ROOT --build-root $(BUILD_ROOT)
 
 # Program
 GENERATE_MF_CMD=\
-    $YMAKE_PYTHON ${input:"build/scripts/generate_mf.py"} ${input;hide:"build/scripts/process_command_files.py"} \
+    $YMAKE_PYTHON ${input:"build/scripts/generate_mf.py"} ${hide;input:"build/scripts/process_command_files.py"} \
     --build-root $ARCADIA_BUILD_ROOT \
     --module-name $REALPRJNAME \
-    -o ${output;rootrel;pre=$MODULE_PREFIX;suf=$MODULE_SUFFIX.mf:REALPRJNAME} \
+    -o ${rootrel;output;pre=$MODULE_PREFIX;suf=$MODULE_SUFFIX.mf:REALPRJNAME} \
     -t $MODULE_TYPE \
     --ya-start-command-file \
     -Ya,lics $LICENSE_NAMES \
@@ -361,11 +361,11 @@ macro _FAT_OBJECT_ARGS_BASE(Flag, Lib) {
 }
 
 # FIXME: pre=lib here is weird legacy
-_FAT_OBJECT_ARGS=--obj=${pre=lib;output:REALPRJNAME.o}
+_FAT_OBJECT_ARGS=--obj=${output;pre=lib;suf=.o:REALPRJNAME}
 _LD_LINK_FAT_SRCS_GLOBALS=$_LD_LINK_FAT_SRCS_GLOBALS_WA
 
 macro PACK_GLOBALS_IN_LIBRARY() {
-     SET(_FAT_OBJECT_ARGS $_FAT_OBJECT_ARGS_BASE(--globals-lib, \${output;pre=$MODULE_PREFIX:REALPRJNAME.globals.a}))
+     SET(_FAT_OBJECT_ARGS $_FAT_OBJECT_ARGS_BASE(--globals-lib, \${output;pre=$MODULE_PREFIX;suf=.globals.a:REALPRJNAME}))
 }
 
 when ($OS_ANDROID == "yes") {
diff --git a/build/conf/linkers/msvc_linker.conf b/build/conf/linkers/msvc_linker.conf
index 62a649d036..b2cdfa4cb7 100644
--- a/build/conf/linkers/msvc_linker.conf
+++ b/build/conf/linkers/msvc_linker.conf
@@ -122,10 +122,10 @@ when ($_UNDER_WINE_LINK != "yes") {
     GENERATE_COMMON_LIB_VFS=${GENERATE_COMMON_LIB_VFS_CMD}
 }
 
-LINK_IMPLIB=/IMPLIB:${output;noext;rootrel;pre=$MODULE_PREFIX:REALPRJNAME.lib}
+LINK_IMPLIB=/IMPLIB:${rootrel;output;pre=$MODULE_PREFIX;suf=.lib;noext:REALPRJNAME}
 _LINK_EXTRA_OUTPUT=
 when (!$NO_DEBUGINFO || $NO_DEBUGINFO == "no" || $NO_DEBUGINFO == "0") {
-    _LINK_EXTRA_OUTPUT=/PDB:${output;noext;rootrel;pre=$MODULE_PREFIX:REALPRJNAME.pdb}
+    _LINK_EXTRA_OUTPUT=/PDB:${rootrel;output;pre=$MODULE_PREFIX;suf=.pdb;noext:REALPRJNAME}
 }
 LINK_EXTRA_OUTPUT=$_LINK_EXTRA_OUTPUT
 
@@ -151,10 +151,10 @@ when ($EXPORTS_FILE) {
 }
 
 GENERATE_MF_CMD=\
-    $YMAKE_PYTHON ${input:"build/scripts/generate_mf.py"} ${input;hide:"build/scripts/process_command_files.py"} \
+    $YMAKE_PYTHON ${input:"build/scripts/generate_mf.py"} ${hide;input:"build/scripts/process_command_files.py"} \
     --build-root $ARCADIA_BUILD_ROOT \
     --module-name $REALPRJNAME \
-    -o ${output;rootrel;pre=$MODULE_PREFIX;suf=$MODULE_SUFFIX.mf:REALPRJNAME} \
+    -o ${rootrel;output;pre=$MODULE_PREFIX;suf=$MODULE_SUFFIX.mf:REALPRJNAME} \
     -t $MODULE_TYPE \
     --ya-start-command-file \
     -Ya,lics $LICENSE_NAMES \
@@ -191,7 +191,7 @@ REAL_LINK_DYN_LIB_CMDLINE=\
     --ya-start-command-file \
     ${VCS_C_OBJ_RR} \
     ${qe;rootrel:AUTO_INPUT} \
-    ${qe;rootrel;ext=.lib:PEERS} ${qe;rootrel;ext=.dll;noext;suf=.lib:PEERS} \
+    ${qe;rootrel;ext=.lib;tags_cut:PEERS} ${qe;rootrel;ext=.dll;noext;suf=.lib;tags_cut:PEERS} \
     $LINK_EXE_FLAGS \
     $LINK_STDLIBS $LDFLAGS \
     $LDFLAGS_GLOBAL \
@@ -236,13 +236,13 @@ LINK_EXE_CMDLINE=\
     $LDFLAGS \
     $LDFLAGS_GLOBAL \
     $OBJADDE \
-    ${qe;rootrel;ext=.lib:PEERS} ${qe;rootrel;ext=.dll;noext;suf=.lib:PEERS} \
+    ${qe;rootrel;ext=.lib;tags_cut:PEERS} ${qe;rootrel;suf=.lib;noext;ext=.dll;tags_cut:PEERS} \
     --ya-end-command-file \
     ${hide;kv:"soe"} ${hide;kv:"p LD"} ${hide;kv:"pc blue"}
 
 LINK_EXE=$LINK_EXE_IMPL($_WHOLE_ARCHIVE_PEERS_VALUE)
 
-LINK_DYN_LIB=${GENERATE_MF} && $GENERATE_VCS_C_INFO_NODEP && $REAL_LINK_DYN_LIB ${hide;kv:"soe"} ${hide;kv:"p LD"} ${hide;kv:"pc blue"}
+LINK_DYN_LIB=${GENERATE_MF} && $GENERATE_VCS_C_INFO_NODEP && $REAL_LINK_DYN_LIB && ${hide;kv:"soe"} ${hide;kv:"p LD"} ${hide;kv:"pc blue"}
 
 LINK_EXEC_DYN_LIB_CMDLINE=\
     ${GENERATE_MF} && \
@@ -262,7 +262,7 @@ LINK_EXEC_DYN_LIB_CMDLINE=\
     '--ya-start-command-file \
     ${VCS_C_OBJ_RR} \
     ${qe;rootrel:AUTO_INPUT} \
-    ${qe;rootrel;ext=.lib:PEERS} ${qe;rootrel;ext=.dll;noext;suf=.lib:PEERS} \
+    ${qe;rootrel;ext=.lib;tags_cut:PEERS} ${qe;rootrel;ext=.dll;noext;suf=.lib;tags_cut:PEERS} \
     $LINK_EXE_FLAGS \
     $LINK_STDLIBS \
     $LDFLAGS $LDFLAGS_GLOBAL \
@@ -281,7 +281,7 @@ LINK_GLOBAL_FAT_OBJECT=\
     ${cwd:ARCADIA_BUILD_ROOT} \
     ${LIB_WRAPPER} \
     ${LINK_LIB_CMD} \
-    /OUT:${output;qe;rootrel:REALPRJNAME.global.lib} \
+    /OUT:${qe;rootrel;output;suf=.global.lib:REALPRJNAME} \
     --ya-start-command-file \
     ${qe;rootrel;ext=.lib:SRCS_GLOBAL} \
     ${qe;rootrel;ext=.obj:SRCS_GLOBAL} \
@@ -294,7 +294,7 @@ LINK_PEERS_FAT_OBJECT=\
     ${cwd:ARCADIA_BUILD_ROOT} \
     ${LIB_WRAPPER} \
     ${LINK_LIB_CMD} \
-    /OUT:${qe;rootrel;output:TARGET} \
+    /OUT:${qe;rootrel:TARGET} \
     --ya-start-command-file \
     ${qe;rootrel:PEERS} \
     $LINK_LIB_FLAGS \