libraries addition, link command correction

Author: 0xc0170

workspace_tools/export/coide.py

@@ -20,17 +20,22 @@
 
 class CoIDE(Exporter):
     NAME = 'CoIDE'
+    FILE_TYPES = {
+        'c_sources':'1',
+        'cpp_sources':'8',
+        's_sources':'2'
+    }
     TARGETS = ['KL25Z']
     TOOLCHAIN = 'GCC_ARM'
 
     def generate(self):
-        to_be_compiled = []
-        for r_type in ['s_sources', 'c_sources', 'cpp_sources']:
-            r = getattr(self.resources, r_type)
-            if r:
-                for source in r:
-                    base, ext = splitext(source)
-                    to_be_compiled.append(base + '.o')
+        self.resources.win_to_unix()
+        source_files = []
+        for r_type, n in CoIDE.FILE_TYPES.iteritems():
+            for file in getattr(self.resources, r_type):
+                source_files.append({
+                    'name': basename(file), 'path': file
+                })
 
         libraries = []
         for lib in self.resources.libraries:
@@ -39,14 +44,14 @@ def generate(self):
 
         ctx = {
             'name': self.program_name,
-            'to_be_compiled': to_be_compiled,
+            'source_files': source_files,
             'include_paths': self.resources.inc_dirs,
-            'library_paths': self.resources.lib_dirs,
             'scatter_file': self.resources.linker_script,
             'object_files': self.resources.objects,
+            'libraries': libraries,
             'symbols': self.toolchain.get_symbols()
         }
         target = self.target.lower()
 
         # Project file
-        self.gen_file('coide_%s.coproj.tmpl' % target, ctx, '.coproj')
+        self.gen_file('coide_%s.coproj.tmpl' % target, ctx, '%s.coproj' % self.program_name)

workspace_tools/export/coide_kl25z.coproj.tmpl

@@ -4,17 +4,14 @@
     <Device manufacturerId="4" manufacturerName="Freescale" chipId="86" chipName="MKL25Z128VLK4" boardId="" boardName=""/>
     <BuildOption>
       <Compile>
-        <Option name="OptimizationLevel" value="0"/>
+        <Option name="OptimizationLevel" value="4"/>
         <Option name="UseFPU" value="0"/>
-        <Option name="UserEditCompiler" value="-Wl, --specs=nano.specs -fno-common; -fmessage-length=0; -Wall; -fno-exceptions; -ffunction-sections; -fdata-sections; {% for s in symbols %}-D{{s}}; {% endfor %} -std=gnu++98"/>
+        <Option name="UserEditCompiler" value="-fno-common; -fmessage-length=0; -Wall; -fno-strict-aliasing; -fno-rtti; -fno-exceptions; -ffunction-sections; -fdata-sections; -std=gnu++98"/>
         <Includepaths>
-          <Includepath path="."/>
-          <Includepath path="mbed"/>
-          <Includepath path="mbed/target_kl25z"/>
-          <Includepath path="mbed/target_kl25z/toolchain_gcc_arm"/>
+          {% for path in include_paths %} <Includepath path="{{path}}"/> {% endfor %}
         </Includepaths>
         <DefinedSymbols>
-          <Define name="MKL25Z128VLK4"/>
+          {% for s in symbols %} <Define name="{{s}}"/> {% endfor %}
         </DefinedSymbols>
       </Compile>
       <Link useDefault="0">
@@ -25,15 +22,16 @@
         <Option name="IsNewStartupCode" value="1"/>
         <Option name="Library" value="Not use C Library"/>
         <Option name="nostartfiles" value="0"/>
-        <Option name="UserEditLinker" value="C:/CooCox/CoIDE/workspace/{{name}}/mbed/target_kl25z/toolchain_gcc_arm/cmsis_nvic.o; C:/CooCox/CoIDE/workspace/{{name}}/mbed/target_kl25z/toolchain_gcc_arm/retarget.o; C:/CooCox/CoIDE/workspace/{{name}}/mbed/target_kl25z/toolchain_gcc_arm/startup_MKL25Z4.o; C:/CooCox/CoIDE/workspace/{{name}}/mbed/target_kl25z/toolchain_gcc_arm/system_MKL25Z4.o; -lmbed; -lstdc++; -lsupc++; -lm; -lc; -lgcc; -lnosys; -lmbed; -lstdc++; -lsupc++; -lm; -lc; -lgcc; -lnosys; "/>
+        <Option name="UserEditLinker" value="--specs=nano.specs; -u _printf_float; -u _scanf_float; {% for file in object_files %}
+        ${project.path}/{{file}}; {% endfor %} {% for lib in libraries %} -l{{lib}}; {% endfor %} -lstdc++; -lsupc++; -lm; -lc; -lgcc; -lnosys;"/>
         <LinkedLibraries/>
         <MemoryAreas debugInFlashNotRAM="1">
           <Memory name="IROM1" type="ReadOnly" size="0x00020000" startValue="0x00000000"/>
           <Memory name="IRAM1" type="ReadWrite" size="0x00001000" startValue="0x1FFFF000"/>
           <Memory name="IROM2" type="ReadOnly" size="" startValue=""/>
           <Memory name="IRAM2" type="ReadWrite" size="" startValue=""/>
         </MemoryAreas>
-        <LocateLinkFile path="mbed/target_kl25z/toolchain_gcc_arm/mkl25z4.ld" type="0"/>
+        <LocateLinkFile path="{{scatter_file}}" type="0"/>
       </Link>
       <Output>
         <Option name="OutputFileType" value="0"/>
@@ -70,6 +68,8 @@
   </Target>
   <Components path="./"/>
   <Files>
-    <File name="main.cpp" path="main.cpp" type="1"/>
+    {% for file in source_files %}
+    <File name="{{file.name}}" path="{{file.path}}.{{file.type}}" type="1"/>
+    {% endfor %}
   </Files>
 </Project>