Fix some tracebacks, add zip exporter to the CLI

Author: theotherjimmy

tools/export/__init__.py

@@ -42,6 +42,7 @@
     'atmelstudio' : atmelstudio.AtmelStudio,
     'sw4stm32'    : sw4stm32.Sw4STM32,
     'e2studio' : e2studio.E2Studio,
+    'zip' : zip.ZIP,
 }
 
 ERROR_MESSAGE_UNSUPPORTED_TOOLCHAIN = """

tools/export/uvision4.py

@@ -80,9 +80,9 @@ def generate(self):
         project_data['misc']['asm_flags'] = [asm_flag_string]
         # cxx flags included, as uvision have them all in one tab
         project_data['misc']['c_flags'] = list(set(['-D__ASSERT_MSG']
-                                                   + self.progen_flags['common_flags']
-                                                   + self.progen_flags['c_flags']
-                                                   + self.progen_flags['cxx_flags']))
+                                                   + self.flags['common_flags']
+                                                   + self.flags['c_flags']
+                                                   + self.flags['cxx_flags']))
         # not compatible with c99 flag set in the template
         project_data['misc']['c_flags'].remove("--c99")
         # cpp is not required as it's implicit for cpp files

tools/export/uvision5.py

@@ -79,9 +79,9 @@ def generate(self):
         project_data['misc']['asm_flags'] = [asm_flag_string]
         # cxx flags included, as uvision have them all in one tab
         project_data['misc']['c_flags'] = list(set(['-D__ASSERT_MSG']
-                                                   + self.progen_flags['common_flags']
-                                                   + self.progen_flags['c_flags']
-                                                   + self.progen_flags['cxx_flags']))
+                                                   + self.flags['common_flags']
+                                                   + self.flags['c_flags']
+                                                   + self.flags['cxx_flags']))
         # not compatible with c99 flag set in the template
         project_data['misc']['c_flags'].remove("--c99")
         # cpp is not required as it's implicit for cpp files

tools/project_api.py

@@ -256,6 +256,7 @@ def export_project(src_paths, export_path, target, ide,
     files, exporter = generate_project_files(resources, export_path,
                                              target, name, toolchain, ide,
                                              macros=macros)
+    files.append(config_header)
     if zip_proj:
         if isinstance(zip_proj, basestring):
             zip_export(join(export_path, zip_proj), name, resource_dict, files)