Added Compiler Toolchain Varibales in Templates and modfied generation of jinja

Author: c.mandl

tools/export/nb/Makefile.tmpl

@@ -51,7 +51,7 @@ CCADMIN=CCadmin
 
 BUILDDIR = BUILD
 PLATFORM = {{target}}
-ELF2BIN = 'arm-none-eabi-objcopy'
+ELF2BIN = '{{elf2bin_cmd}}'
 TARGET = ${CND_DISTDIR}/${CONF}/${CND_PLATFORM}/{{name}}
 
 

tools/export/nb/__init__.py

@@ -243,7 +243,12 @@ def create_jinja_ctx(self):
             'cpp_std': self.get_netbeans_cpp_std(cpp_std),
             'linker_script': self.ld_script,
             'linker_libs': sys_libs,
-            'pp_cmd': preproc
+            'pp_cmd': preproc,
+            'cc_cmd': self.toolchain.cc[0],
+            'cppc_cmd': self.toolchain.cppc[0],
+            'asm_cmd': self.toolchain.asm[0],
+            'ld_cmd': self.toolchain.ld[0],
+            'elf2bin_cmd': self.toolchain.elf2bin
         }
         return jinja_ctx
 

tools/export/nb/configurations.tmpl

@@ -79,6 +79,7 @@
                         <Elem>{{ symbol }}</Elem>
                         {% endfor -%}
                     </preprocessorList>
+                    <commandlineTool>{{cc_cmd}}</commandlineTool>
                 </cTool>
                 <ccTool>
                     <standard>{{ cpp_std }}</standard>
@@ -104,6 +105,7 @@
                         <Elem>{{ symbol }}</Elem>
                         {% endfor -%}
                     </preprocessorList>
+                    <commandlineTool>{{cppc_cmd}}</commandlineTool>
                 </ccTool>
                 <fortranCompilerTool>
                     <developmentMode>5</developmentMode>
@@ -129,11 +131,12 @@
                         <Elem>{{ symbol }}</Elem>
                         {% endfor -%}
                     </preprocessorList>
+                    <commandlineTool>{{asm_cmd}}</commandlineTool>
                 </asmTool>
                 <linkerTool>
                     <output>${CND_DISTDIR}/${CND_CONF}/{{target}}/{{name}}.elf</output>
                     <additionalDep>${CND_BUILDDIR}/${CND_CONF}/{{target}}/.link_script.ld</additionalDep>
-                    <commandlineTool>arm-none-eabi-gcc</commandlineTool>
+                    <commandlineTool>{{ld_cmd}}</commandlineTool>
                     <commandLine>-T ${CND_BUILDDIR}/${CND_CONF}/{{target}}/.link_script.ld {%- for symbol in opts['ld'] -%}{{" "+symbol}}{%- endfor -%} {%- for item in linker_libs -%}{{" "+item}}{%- endfor -%} </commandLine>
                 </linkerTool>
             </compileType>