diff --git a/tools/export/__init__.py b/tools/export/__init__.py index 6bbf9e8f6ef..fe1baf5278f 100644 --- a/tools/export/__init__.py +++ b/tools/export/__init__.py @@ -16,7 +16,7 @@ # limitations under the License. from tools.export import codered, ds5_5, iar, makefile -from tools.export import embitz, coide, kds, simplicityv3, atmelstudio +from tools.export import embitz, coide, kds, simplicity, atmelstudio from tools.export import sw4stm32, e2studio, zip, cmsis, uvision, cdt from tools.targets import TARGET_NAMES @@ -33,7 +33,7 @@ 'embitz' : embitz.EmBitz, 'coide' : coide.CoIDE, 'kds' : kds.KDS, - 'simplicityv3' : simplicityv3.SimplicityV3, + 'simplicityv3' : simplicity.SimplicityV3, 'atmelstudio' : atmelstudio.AtmelStudio, 'sw4stm32' : sw4stm32.Sw4STM32, 'e2studio' : e2studio.E2Studio, diff --git a/tools/export/atmelstudio.py b/tools/export/atmelstudio/__init__.py similarity index 91% rename from tools/export/atmelstudio.py rename to tools/export/atmelstudio/__init__.py index 66c3c43020f..bab012db694 100644 --- a/tools/export/atmelstudio.py +++ b/tools/export/atmelstudio/__init__.py @@ -15,9 +15,10 @@ limitations under the License. """ import uuid -from exporters import Exporter from os.path import splitext, basename, dirname +from tools.export.exporters import Exporter + class AtmelStudio(Exporter): NAME = 'AtmelStudio' @@ -75,5 +76,5 @@ def generate(self): } ctx.update(self.flags) target = self.target.lower() - self.gen_file('atmelstudio6_2.atsln.tmpl', ctx, '%s.atsln' % self.project_name) - self.gen_file('atmelstudio6_2.cppproj.tmpl', ctx, '%s.cppproj' % self.project_name) + self.gen_file('atmelstudio/atsln.tmpl', ctx, '%s.atsln' % self.project_name) + self.gen_file('atmelstudio/cppproj.tmpl', ctx, '%s.cppproj' % self.project_name) diff --git a/tools/export/atmelstudio6_2.atsln.tmpl b/tools/export/atmelstudio/atsln.tmpl similarity index 100% rename from tools/export/atmelstudio6_2.atsln.tmpl rename to tools/export/atmelstudio/atsln.tmpl diff --git a/tools/export/atmelstudio6_2.cppproj.tmpl b/tools/export/atmelstudio/cppproj.tmpl similarity index 100% rename from tools/export/atmelstudio6_2.cppproj.tmpl rename to tools/export/atmelstudio/cppproj.tmpl diff --git a/tools/export/codered.py b/tools/export/codered/__init__.py similarity index 90% rename from tools/export/codered.py rename to tools/export/codered/__init__.py index 185e69a60dc..325191553bf 100644 --- a/tools/export/codered.py +++ b/tools/export/codered/__init__.py @@ -14,9 +14,9 @@ See the License for the specific language governing permissions and limitations under the License. """ -from exporters import Exporter from os.path import splitext, basename +from tools.export.exporters import Exporter class CodeRed(Exporter): NAME = 'CodeRed' @@ -56,5 +56,5 @@ def generate(self): 'symbols': self.toolchain.get_symbols() } ctx.update(self.flags) - self.gen_file('codered_%s_project.tmpl' % self.target.lower(), ctx, '.project') - self.gen_file('codered_%s_cproject.tmpl' % self.target.lower(), ctx, '.cproject') + self.gen_file('codered/%s_project.tmpl' % self.target.lower(), ctx, '.project') + self.gen_file('codered/%s_cproject.tmpl' % self.target.lower(), ctx, '.cproject') diff --git a/tools/export/codered_arch_pro_cproject.tmpl b/tools/export/codered/arch_pro_cproject.tmpl similarity index 100% rename from tools/export/codered_arch_pro_cproject.tmpl rename to tools/export/codered/arch_pro_cproject.tmpl diff --git a/tools/export/codered_arch_pro_project.tmpl b/tools/export/codered/arch_pro_project.tmpl similarity index 100% rename from tools/export/codered_arch_pro_project.tmpl rename to tools/export/codered/arch_pro_project.tmpl diff --git a/tools/export/codered_cproject_common.tmpl b/tools/export/codered/cproject_common.tmpl similarity index 100% rename from tools/export/codered_cproject_common.tmpl rename to tools/export/codered/cproject_common.tmpl diff --git a/tools/export/codered_cproject_cortexm0_common.tmpl b/tools/export/codered/cproject_cortexm0_common.tmpl similarity index 100% rename from tools/export/codered_cproject_cortexm0_common.tmpl rename to tools/export/codered/cproject_cortexm0_common.tmpl diff --git a/tools/export/codered_cproject_cortexm3_common.tmpl b/tools/export/codered/cproject_cortexm3_common.tmpl similarity index 100% rename from tools/export/codered_cproject_cortexm3_common.tmpl rename to tools/export/codered/cproject_cortexm3_common.tmpl diff --git a/tools/export/codered_lpc1114_cproject.tmpl b/tools/export/codered/lpc1114_cproject.tmpl similarity index 100% rename from tools/export/codered_lpc1114_cproject.tmpl rename to tools/export/codered/lpc1114_cproject.tmpl diff --git a/tools/export/codered_lpc1114_project.tmpl b/tools/export/codered/lpc1114_project.tmpl similarity index 100% rename from tools/export/codered_lpc1114_project.tmpl rename to tools/export/codered/lpc1114_project.tmpl diff --git a/tools/export/codered_lpc11u35_401_cproject.tmpl b/tools/export/codered/lpc11u35_401_cproject.tmpl similarity index 100% rename from tools/export/codered_lpc11u35_401_cproject.tmpl rename to tools/export/codered/lpc11u35_401_cproject.tmpl diff --git a/tools/export/codered_lpc11u35_401_project.tmpl b/tools/export/codered/lpc11u35_401_project.tmpl similarity index 100% rename from tools/export/codered_lpc11u35_401_project.tmpl rename to tools/export/codered/lpc11u35_401_project.tmpl diff --git a/tools/export/codered_lpc11u35_501_cproject.tmpl b/tools/export/codered/lpc11u35_501_cproject.tmpl similarity index 100% rename from tools/export/codered_lpc11u35_501_cproject.tmpl rename to tools/export/codered/lpc11u35_501_cproject.tmpl diff --git a/tools/export/codered_lpc11u35_501_project.tmpl b/tools/export/codered/lpc11u35_501_project.tmpl similarity index 100% rename from tools/export/codered_lpc11u35_501_project.tmpl rename to tools/export/codered/lpc11u35_501_project.tmpl diff --git a/tools/export/codered_lpc11u37h_401_cproject.tmpl b/tools/export/codered/lpc11u37h_401_cproject.tmpl similarity index 100% rename from tools/export/codered_lpc11u37h_401_cproject.tmpl rename to tools/export/codered/lpc11u37h_401_cproject.tmpl diff --git a/tools/export/codered_lpc11u37h_401_project.tmpl b/tools/export/codered/lpc11u37h_401_project.tmpl similarity index 100% rename from tools/export/codered_lpc11u37h_401_project.tmpl rename to tools/export/codered/lpc11u37h_401_project.tmpl diff --git a/tools/export/codered_lpc11u68_cproject.tmpl b/tools/export/codered/lpc11u68_cproject.tmpl similarity index 100% rename from tools/export/codered_lpc11u68_cproject.tmpl rename to tools/export/codered/lpc11u68_cproject.tmpl diff --git a/tools/export/codered_lpc11u68_project.tmpl b/tools/export/codered/lpc11u68_project.tmpl similarity index 100% rename from tools/export/codered_lpc11u68_project.tmpl rename to tools/export/codered/lpc11u68_project.tmpl diff --git a/tools/export/codered_lpc1549_cproject.tmpl b/tools/export/codered/lpc1549_cproject.tmpl similarity index 100% rename from tools/export/codered_lpc1549_cproject.tmpl rename to tools/export/codered/lpc1549_cproject.tmpl diff --git a/tools/export/codered_lpc1549_project.tmpl b/tools/export/codered/lpc1549_project.tmpl similarity index 100% rename from tools/export/codered_lpc1549_project.tmpl rename to tools/export/codered/lpc1549_project.tmpl diff --git a/tools/export/codered_lpc1768_cproject.tmpl b/tools/export/codered/lpc1768_cproject.tmpl similarity index 100% rename from tools/export/codered_lpc1768_cproject.tmpl rename to tools/export/codered/lpc1768_cproject.tmpl diff --git a/tools/export/codered_lpc1768_project.tmpl b/tools/export/codered/lpc1768_project.tmpl similarity index 100% rename from tools/export/codered_lpc1768_project.tmpl rename to tools/export/codered/lpc1768_project.tmpl diff --git a/tools/export/codered_lpc4088_cproject.tmpl b/tools/export/codered/lpc4088_cproject.tmpl similarity index 100% rename from tools/export/codered_lpc4088_cproject.tmpl rename to tools/export/codered/lpc4088_cproject.tmpl diff --git a/tools/export/codered_lpc4088_dm_cproject.tmpl b/tools/export/codered/lpc4088_dm_cproject.tmpl similarity index 100% rename from tools/export/codered_lpc4088_dm_cproject.tmpl rename to tools/export/codered/lpc4088_dm_cproject.tmpl diff --git a/tools/export/codered_lpc4088_dm_project.tmpl b/tools/export/codered/lpc4088_dm_project.tmpl similarity index 100% rename from tools/export/codered_lpc4088_dm_project.tmpl rename to tools/export/codered/lpc4088_dm_project.tmpl diff --git a/tools/export/codered_lpc4088_project.tmpl b/tools/export/codered/lpc4088_project.tmpl similarity index 100% rename from tools/export/codered_lpc4088_project.tmpl rename to tools/export/codered/lpc4088_project.tmpl diff --git a/tools/export/codered_lpc4330_m4_cproject.tmpl b/tools/export/codered/lpc4330_m4_cproject.tmpl similarity index 100% rename from tools/export/codered_lpc4330_m4_cproject.tmpl rename to tools/export/codered/lpc4330_m4_cproject.tmpl diff --git a/tools/export/codered_lpc4330_m4_project.tmpl b/tools/export/codered/lpc4330_m4_project.tmpl similarity index 100% rename from tools/export/codered_lpc4330_m4_project.tmpl rename to tools/export/codered/lpc4330_m4_project.tmpl diff --git a/tools/export/codered_lpc824_cproject.tmpl b/tools/export/codered/lpc824_cproject.tmpl similarity index 100% rename from tools/export/codered_lpc824_cproject.tmpl rename to tools/export/codered/lpc824_cproject.tmpl diff --git a/tools/export/codered_lpc824_project.tmpl b/tools/export/codered/lpc824_project.tmpl similarity index 100% rename from tools/export/codered_lpc824_project.tmpl rename to tools/export/codered/lpc824_project.tmpl diff --git a/tools/export/codered_lpccappuccino_cproject.tmpl b/tools/export/codered/lpccappuccino_cproject.tmpl similarity index 100% rename from tools/export/codered_lpccappuccino_cproject.tmpl rename to tools/export/codered/lpccappuccino_cproject.tmpl diff --git a/tools/export/codered_lpccappuccino_project.tmpl b/tools/export/codered/lpccappuccino_project.tmpl similarity index 100% rename from tools/export/codered_lpccappuccino_project.tmpl rename to tools/export/codered/lpccappuccino_project.tmpl diff --git a/tools/export/codered_project_common.tmpl b/tools/export/codered/project_common.tmpl similarity index 100% rename from tools/export/codered_project_common.tmpl rename to tools/export/codered/project_common.tmpl diff --git a/tools/export/codered_ublox_c027_cproject.tmpl b/tools/export/codered/ublox_c027_cproject.tmpl similarity index 100% rename from tools/export/codered_ublox_c027_cproject.tmpl rename to tools/export/codered/ublox_c027_cproject.tmpl diff --git a/tools/export/codered_ublox_c027_project.tmpl b/tools/export/codered/ublox_c027_project.tmpl similarity index 100% rename from tools/export/codered_ublox_c027_project.tmpl rename to tools/export/codered/ublox_c027_project.tmpl diff --git a/tools/export/coide.py b/tools/export/coide/__init__.py similarity index 96% rename from tools/export/coide.py rename to tools/export/coide/__init__.py index cde592c0832..5c570921c5e 100644 --- a/tools/export/coide.py +++ b/tools/export/coide/__init__.py @@ -14,9 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. """ -from exporters import Exporter from os.path import splitext, basename +from tools.export.exporters import Exporter + class CoIDE(Exporter): NAME = 'CoIDE' @@ -112,4 +113,4 @@ def generate(self): target = self.target.lower() # Project file - self.gen_file('coide_%s.coproj.tmpl' % target, ctx, '%s.coproj' % self.project_name) + self.gen_file('coide/%s.coproj.tmpl' % target, ctx, '%s.coproj' % self.project_name) diff --git a/tools/export/coide_arch_max.coproj.tmpl b/tools/export/coide/arch_max.coproj.tmpl similarity index 100% rename from tools/export/coide_arch_max.coproj.tmpl rename to tools/export/coide/arch_max.coproj.tmpl diff --git a/tools/export/coide_arch_pro.coproj.tmpl b/tools/export/coide/arch_pro.coproj.tmpl similarity index 100% rename from tools/export/coide_arch_pro.coproj.tmpl rename to tools/export/coide/arch_pro.coproj.tmpl diff --git a/tools/export/coide_disco_f051r8.coproj.tmpl b/tools/export/coide/disco_f051r8.coproj.tmpl similarity index 100% rename from tools/export/coide_disco_f051r8.coproj.tmpl rename to tools/export/coide/disco_f051r8.coproj.tmpl diff --git a/tools/export/coide_disco_f100rb.coproj.tmpl b/tools/export/coide/disco_f100rb.coproj.tmpl similarity index 100% rename from tools/export/coide_disco_f100rb.coproj.tmpl rename to tools/export/coide/disco_f100rb.coproj.tmpl diff --git a/tools/export/coide_disco_f303vc.coproj.tmpl b/tools/export/coide/disco_f303vc.coproj.tmpl similarity index 100% rename from tools/export/coide_disco_f303vc.coproj.tmpl rename to tools/export/coide/disco_f303vc.coproj.tmpl diff --git a/tools/export/coide_disco_f334c8.coproj.tmpl b/tools/export/coide/disco_f334c8.coproj.tmpl similarity index 100% rename from tools/export/coide_disco_f334c8.coproj.tmpl rename to tools/export/coide/disco_f334c8.coproj.tmpl diff --git a/tools/export/coide_disco_f401vc.coproj.tmpl b/tools/export/coide/disco_f401vc.coproj.tmpl similarity index 100% rename from tools/export/coide_disco_f401vc.coproj.tmpl rename to tools/export/coide/disco_f401vc.coproj.tmpl diff --git a/tools/export/coide_disco_f407vg.coproj.tmpl b/tools/export/coide/disco_f407vg.coproj.tmpl similarity index 100% rename from tools/export/coide_disco_f407vg.coproj.tmpl rename to tools/export/coide/disco_f407vg.coproj.tmpl diff --git a/tools/export/coide_disco_f429zi.coproj.tmpl b/tools/export/coide/disco_f429zi.coproj.tmpl similarity index 100% rename from tools/export/coide_disco_f429zi.coproj.tmpl rename to tools/export/coide/disco_f429zi.coproj.tmpl diff --git a/tools/export/coide_disco_l053c8.coproj.tmpl b/tools/export/coide/disco_l053c8.coproj.tmpl similarity index 100% rename from tools/export/coide_disco_l053c8.coproj.tmpl rename to tools/export/coide/disco_l053c8.coproj.tmpl diff --git a/tools/export/coide_kl05z.coproj.tmpl b/tools/export/coide/kl05z.coproj.tmpl similarity index 100% rename from tools/export/coide_kl05z.coproj.tmpl rename to tools/export/coide/kl05z.coproj.tmpl diff --git a/tools/export/coide_kl25z.coproj.tmpl b/tools/export/coide/kl25z.coproj.tmpl similarity index 100% rename from tools/export/coide_kl25z.coproj.tmpl rename to tools/export/coide/kl25z.coproj.tmpl diff --git a/tools/export/coide_lpc1768.coproj.tmpl b/tools/export/coide/lpc1768.coproj.tmpl similarity index 100% rename from tools/export/coide_lpc1768.coproj.tmpl rename to tools/export/coide/lpc1768.coproj.tmpl diff --git a/tools/export/coide_mote_l152rc.coproj.tmpl b/tools/export/coide/mote_l152rc.coproj.tmpl similarity index 100% rename from tools/export/coide_mote_l152rc.coproj.tmpl rename to tools/export/coide/mote_l152rc.coproj.tmpl diff --git a/tools/export/coide_mts_mdot_f405rg.coproj.tmpl b/tools/export/coide/mts_mdot_f405rg.coproj.tmpl similarity index 100% rename from tools/export/coide_mts_mdot_f405rg.coproj.tmpl rename to tools/export/coide/mts_mdot_f405rg.coproj.tmpl diff --git a/tools/export/coide_mts_mdot_f411re.coproj.tmpl b/tools/export/coide/mts_mdot_f411re.coproj.tmpl similarity index 100% rename from tools/export/coide_mts_mdot_f411re.coproj.tmpl rename to tools/export/coide/mts_mdot_f411re.coproj.tmpl diff --git a/tools/export/coide_nucleo_f030r8.coproj.tmpl b/tools/export/coide/nucleo_f030r8.coproj.tmpl similarity index 100% rename from tools/export/coide_nucleo_f030r8.coproj.tmpl rename to tools/export/coide/nucleo_f030r8.coproj.tmpl diff --git a/tools/export/coide_nucleo_f042k6.coproj.tmpl b/tools/export/coide/nucleo_f042k6.coproj.tmpl similarity index 100% rename from tools/export/coide_nucleo_f042k6.coproj.tmpl rename to tools/export/coide/nucleo_f042k6.coproj.tmpl diff --git a/tools/export/coide_nucleo_f070rb.coproj.tmpl b/tools/export/coide/nucleo_f070rb.coproj.tmpl similarity index 100% rename from tools/export/coide_nucleo_f070rb.coproj.tmpl rename to tools/export/coide/nucleo_f070rb.coproj.tmpl diff --git a/tools/export/coide_nucleo_f072rb.coproj.tmpl b/tools/export/coide/nucleo_f072rb.coproj.tmpl similarity index 100% rename from tools/export/coide_nucleo_f072rb.coproj.tmpl rename to tools/export/coide/nucleo_f072rb.coproj.tmpl diff --git a/tools/export/coide_nucleo_f091rc.coproj.tmpl b/tools/export/coide/nucleo_f091rc.coproj.tmpl similarity index 100% rename from tools/export/coide_nucleo_f091rc.coproj.tmpl rename to tools/export/coide/nucleo_f091rc.coproj.tmpl diff --git a/tools/export/coide_nucleo_f103rb.coproj.tmpl b/tools/export/coide/nucleo_f103rb.coproj.tmpl similarity index 100% rename from tools/export/coide_nucleo_f103rb.coproj.tmpl rename to tools/export/coide/nucleo_f103rb.coproj.tmpl diff --git a/tools/export/coide_nucleo_f302r8.coproj.tmpl b/tools/export/coide/nucleo_f302r8.coproj.tmpl similarity index 100% rename from tools/export/coide_nucleo_f302r8.coproj.tmpl rename to tools/export/coide/nucleo_f302r8.coproj.tmpl diff --git a/tools/export/coide_nucleo_f303re.coproj.tmpl b/tools/export/coide/nucleo_f303re.coproj.tmpl similarity index 100% rename from tools/export/coide_nucleo_f303re.coproj.tmpl rename to tools/export/coide/nucleo_f303re.coproj.tmpl diff --git a/tools/export/coide_nucleo_f334r8.coproj.tmpl b/tools/export/coide/nucleo_f334r8.coproj.tmpl similarity index 100% rename from tools/export/coide_nucleo_f334r8.coproj.tmpl rename to tools/export/coide/nucleo_f334r8.coproj.tmpl diff --git a/tools/export/coide_nucleo_f401re.coproj.tmpl b/tools/export/coide/nucleo_f401re.coproj.tmpl similarity index 100% rename from tools/export/coide_nucleo_f401re.coproj.tmpl rename to tools/export/coide/nucleo_f401re.coproj.tmpl diff --git a/tools/export/coide_nucleo_f410rb.coproj.tmpl b/tools/export/coide/nucleo_f410rb.coproj.tmpl similarity index 100% rename from tools/export/coide_nucleo_f410rb.coproj.tmpl rename to tools/export/coide/nucleo_f410rb.coproj.tmpl diff --git a/tools/export/coide_nucleo_f411re.coproj.tmpl b/tools/export/coide/nucleo_f411re.coproj.tmpl similarity index 100% rename from tools/export/coide_nucleo_f411re.coproj.tmpl rename to tools/export/coide/nucleo_f411re.coproj.tmpl diff --git a/tools/export/coide_nucleo_f446re.coproj.tmpl b/tools/export/coide/nucleo_f446re.coproj.tmpl similarity index 100% rename from tools/export/coide_nucleo_f446re.coproj.tmpl rename to tools/export/coide/nucleo_f446re.coproj.tmpl diff --git a/tools/export/coide_nucleo_l053r8.coproj.tmpl b/tools/export/coide/nucleo_l053r8.coproj.tmpl similarity index 100% rename from tools/export/coide_nucleo_l053r8.coproj.tmpl rename to tools/export/coide/nucleo_l053r8.coproj.tmpl diff --git a/tools/export/coide_nucleo_l152re.coproj.tmpl b/tools/export/coide/nucleo_l152re.coproj.tmpl similarity index 100% rename from tools/export/coide_nucleo_l152re.coproj.tmpl rename to tools/export/coide/nucleo_l152re.coproj.tmpl diff --git a/tools/export/coide_nz32_sc151.coproj.tmpl b/tools/export/coide/nz32_sc151.coproj.tmpl similarity index 100% rename from tools/export/coide_nz32_sc151.coproj.tmpl rename to tools/export/coide/nz32_sc151.coproj.tmpl diff --git a/tools/export/coide_ublox_c027.coproj.tmpl b/tools/export/coide/ublox_c027.coproj.tmpl similarity index 100% rename from tools/export/coide_ublox_c027.coproj.tmpl rename to tools/export/coide/ublox_c027.coproj.tmpl diff --git a/tools/export/ds5_5.py b/tools/export/ds5_5/__init__.py similarity index 88% rename from tools/export/ds5_5.py rename to tools/export/ds5_5/__init__.py index 9be2535867a..00acacf554d 100644 --- a/tools/export/ds5_5.py +++ b/tools/export/ds5_5/__init__.py @@ -14,9 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. """ -from exporters import Exporter from os.path import basename +from tools.export.exporters import Exporter + class DS5_5(Exporter): NAME = 'DS5' @@ -64,6 +65,6 @@ def generate(self): target = self.target.lower() # Project file - self.gen_file('ds5_5_%s.project.tmpl' % target, ctx, '.project') - self.gen_file('ds5_5_%s.cproject.tmpl' % target, ctx, '.cproject') - self.gen_file('ds5_5_%s.launch.tmpl' % target, ctx, 'ds5_%s.launch' % target) + self.gen_file('ds5_5/%s.project.tmpl' % target, ctx, '.project') + self.gen_file('ds5_5/%s.cproject.tmpl' % target, ctx, '.cproject') + self.gen_file('ds5_5/%s.launch.tmpl' % target, ctx, 'ds5_%s.launch' % target) diff --git a/tools/export/ds5_5_arch_pro.cproject.tmpl b/tools/export/ds5_5/arch_pro.cproject.tmpl similarity index 100% rename from tools/export/ds5_5_arch_pro.cproject.tmpl rename to tools/export/ds5_5/arch_pro.cproject.tmpl diff --git a/tools/export/ds5_5_arch_pro.launch.tmpl b/tools/export/ds5_5/arch_pro.launch.tmpl similarity index 100% rename from tools/export/ds5_5_arch_pro.launch.tmpl rename to tools/export/ds5_5/arch_pro.launch.tmpl diff --git a/tools/export/ds5_5_arch_pro.project.tmpl b/tools/export/ds5_5/arch_pro.project.tmpl similarity index 100% rename from tools/export/ds5_5_arch_pro.project.tmpl rename to tools/export/ds5_5/arch_pro.project.tmpl diff --git a/tools/export/ds5_5_lpc11u24.cproject.tmpl b/tools/export/ds5_5/lpc11u24.cproject.tmpl similarity index 100% rename from tools/export/ds5_5_lpc11u24.cproject.tmpl rename to tools/export/ds5_5/lpc11u24.cproject.tmpl diff --git a/tools/export/ds5_5_lpc11u24.launch.tmpl b/tools/export/ds5_5/lpc11u24.launch.tmpl similarity index 100% rename from tools/export/ds5_5_lpc11u24.launch.tmpl rename to tools/export/ds5_5/lpc11u24.launch.tmpl diff --git a/tools/export/ds5_5_lpc11u24.project.tmpl b/tools/export/ds5_5/lpc11u24.project.tmpl similarity index 100% rename from tools/export/ds5_5_lpc11u24.project.tmpl rename to tools/export/ds5_5/lpc11u24.project.tmpl diff --git a/tools/export/ds5_5_lpc1768.cproject.tmpl b/tools/export/ds5_5/lpc1768.cproject.tmpl similarity index 100% rename from tools/export/ds5_5_lpc1768.cproject.tmpl rename to tools/export/ds5_5/lpc1768.cproject.tmpl diff --git a/tools/export/ds5_5_lpc1768.launch.tmpl b/tools/export/ds5_5/lpc1768.launch.tmpl similarity index 100% rename from tools/export/ds5_5_lpc1768.launch.tmpl rename to tools/export/ds5_5/lpc1768.launch.tmpl diff --git a/tools/export/ds5_5_lpc1768.project.tmpl b/tools/export/ds5_5/lpc1768.project.tmpl similarity index 100% rename from tools/export/ds5_5_lpc1768.project.tmpl rename to tools/export/ds5_5/lpc1768.project.tmpl diff --git a/tools/export/ds5_5_lpc812.cproject.tmpl b/tools/export/ds5_5/lpc812.cproject.tmpl similarity index 100% rename from tools/export/ds5_5_lpc812.cproject.tmpl rename to tools/export/ds5_5/lpc812.cproject.tmpl diff --git a/tools/export/ds5_5_lpc812.launch.tmpl b/tools/export/ds5_5/lpc812.launch.tmpl similarity index 100% rename from tools/export/ds5_5_lpc812.launch.tmpl rename to tools/export/ds5_5/lpc812.launch.tmpl diff --git a/tools/export/ds5_5_lpc812.project.tmpl b/tools/export/ds5_5/lpc812.project.tmpl similarity index 100% rename from tools/export/ds5_5_lpc812.project.tmpl rename to tools/export/ds5_5/lpc812.project.tmpl diff --git a/tools/export/ds5_5_rz_a1h.cproject.tmpl b/tools/export/ds5_5/rz_a1h.cproject.tmpl similarity index 100% rename from tools/export/ds5_5_rz_a1h.cproject.tmpl rename to tools/export/ds5_5/rz_a1h.cproject.tmpl diff --git a/tools/export/ds5_5_rz_a1h.launch.tmpl b/tools/export/ds5_5/rz_a1h.launch.tmpl similarity index 100% rename from tools/export/ds5_5_rz_a1h.launch.tmpl rename to tools/export/ds5_5/rz_a1h.launch.tmpl diff --git a/tools/export/ds5_5_rz_a1h.project.tmpl b/tools/export/ds5_5/rz_a1h.project.tmpl similarity index 100% rename from tools/export/ds5_5_rz_a1h.project.tmpl rename to tools/export/ds5_5/rz_a1h.project.tmpl diff --git a/tools/export/ds5_5_ublox_c027.cproject.tmpl b/tools/export/ds5_5/ublox_c027.cproject.tmpl similarity index 100% rename from tools/export/ds5_5_ublox_c027.cproject.tmpl rename to tools/export/ds5_5/ublox_c027.cproject.tmpl diff --git a/tools/export/ds5_5_ublox_c027.launch.tmpl b/tools/export/ds5_5/ublox_c027.launch.tmpl similarity index 100% rename from tools/export/ds5_5_ublox_c027.launch.tmpl rename to tools/export/ds5_5/ublox_c027.launch.tmpl diff --git a/tools/export/ds5_5_ublox_c027.project.tmpl b/tools/export/ds5_5/ublox_c027.project.tmpl similarity index 100% rename from tools/export/ds5_5_ublox_c027.project.tmpl rename to tools/export/ds5_5/ublox_c027.project.tmpl diff --git a/tools/export/e2studio.py b/tools/export/e2studio/__init__.py similarity index 81% rename from tools/export/e2studio.py rename to tools/export/e2studio/__init__.py index 205287089ad..a80d53553b7 100644 --- a/tools/export/e2studio.py +++ b/tools/export/e2studio/__init__.py @@ -14,9 +14,9 @@ See the License for the specific language governing permissions and limitations under the License. """ -from exporters import Exporter from os.path import splitext, basename +from tools.export.exporters import Exporter class E2Studio(Exporter): NAME = 'e2 studio' @@ -41,7 +41,7 @@ def generate(self): 'libraries': libraries, 'symbols': self.toolchain.get_symbols() } - self.gen_file('e2studio_%s_project.tmpl' % self.target.lower(), ctx, '.project') - self.gen_file('e2studio_%s_cproject.tmpl' % self.target.lower(), ctx, '.cproject') - self.gen_file('e2studio_%s_gdbinit.tmpl' % self.target.lower(), ctx, '.gdbinit') - self.gen_file('e2studio_launch.tmpl', ctx, '%s OpenOCD.launch' % self.project_name) + self.gen_file('e2studio/%s_project.tmpl' % self.target.lower(), ctx, '.project') + self.gen_file('e2studio/%s_cproject.tmpl' % self.target.lower(), ctx, '.cproject') + self.gen_file('e2studio/%s_gdbinit.tmpl' % self.target.lower(), ctx, '.gdbinit') + self.gen_file('e2studio/launch.tmpl', ctx, '%s OpenOCD.launch' % self.project_name) diff --git a/tools/export/e2studio_launch.tmpl b/tools/export/e2studio/launch.tmpl similarity index 100% rename from tools/export/e2studio_launch.tmpl rename to tools/export/e2studio/launch.tmpl diff --git a/tools/export/e2studio_rz_a1h_cproject.tmpl b/tools/export/e2studio/rz_a1h_cproject.tmpl similarity index 100% rename from tools/export/e2studio_rz_a1h_cproject.tmpl rename to tools/export/e2studio/rz_a1h_cproject.tmpl diff --git a/tools/export/e2studio_rz_a1h_gdbinit.tmpl b/tools/export/e2studio/rz_a1h_gdbinit.tmpl similarity index 100% rename from tools/export/e2studio_rz_a1h_gdbinit.tmpl rename to tools/export/e2studio/rz_a1h_gdbinit.tmpl diff --git a/tools/export/e2studio_rz_a1h_project.tmpl b/tools/export/e2studio/rz_a1h_project.tmpl similarity index 100% rename from tools/export/e2studio_rz_a1h_project.tmpl rename to tools/export/e2studio/rz_a1h_project.tmpl diff --git a/tools/export/kds.py b/tools/export/kds/__init__.py similarity index 84% rename from tools/export/kds.py rename to tools/export/kds/__init__.py index b77a507f176..c663c9c875c 100644 --- a/tools/export/kds.py +++ b/tools/export/kds/__init__.py @@ -14,9 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. """ -from exporters import Exporter from os.path import splitext, basename +from tools.export.exporters import Exporter + class KDS(Exporter): NAME = 'Kinetis Design Studio' @@ -42,6 +43,6 @@ def generate(self): 'libraries': libraries, 'symbols': self.toolchain.get_symbols() } - self.gen_file('kds_%s_project.tmpl' % self.target.lower(), ctx, '.project') - self.gen_file('kds_%s_cproject.tmpl' % self.target.lower(), ctx, '.cproject') - self.gen_file('kds_launch.tmpl', ctx, '%s.launch' % self.project_name) + self.gen_file('kds/%s_project.tmpl' % self.target.lower(), ctx, '.project') + self.gen_file('kds/%s_cproject.tmpl' % self.target.lower(), ctx, '.cproject') + self.gen_file('kds/launch.tmpl', ctx, '%s.launch' % self.project_name) diff --git a/tools/export/kds_hexiwear_cproject.tmpl b/tools/export/kds/hexiwear_cproject.tmpl similarity index 100% rename from tools/export/kds_hexiwear_cproject.tmpl rename to tools/export/kds/hexiwear_cproject.tmpl diff --git a/tools/export/kds_hexiwear_project.tmpl b/tools/export/kds/hexiwear_project.tmpl similarity index 100% rename from tools/export/kds_hexiwear_project.tmpl rename to tools/export/kds/hexiwear_project.tmpl diff --git a/tools/export/kds_k22f_cproject.tmpl b/tools/export/kds/k22f_cproject.tmpl similarity index 100% rename from tools/export/kds_k22f_cproject.tmpl rename to tools/export/kds/k22f_cproject.tmpl diff --git a/tools/export/kds_k22f_project.tmpl b/tools/export/kds/k22f_project.tmpl similarity index 100% rename from tools/export/kds_k22f_project.tmpl rename to tools/export/kds/k22f_project.tmpl diff --git a/tools/export/kds_k64f_cproject.tmpl b/tools/export/kds/k64f_cproject.tmpl similarity index 100% rename from tools/export/kds_k64f_cproject.tmpl rename to tools/export/kds/k64f_cproject.tmpl diff --git a/tools/export/kds_k64f_project.tmpl b/tools/export/kds/k64f_project.tmpl similarity index 100% rename from tools/export/kds_k64f_project.tmpl rename to tools/export/kds/k64f_project.tmpl diff --git a/tools/export/kds_launch.tmpl b/tools/export/kds/launch.tmpl similarity index 100% rename from tools/export/kds_launch.tmpl rename to tools/export/kds/launch.tmpl diff --git a/tools/export/simplicityv3.py b/tools/export/simplicity/__init__.py similarity index 97% rename from tools/export/simplicityv3.py rename to tools/export/simplicity/__init__.py index 624da00184c..74ec93a666f 100644 --- a/tools/export/simplicityv3.py +++ b/tools/export/simplicity/__init__.py @@ -14,9 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. """ -from exporters import Exporter from os.path import split,splitext, basename +from tools.export.exporters import Exporter + class Folder: def __init__(self, name): self.name = name @@ -191,4 +192,4 @@ def generate(self): print("\t" + bpath.name + "\n") ''' - self.gen_file('simplicityv3_slsproj.tmpl', ctx, '%s.slsproj' % self.project_name) + self.gen_file('simplicity/slsproj.tmpl', ctx, '%s.slsproj' % self.project_name) diff --git a/tools/export/simplicityv3_slsproj.tmpl b/tools/export/simplicity/slsproj.tmpl similarity index 100% rename from tools/export/simplicityv3_slsproj.tmpl rename to tools/export/simplicity/slsproj.tmpl diff --git a/tools/export/sw4stm32.py b/tools/export/sw4stm32/__init__.py similarity index 96% rename from tools/export/sw4stm32.py rename to tools/export/sw4stm32/__init__.py index c23979a29d6..9b046c72aed 100644 --- a/tools/export/sw4stm32.py +++ b/tools/export/sw4stm32/__init__.py @@ -14,10 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. """ -from exporters import Exporter from os.path import splitext, basename, join from random import randint from tools.utils import mkdir +from tools.export.exporters import Exporter class Sw4STM32(Exporter): @@ -114,6 +114,6 @@ def generate(self): } self.__gen_dir('.settings') - self.gen_file('sw4stm32_language_settings_commom.tmpl', ctx, '.settings/language.settings.xml') - self.gen_file('sw4stm32_project_common.tmpl', ctx, '.project') - self.gen_file('sw4stm32_cproject_common.tmpl', ctx, '.cproject') + self.gen_file('sw4stm32/language_settings_commom.tmpl', ctx, '.settings/language.settings.xml') + self.gen_file('sw4stm32/project_common.tmpl', ctx, '.project') + self.gen_file('sw4stm32/cproject_common.tmpl', ctx, '.cproject') diff --git a/tools/export/sw4stm32_cproject_common.tmpl b/tools/export/sw4stm32/cproject_common.tmpl similarity index 100% rename from tools/export/sw4stm32_cproject_common.tmpl rename to tools/export/sw4stm32/cproject_common.tmpl diff --git a/tools/export/sw4stm32_language_settings_commom.tmpl b/tools/export/sw4stm32/language_settings_commom.tmpl similarity index 100% rename from tools/export/sw4stm32_language_settings_commom.tmpl rename to tools/export/sw4stm32/language_settings_commom.tmpl diff --git a/tools/export/sw4stm32_project_common.tmpl b/tools/export/sw4stm32/project_common.tmpl similarity index 100% rename from tools/export/sw4stm32_project_common.tmpl rename to tools/export/sw4stm32/project_common.tmpl diff --git a/tools/export/zip.py b/tools/export/zip/__init__.py similarity index 95% rename from tools/export/zip.py rename to tools/export/zip/__init__.py index 3961eb0622c..f2d9a19c0a4 100644 --- a/tools/export/zip.py +++ b/tools/export/zip/__init__.py @@ -14,9 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. """ -from exporters import Exporter from os.path import basename +from tools.export.exporters import Exporter + class ZIP(Exporter): NAME = 'ZIP'