From f8cae13f331a17e08733346b95a779f0656d257d Mon Sep 17 00:00:00 2001 From: sarahmarshy Date: Fri, 9 Sep 2016 17:18:52 -0500 Subject: [PATCH] Fix uvision group naming The previous way of finding group names found the encompassing directory of each file. If the project is exported from the online compiler, this resulted in temporary folder names like tmpyKKWv_ showing up as group names. I propose defaulting to the project name if the file is in the project root. --- tools/export/exporters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/export/exporters.py b/tools/export/exporters.py index c3b381547c..3665c76814 100644 --- a/tools/export/exporters.py +++ b/tools/export/exporters.py @@ -121,8 +121,8 @@ class Exporter(object): def make_key(src): """turn a source file into it's group name""" key = os.path.basename(os.path.dirname(src)) - if not key: - key = os.path.basename(os.path.normpath(self.export_dir)) + if not key or relpath(key, self.export_dir) == '.': + key = self.project_name return key def grouped(sources):