Cypress: Query exact application names in post build

This removes the need to use "glob" a file extension, and uses
precise application names.

Author: LDong-Arm

targets/TARGET_Cypress/scripts/PSOC6.py

@@ -318,10 +318,10 @@ def complete(message_func, elf0, hexf0, hexf1=None):
 
 def merge_action(args):
     """Entry point for the "merge" CLI command."""
-    try:
-        elf_file = list(pathlib.Path(args.artefacts_location).glob("*.elf"))[0]
-        m4hex_file = list(pathlib.Path(args.artefacts_location).glob("*.hex"))[0]
-    except IndexError:
+    elf_file = os.path.join(args.artefacts_location, args.application_name + ".elf")
+    m4hex_file = os.path.join(args.artefacts_location, args.application_name + ".hex")
+
+    if not os.path.isfile(elf_file) or not os.path.isfile(m4hex_file):
         raise ArtefactsError(
             f"Could not find elf and/or hex file in {args.artefacts_location}"
         )
@@ -333,10 +333,9 @@ def merge_action(args):
 
 def sign_action(args):
     """Entry point for the "sign" CLI command."""
-    try:
-        elf_file = list(pathlib.Path(args.artefacts_location).glob("*.elf"))[0]
-        m4hex_file = list(pathlib.Path(args.artefacts_location).glob("*.hex"))[0]
-    except IndexError:
+    elf_file = os.path.join(args.artefacts_location, args.application_name + ".elf")
+    m4hex_file = os.path.join(args.artefacts_location, args.application_name + ".hex")
+    if not os.path.isfile(elf_file) or not os.path.isfile(m4hex_file):
         raise ArtefactsError(
             f"Could not find elf and/or hex file in {args.artefacts_location}"
         )
@@ -370,6 +369,9 @@ def parse_args():
     merge_subcommand.add_argument(
         "--artefacts-location", required=True, help="the path to the application artefacts."
     )
+    merge_subcommand.add_argument(
+        "--application-name", required=True, help="Name of the application."
+    )
     merge_subcommand.add_argument(
         "--m0hex", help="the path to the Cortex-M0 HEX to merge."
     )
@@ -402,6 +404,9 @@ def parse_args():
     sign_subcommand.add_argument(
         "--artefacts-location", required=True, help="the path to the application artefacts."
     )
+    sign_subcommand.add_argument(
+        "--application-name", required=True, help="Name of the application."
+    )
     sign_subcommand.add_argument(
         "--m0hex", help="the path to the Cortex-M0 HEX to merge."
     )

targets/TARGET_Cypress/scripts/mbed_set_post_build_cypress.cmake

@@ -23,13 +23,15 @@ function(mbed_post_build_psoc6_merge_hex mbed_target_name)
             COMMAND ${Python3_EXECUTABLE} ${MBED_PATH}/targets/TARGET_Cypress/scripts/PSOC6.py
                 merge
                 --artefacts-location ${CMAKE_BINARY_DIR}
+                --application-name $<TARGET_PROPERTY:mbed-post-build-bin-${mbed_target_name},application>
                 --m0hex ${cortex_m0_hex}
         )
     else()
         set(post_build_command
             COMMAND ${Python3_EXECUTABLE} ${MBED_PATH}/targets/TARGET_Cypress/scripts/PSOC6.py
                 merge
                 --artefacts-location ${CMAKE_BINARY_DIR}
+                --application-name $<TARGET_PROPERTY:mbed-post-build-bin-${mbed_target_name},application>
         )
     endif()
 
@@ -62,6 +64,7 @@ function(mbed_post_build_psoc6_sign_image
             --cm0-img-id ${cm0_img_id}
             --cm4-img-id ${cm4_img_id}
             --artefacts-location ${CMAKE_BINARY_DIR}
+            --application-name $<TARGET_PROPERTY:mbed-post-build-bin-${mbed_target_name},application>
             --m0hex ${cortex_m0_hex}
     )