Alphabetize UVision groups

pull/3585/head
Jimmy Brisson 2017-01-10 14:50:57 -06:00 committed by Anna Bridge
parent ec7f949bfe
commit 7c330289de
2 changed files with 3 additions and 3 deletions

View File

@ -181,7 +181,7 @@ class Uvision(Exporter):
def format_src(self, srcs): def format_src(self, srcs):
"""Make sources into the named tuple for use in the template""" """Make sources into the named tuple for use in the template"""
grouped = self.group_project_files(srcs) grouped = self.group_project_files(srcs)
for group, files in grouped.items(): for group, files in sorted(grouped.items()):
grouped[group] = self.uv_files(files) grouped[group] = self.uv_files(files)
return grouped return grouped
@ -198,7 +198,7 @@ class Uvision(Exporter):
'name': self.project_name, 'name': self.project_name,
# project_files => dict of generators - file group to generator of # project_files => dict of generators - file group to generator of
# UVFile tuples defined above # UVFile tuples defined above
'project_files': self.format_src(srcs), 'project_files': sorted(list(self.format_src(srcs).iteritems())),
'linker_script':self.resources.linker_script, 'linker_script':self.resources.linker_script,
'include_paths': '; '.join(self.resources.inc_dirs).encode('utf-8'), 'include_paths': '; '.join(self.resources.inc_dirs).encode('utf-8'),
'device': DeviceUvision(self.target), 'device': DeviceUvision(self.target),

View File

@ -417,7 +417,7 @@
</TargetArmAds> </TargetArmAds>
</TargetOption> </TargetOption>
<Groups> <Groups>
{% for group, files in project_files.iteritems() %} {% for group, files in project_files %}
<Group> <Group>
<GroupName>{{group}}</GroupName> <GroupName>{{group}}</GroupName>
<Files> <Files>