From 7c330289deecdc9bc47026e168eb1b59b9a2bf33 Mon Sep 17 00:00:00 2001
From: Jimmy Brisson <theotherjimmy@gmail.com>
Date: Tue, 10 Jan 2017 14:50:57 -0600
Subject: [PATCH] Alphabetize UVision groups

---
 tools/export/uvision/__init__.py  | 4 ++--
 tools/export/uvision/uvision.tmpl | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/export/uvision/__init__.py b/tools/export/uvision/__init__.py
index dd5a8cbe7c..1a6eba9d50 100644
--- a/tools/export/uvision/__init__.py
+++ b/tools/export/uvision/__init__.py
@@ -181,7 +181,7 @@ class Uvision(Exporter):
     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():
+        for group, files in sorted(grouped.items()):
             grouped[group] = self.uv_files(files)
         return grouped
 
@@ -198,7 +198,7 @@ class Uvision(Exporter):
             '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())),
             'linker_script':self.resources.linker_script,
             'include_paths': '; '.join(self.resources.inc_dirs).encode('utf-8'),
             'device': DeviceUvision(self.target),
diff --git a/tools/export/uvision/uvision.tmpl b/tools/export/uvision/uvision.tmpl
index 74f4ee9c28..9093703ca6 100644
--- a/tools/export/uvision/uvision.tmpl
+++ b/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>