Filter libraries by extension in exporters

Author: theotherjimmy

tools/export/atmelstudio/__init__.py

@@ -59,7 +59,7 @@ def generate(self):
                 source_folders.append(e)
 
         libraries = []
-        for lib in self.resources.libraries:
+        for lib in self.libraries:
             l, _ = splitext(basename(lib))
             libraries.append(l[3:])
 

tools/export/cces/__init__.py

@@ -318,7 +318,7 @@ def generate(self):
         cxx_flags = self.flags['cxx_flags'] + self.flags['common_flags']
 
         libs = []
-        for libpath in self.resources.libraries:
+        for libpath in self.libraries:
             lib = os.path.splitext(os.path.basename(libpath))[0]
             libs.append(lib[3:]) # skip 'lib' prefix
 

tools/export/cmake/__init__.py

@@ -68,7 +68,7 @@ def generate(self):
         srcs = [re.sub(r'^[.]/', '', f) for f in srcs]
 
         # additional libraries
-        libraries = [self.prepare_lib(basename(lib)) for lib in self.resources.libraries]
+        libraries = [self.prepare_lib(basename(lib)) for lib in self.libraries]
         sys_libs = [self.prepare_sys_lib(lib) for lib in self.toolchain.sys_libs]
 
         # sort includes reverse, so the deepest dir comes first (ensures short includes)

tools/export/cmsis/__init__.py

@@ -143,7 +143,7 @@ def group_project_files(self, sources, root_element):
     def generate(self):
         srcs = self.resources.headers + self.resources.s_sources + \
                self.resources.c_sources + self.resources.cpp_sources + \
-               self.resources.objects + self.resources.libraries + \
+               self.resources.objects + self.libraries + \
                [self.resources.linker_script]
         srcs = [fileCMSIS(src, src) for src in srcs if src]
         ctx = {

tools/export/codeblocks/__init__.py

@@ -90,8 +90,7 @@ def generate(self):
                                             not x.startswith('obj'))];
 
         c_sources = sorted([self.filter_dot(s) for s in self.resources.c_sources])
-        libraries = [self.prepare_lib(basename(lib)) for lib
-                     in self.resources.libraries]
+        libraries = [self.prepare_lib(basename(lib)) for lib in self.libraries]
         sys_libs = [self.prepare_sys_lib(lib) for lib
                     in self.toolchain.sys_libs]
         ncs36510fib = (hasattr(self.toolchain.target, 'post_binary_hook') and

tools/export/coide/__init__.py

@@ -88,7 +88,7 @@ def generate(self):
                 })
 
         libraries = []
-        for lib in self.resources.libraries:
+        for lib in self.libraries:
             l, _ = splitext(basename(lib))
             libraries.append(l[3:])
 

tools/export/ds5_5/__init__.py

@@ -60,7 +60,7 @@ def generate(self):
             'name': self.project_name,
             'include_paths': self.resources.inc_dirs,
             'scatter_file': self.resources.linker_script,
-            'object_files': self.resources.objects + self.resources.libraries,
+            'object_files': self.resources.objects + self.libraries,
             'source_files': source_files,
             'symbols': self.toolchain.get_symbols()
         }

tools/export/embitz/__init__.py

@@ -60,7 +60,7 @@ def generate(self):
                 })
 
         libraries = []
-        for lib in self.resources.libraries:
+        for lib in self.libraries:
             l, _ = splitext(basename(lib))
             libraries.append(l[3:])
 

tools/export/exporters.py

@@ -118,6 +118,11 @@ def flags(self):
                 config_header.name)
         return flags
 
+    @property
+    def libraries(self):
+        return [l for l in self.resources.get_file_names(FileType.LIB)
+                if l.endswith(self.toolchain.LIBRARY_EXT)]
+
     def toolchain_flags(self, toolchain):
         """Returns a dictionary of toolchain flags.
         Keys of the dictionary are:

tools/export/gnuarmeclipse/__init__.py

@@ -90,7 +90,7 @@ def create_jinja_ctx(self):
         # TODO: use some logger to display additional info if verbose
 
         libraries = []
-        for lib in self.resources.libraries:
+        for lib in self.libraries:
             l, _ = splitext(basename(lib))
             libraries.append(l[3:])