Exporter - progen prefix to member functions for progen

workspace_tools/export/__init__.py

@@ -21,7 +21,7 @@ from shutil import copytree, rmtree, copy
 from workspace_tools.utils import mkdir
 from workspace_tools.export import uvision4, codesourcery, codered, gccarm, ds5_5, iar, emblocks, coide, kds, zip, simplicityv3, atmelstudio
 from workspace_tools.export.exporters import zip_working_directory_and_clean_up, OldLibrariesException
-from workspace_tools.targets import TARGET_NAMES, EXPORT_MAP
+from workspace_tools.targets import TARGET_NAMES, EXPORT_MAP, TARGET_MAP
 
 from project_generator_definitions.definitions import ProGenDef
 
@@ -88,7 +88,7 @@ def export(project_path, project_name, ide, target, destination='/tmp/',
             except AttributeError:
                 pass
             if use_progen:
-                if target not in Exporter.PROGEN_TARGETS.keys() or not ProGenDef(ide).is_supported(Exporter.PROGEN_TARGETS[target]):
+                if not ProGenDef(ide).is_supported(TARGET_MAP[target].progen_target):
                     supported = False
             else:
                 if target not in Exporter.TARGETS:

workspace_tools/export/exporters.py

@@ -46,7 +46,7 @@ class Exporter(object):
                 self.toolchain.copy_files(r, trg_path, rel_path=src_path)
         return resources
 
-    def get_project_data(self):
+    def progen_get_project_data(self):
         """ Get ProGen project data  """
         # provide default data, some tools don't require any additional
         # tool specific settings
@@ -64,7 +64,7 @@ class Exporter(object):
                 'includes':  { 
                     'Include Files': self.resources.headers,
                 },
-                'target': [self.target.progen_target],
+                'target': [TARGET_MAP[self.target].progen_target],
                 'macros': self.get_symbols(),
                 'export_dir': [self.inputDir],
                 'linker_file': [self.resources.linker_script],
@@ -72,6 +72,12 @@ class Exporter(object):
         }
         return project_data
 
+    def progen_gen_file(self, tool_name, project_data):
+        """" Generate project using ProGen Project API """
+        settings = ProjectSettings()
+        project = Project(self.program_name, [project_data], settings)
+        project.generate(tool_name, copied=True)
+
     def __scan_all(self, path):
         resources = []
 
@@ -119,12 +125,6 @@ class Exporter(object):
         # if not self.toolchain.mbed_libs:
         #    raise OldLibrariesException()
 
-    def gen_file_progen(self, tool_name, project_data):
-        """" Generate project using ProGen Project API """
-        settings = ProjectSettings()
-        project = Project(self.program_name, [project_data], settings)
-        project.generate(tool_name, copied=True)
-
     def gen_file(self, template_file, data, target_file):
         template_path = join(Exporter.TEMPLATE_DIR, template_file)
         template = self.jinja_environment.get_template(template_file)