More copy-paste fixes

Author: arkq

scripts/build/builders/esp32.py

@@ -257,7 +257,7 @@ def build_outputs(self):
         if self.options.enable_link_map_file:
             extensions.append("map")
         for ext in extensions:
-            name = f"{self.app.AppNamePrefix()}.{ext}"
+            name = f"{self.app.AppNamePrefix}.{ext}"
             yield BuilderOutput(os.path.join(self.output_dir, name), name)
 
     def bundle_outputs(self):

scripts/build/builders/infineon.py

@@ -111,6 +111,6 @@ def build_outputs(self):
             yield BuilderOutput(os.path.join(self.output_dir, name), name)
 
     def bundle_outputs(self):
-        with open(os.path.join(self.output_dir, self.app.FlashBundleName)) as f:
+        with open(os.path.join(self.output_dir, self.app.FlashBundleName())) as f:
             for line in filter(None, [x.strip() for x in f.readlines()]):
                 yield BuilderOutput(os.path.join(self.output_dir, line), line)

scripts/build/builders/nrf.py

@@ -243,6 +243,6 @@ def build_outputs(self):
     def bundle_outputs(self):
         if self.app == NrfApp.UNIT_TESTS:
             return
-        with open(os.path.join(self.output_dir, self.app.FlashBundleName)) as f:
+        with open(os.path.join(self.output_dir, self.app.FlashBundleName())) as f:
             for line in filter(None, [x.strip() for x in f.readlines()]):
                 yield BuilderOutput(os.path.join(self.output_dir, line), line)

scripts/build/builders/nxp.py

@@ -129,9 +129,11 @@ def generate(self):
         super(NxpBuilder, self).generate()
 
     def build_outputs(self):
-        extensions = ["elf"]
+        name = 'chip-%s-%s' % (self.board.Name(), self.app.NameSuffix())
+        yield BuilderOutput(
+            os.path.join(self.output_dir, name),
+            f'{name}.elf')
         if self.options.enable_link_map_file:
-            extensions.append("map")
-        for ext in extensions:
-            name = f"chip-{self.board.Name()}-{self.app.NameSuffix()}.{ext}"
-            yield BuilderOutput(os.path.join(self.output_dir, name), name)
+            yield BuilderOutput(
+                os.path.join(self.output_dir, f'{name}.map'),
+                f'{name}.map')