ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

skip -c, sort compiler options and file list

pull/6481/head
Thomas Sailer 2018-04-03 18:41:09 +02:00
parent 8478ec253a
commit 84fe7ed5fd
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/export/codeblocks/__init__.py
View File

@ -1,7 +1,7 @@
""" """
mbed SDK mbed SDK
Copyright (c) 2014-2017 ARM Limited Copyright (c) 2014-2017 ARM Limited
Copyright (c) 2018 Code::Blocks Copyright (c) 2018 ON Semiconductor
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -62,7 +62,7 @@ class CodeBlocks(GccArm):
if f == "-include": if f == "-include":
next_is_include = True next_is_include = True
continue continue
if f == 'c': if f == '-c':
continue continue
if next_is_include: if next_is_include:
f = '-include ' + f f = '-include ' + f
@ -71,24 +71,24 @@ class CodeBlocks(GccArm):
debug_flags.append(f) debug_flags.append(f)
else: else:
comp_flags.append(f) comp_flags.append(f)
comp_flags = list(set(comp_flags)) comp_flags = sorted(list(set(comp_flags)))
inc_dirs = [self.filter_dot(s) for s in self.resources.inc_dirs]; inc_dirs = [self.filter_dot(s) for s in self.resources.inc_dirs];
inc_dirs = [x for x in inc_dirs if (x is not None and inc_dirs = [x for x in inc_dirs if (x is not None and
x != '' and x != '.' and x != '' and x != '.' and
not x.startswith('bin') and not x.startswith('bin') and
not x.startswith('obj'))]; not x.startswith('obj'))];
c_sources = [self.filter_dot(s) for s in self.resources.c_sources] c_sources = sorted([self.filter_dot(s) for s in self.resources.c_sources])
ctx = { ctx = {
'project_name': self.project_name, 'project_name': self.project_name,
'debug_flags': debug_flags, 'debug_flags': debug_flags,
'comp_flags': comp_flags, 'comp_flags': comp_flags,
'ld_flags': self.flags['ld_flags'], 'ld_flags': self.flags['ld_flags'],
'headers': list(set([self.filter_dot(s) for s in self.resources.headers])), 'headers': sorted(list(set([self.filter_dot(s) for s in self.resources.headers]))),
'c_sources': c_sources, 'c_sources': c_sources,
's_sources': [self.filter_dot(s) for s in self.resources.s_sources], 's_sources': sorted([self.filter_dot(s) for s in self.resources.s_sources]),
'cpp_sources': [self.filter_dot(s) for s in self.resources.cpp_sources], 'cpp_sources': sorted([self.filter_dot(s) for s in self.resources.cpp_sources]),
'include_paths': inc_dirs, 'include_paths': inc_dirs,
'linker_script': self.filter_dot(self.resources.linker_script), 'linker_script': self.filter_dot(self.resources.linker_script),
'libraries': self.resources.libraries, 'libraries': self.resources.libraries,