Skip to content

Commit 84fe7ed

Browse files
author
Thomas Sailer
committed
skip -c, sort compiler options and file list
1 parent 8478ec2 commit 84fe7ed

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

tools/export/codeblocks/__init__.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""
22
mbed SDK
33
Copyright (c) 2014-2017 ARM Limited
4-
Copyright (c) 2018 Code::Blocks
4+
Copyright (c) 2018 ON Semiconductor
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -62,7 +62,7 @@ def generate(self):
6262
if f == "-include":
6363
next_is_include = True
6464
continue
65-
if f == 'c':
65+
if f == '-c':
6666
continue
6767
if next_is_include:
6868
f = '-include ' + f
@@ -71,24 +71,24 @@ def generate(self):
7171
debug_flags.append(f)
7272
else:
7373
comp_flags.append(f)
74-
comp_flags = list(set(comp_flags))
74+
comp_flags = sorted(list(set(comp_flags)))
7575
inc_dirs = [self.filter_dot(s) for s in self.resources.inc_dirs];
7676
inc_dirs = [x for x in inc_dirs if (x is not None and
7777
x != '' and x != '.' and
7878
not x.startswith('bin') and
7979
not x.startswith('obj'))];
8080

81-
c_sources = [self.filter_dot(s) for s in self.resources.c_sources]
81+
c_sources = sorted([self.filter_dot(s) for s in self.resources.c_sources])
8282

8383
ctx = {
8484
'project_name': self.project_name,
8585
'debug_flags': debug_flags,
8686
'comp_flags': comp_flags,
8787
'ld_flags': self.flags['ld_flags'],
88-
'headers': list(set([self.filter_dot(s) for s in self.resources.headers])),
88+
'headers': sorted(list(set([self.filter_dot(s) for s in self.resources.headers]))),
8989
'c_sources': c_sources,
90-
's_sources': [self.filter_dot(s) for s in self.resources.s_sources],
91-
'cpp_sources': [self.filter_dot(s) for s in self.resources.cpp_sources],
90+
's_sources': sorted([self.filter_dot(s) for s in self.resources.s_sources]),
91+
'cpp_sources': sorted([self.filter_dot(s) for s in self.resources.cpp_sources]),
9292
'include_paths': inc_dirs,
9393
'linker_script': self.filter_dot(self.resources.linker_script),
9494
'libraries': self.resources.libraries,

0 commit comments

Comments
 (0)