tools/export: move hex_files selection to base Exporter class

CMake and makefile exporters share a common logic for hex file
selection. Factor it as a common property in the base class
to avoid code duplication.

Author: vmedcy

tools/export/cmake/__init__.py

@@ -75,12 +75,6 @@ def generate(self):
         # sort includes reverse, so the deepest dir comes first (ensures short includes)
         includes = sorted([re.sub(r'^[.]/', '', l) for l in self.resources.inc_dirs], reverse=True)
 
-        # select dependant hex files to merge into compiled hex image
-        hex_files = self.resources.hex_files
-        if hasattr(self.toolchain.target, 'hex_filename'):
-            hex_filename = self.toolchain.target.hex_filename
-            hex_files = list(f for f in hex_files if basename(f) == hex_filename)
-
         ctx = {
             'name': self.project_name,
             'target': self.target,
@@ -90,7 +84,7 @@ def generate(self):
             'include_paths': includes,
             'library_paths': sorted([re.sub(r'^[.]/', '', l) for l in self.resources.lib_dirs]),
             'linker_script': self.resources.linker_script,
-            'hex_files': hex_files,
+            'hex_files': self.hex_files,
             'ar': basename(self.toolchain.ar),
             'cc': basename(self.toolchain.cc[0]),
             'cc_flags': " ".join(flag for flag in self.toolchain.cc[1:] if not flag == "-c"),

tools/export/exporters.py

@@ -123,6 +123,15 @@ def libraries(self):
         return [l for l in self.resources.get_file_names(FileType.LIB)
                 if l.endswith(self.toolchain.LIBRARY_EXT)]
 
+    @property
+    def hex_files(self):
+        """Returns a list of hex files to include in the exported project"""
+        hex_files = self.resources.hex_files
+        if hasattr(self.toolchain.target, 'hex_filename'):
+            hex_filename = self.toolchain.target.hex_filename
+            hex_files = [f for f in hex_files if basename(f) == hex_filename]
+        return hex_files
+
     def toolchain_flags(self, toolchain):
         """Returns a dictionary of toolchain flags.
         Keys of the dictionary are:

tools/export/makefile/__init__.py

@@ -84,11 +84,6 @@ def generate(self):
         sys_libs = [self.prepare_sys_lib(lib) for lib
                     in self.toolchain.sys_libs]
 
-        hex_files = self.resources.hex_files
-        if hasattr(self.toolchain.target, 'hex_filename'):
-            hex_filename = self.toolchain.target.hex_filename
-            hex_files = list(f for f in hex_files if basename(f) == hex_filename)
-
         ctx = {
             'name': self.project_name,
             'to_be_compiled': to_be_compiled,
@@ -98,7 +93,7 @@ def generate(self):
             'linker_script': self.resources.linker_script,
             'libraries': libraries,
             'ld_sys_libs': sys_libs,
-            'hex_files': hex_files,
+            'hex_files': self.hex_files,
             'vpath': (["../../.."]
                       if (basename(dirname(dirname(self.export_dir)))
                           == "projectfiles")