Merge pull request #4828 from alzix/enhancement/exporter/cdt

Enhancement - exporter/cdt

Author: theotherjimmy

tools/export/cdt/__init__.py

@@ -1,6 +1,6 @@
 import re
 
-from os.path import join, exists, realpath, relpath, basename
+from os.path import join, exists
 from os import makedirs
 
 from tools.export.makefile import Makefile, GccArm, Armc5, IAR
@@ -30,7 +30,9 @@ def generate(self):
 
 
         self.gen_file('cdt/pyocd_settings.tmpl', ctx,
-                      join('eclipse-extras',self.target+'_pyocd_settings.launch'))
+                      join('eclipse-extras',
+                           '{target}_pyocd_{project}_settings.launch'.format(target=self.target,
+                                                                             project=self.project_name)))
         self.gen_file('cdt/necessary_software.tmpl', ctx,
                       join('eclipse-extras','necessary_software.p2f'))
 

tools/export/cdt/pyocd_settings.tmpl

@@ -49,7 +49,7 @@
 <booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useProjBinaryForImage" value="true"/>
 <booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useProjBinaryForSymbols" value="true"/>
 <booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useRemoteTarget" value="true"/>
-<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="arm-none-eabi-gdb.exe"/>
+<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="arm-none-eabi-gdb"/>
 <booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
 <intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
 <stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>