Merge pull request #3601 from theotherjimmy/clean-export-dir

Clean export dir

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 @@ EXPORTERS = {
     'embitz' : embitz.EmBitz,
     'coide' : coide.CoIDE,
     'kds' : kds.KDS,
-    'simplicityv3' : simplicityv3.SimplicityV3,
+    'simplicityv3' : simplicity.SimplicityV3,
     'atmelstudio' : atmelstudio.AtmelStudio,
     'sw4stm32'    : sw4stm32.Sw4STM32,
     'e2studio' : e2studio.E2Studio,

tools/export/atmelstudio/__init__.py

@@ -15,9 +15,10 @@ See the License for the specific language governing permissions and
 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 @@ class AtmelStudio(Exporter):
         }
         ctx.update(self.flags)
         target = self.target.lower()
-        self.gen_file('atmelstudio6_2.atsln.tmpl', ctx, '%s.atsln' % self.project_name)
+        self.gen_file('atmelstudio/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/cppproj.tmpl', ctx, '%s.cppproj' % self.project_name)

tools/export/codered/__init__.py

@@ -14,9 +14,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 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 @@ class CodeRed(Exporter):
             '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_project.tmpl' % self.target.lower(), ctx, '.project')
-        self.gen_file('codered_%s_cproject.tmpl' % self.target.lower(), ctx, '.cproject')
+        self.gen_file('codered/%s_cproject.tmpl' % self.target.lower(), ctx, '.cproject')

tools/export/coide/__init__.py

@@ -14,9 +14,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 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 @@ class CoIDE(Exporter):
         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)

tools/export/ds5_5/__init__.py

@@ -14,9 +14,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 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 @@ class DS5_5(Exporter):
         target = self.target.lower()
 
         # Project file
-        self.gen_file('ds5_5_%s.project.tmpl' % target, ctx, '.project')
+        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.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.launch.tmpl' % target, ctx, 'ds5_%s.launch' % target)

tools/export/e2studio/__init__.py

@@ -14,9 +14,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 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 @@ class E2Studio(Exporter):
             'libraries': libraries,
             'symbols': self.toolchain.get_symbols()
         }
-        self.gen_file('e2studio_%s_project.tmpl' % self.target.lower(), ctx, '.project')
+        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_cproject.tmpl' % self.target.lower(), ctx, '.cproject')
-        self.gen_file('e2studio_%s_gdbinit.tmpl' % self.target.lower(), ctx, '.gdbinit')
+        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/launch.tmpl', ctx, '%s OpenOCD.launch' % self.project_name)

tools/export/kds/__init__.py

@@ -14,9 +14,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 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 @@ class KDS(Exporter):
             'libraries': libraries,
             'symbols': self.toolchain.get_symbols()
         }
-        self.gen_file('kds_%s_project.tmpl' % self.target.lower(), ctx, '.project')
+        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/%s_cproject.tmpl' % self.target.lower(), ctx, '.cproject')
-        self.gen_file('kds_launch.tmpl', ctx, '%s.launch' % self.project_name)
+        self.gen_file('kds/launch.tmpl', ctx, '%s.launch' % self.project_name)