Merge pull request #3562 from theotherjimmy/alpha-groups

Alphabetize UVision groups

Author: adbridge

tools/export/uvision/__init__.py

@@ -182,7 +182,8 @@ def format_src(self, srcs):
         """Make sources into the named tuple for use in the template"""
         grouped = self.group_project_files(srcs)
         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
 
     def generate(self):
@@ -198,7 +199,8 @@ def generate(self):
             'name': self.project_name,
             # project_files => dict of generators - file group to generator of
             # 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,
             'include_paths': '; '.join(self.resources.inc_dirs).encode('utf-8'),
             'device': DeviceUvision(self.target),

tools/export/uvision/uvision.tmpl

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