[build] Add optional SUFFIX to BUNDLE()

commit_hash:340460c18f39c151147e8e942a5e82e8f485f714

Author: deshevoy

build/plugins/bundle.py

@@ -3,20 +3,29 @@
 
 def onbundle(unit, *args):
     """
-    @usage BUNDLE(<Dir [NAME Name]>...)
+    @usage BUNDLE(<Dir [SUFFIX Suffix] [NAME Name]>...)
 
     Brings build artefact from module Dir under optional Name to the current module (e.g. UNION)
     If NAME is not specified, the name of the Dir's build artefact will be preserved
+    Optional SUFFIX allows to use secondary module output. The suffix is appended to the primary output name, so the applicability is limited.
     It makes little sense to specify BUNDLE on non-final targets and so this may stop working without prior notice.
     Bundle on multimodule will select final target among multimodule variants and will fail if there are none or more than one.
     """
     i = 0
     while i < len(args):
-        if i + 2 < len(args) and args[i + 1] == "NAME":
-            target, name = args[i], args[i + 2]
-            i += 3
+        target = args[i]
+        i += 1
+
+        if i + 1 < len(args) and args[i] == "SUFFIX":
+            suffix = args[i + 1]
+            i += 2
+        else:
+            suffix = ""
+
+        if i + 1 < len(args) and args[i] == "NAME":
+            name = args[i + 1]
+            i += 2
         else:
-            target, name = args[i], os.path.basename(args[i])
-            i += 1
+            name = os.path.basename(target) + suffix
 
-        unit.on_bundle_target([target, name])
+        unit.on_bundle_target([target, name, suffix])

build/ymake.core.conf

@@ -2725,8 +2725,8 @@ macro ALL_RESOURCE_FILES_FROM_DIRS(PREFIX="", STRIP="", DIRS...) {
      _ARF_HELPER(${pre=PREFIX :PREFIX} STRIP ${ARCADIA_ROOT}/${MODDIR}/${STRIP} ${_ALL_RES_DIRS})
 }
 
-macro _BUNDLE_TARGET(Target, Destination) {
-    .CMD=$MOVE_FILE ${result:Target} ${noauto;output:Destination} ${hide;kv:"p BN"} ${hide;kv:"pc light-cyan"} $VCS_INFO_DISABLE_CACHE__NO_UID__
+macro _BUNDLE_TARGET(Target, Destination, Suffix) {
+    .CMD=$MOVE_FILE ${result:Target}$Suffix ${noauto;output:Destination} ${hide;kv:"p BN"} ${hide;kv:"pc light-cyan"} $VCS_INFO_DISABLE_CACHE__NO_UID__
 }
 
 ### @usage: TIMEOUT(TIMEOUT)