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

Merge pull request #3562 from theotherjimmy/alpha-groups 

Alphabetize UVision groups
pull/3573/head
Anna Bridge 2017-01-12 16:06:52 +00:00 committed by GitHub
parent 9ce040e745 27e4e7d8a8
commit ccab2c5dae
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/export/uvision/__init__.py
View File

@ -182,7 +182,8 @@ class Uvision(Exporter):
"""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 grouped.items():
grouped[group] = self.uv_files(files) grouped[group] = sorted(list(self.uv_files(files)),
key=lambda (_, __, name): name.lower())
return grouped return grouped
def generate(self): def generate(self):
@ -198,7 +199,8 @@ 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()),
key=lambda (group, _): group.lower()),
'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),

2
tools/export/uvision/uvision.tmpl
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>