ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2672 from stevew817/bugfix/EFM32_exporter_mbed_config 

[EFM32] Fix exporter to pull root path
pull/2734/head
Sam Grove 2016-09-16 17:29:53 -05:00 committed by GitHub
parent 1f7c341a65 f4f1f6ee59
commit bd4d29d76c
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/export/simplicityv3.py
View File

@ -175,6 +175,7 @@ class SimplicityV3(Exporter):
## Strip main folder from include paths because ssproj is not capable of handling it ## Strip main folder from include paths because ssproj is not capable of handling it
if '.' in ctx['include_paths']: if '.' in ctx['include_paths']:
ctx['include_paths'].remove('.') ctx['include_paths'].remove('.')
ctx['include_root'] = True
''' '''
Suppress print statements Suppress print statements

9
tools/export/simplicityv3_slsproj.tmpl
View File

@ -18,6 +18,9 @@
{%- for file in main_files -%} {%- for file in main_files -%}
<file name = "{{ file }}" uri = "file:./{{ file }}" partCompatibility = ""/> <file name = "{{ file }}" uri = "file:./{{ file }}" partCompatibility = ""/>
{%- endfor %} {%- endfor %}
{%- if include_root %}
<file name = "mbed_config.h" uri = "file:./mbed_config.h" partCompatibility = ""/>
{%- endif %}
<sourceFolder></sourceFolder> <sourceFolder></sourceFolder>
<model:property key="cppProjectCommon.languageId" value="org.eclipse.cdt.core.g++"/> <model:property key="cppProjectCommon.languageId" value="org.eclipse.cdt.core.g++"/>
@ -25,6 +28,9 @@
<configuration name="com.silabs.ide.si32.gcc.debug#com.silabs.ide.si32.gcc:4.8.3.20131129" label="GNU ARM v4.8.3 - Debug" stockConfigCompatibility="com.silabs.ide.toolchain.core.debug"> <configuration name="com.silabs.ide.si32.gcc.debug#com.silabs.ide.si32.gcc:4.8.3.20131129" label="GNU ARM v4.8.3 - Debug" stockConfigCompatibility="com.silabs.ide.toolchain.core.debug">
<model:description></model:description> <model:description></model:description>
{# Add all include paths to the managed build compiler, paths relative to project #} {# Add all include paths to the managed build compiler, paths relative to project #}
{%- if include_root %}
<includePath languageCompatibility="c cpp" uri="."/>
{%- endif %}
{%- for path in include_paths %} {%- for path in include_paths %}
<includePath languageCompatibility="c cpp" uri="studio:/project/{{ path }}/"/> <includePath languageCompatibility="c cpp" uri="studio:/project/{{ path }}/"/>
{%- endfor %} {%- endfor %}
@ -83,6 +89,9 @@
<configuration name="com.silabs.ide.si32.gcc.release#com.silabs.ide.si32.gcc:4.8.3.20131129" label="GNU ARM v4.8.3 - Release" stockConfigCompatibility="com.silabs.ide.toolchain.core.release"> <configuration name="com.silabs.ide.si32.gcc.release#com.silabs.ide.si32.gcc:4.8.3.20131129" label="GNU ARM v4.8.3 - Release" stockConfigCompatibility="com.silabs.ide.toolchain.core.release">
<model:description></model:description> <model:description></model:description>
{# Add all include paths to the managed build compiler, paths relative to project #} {# Add all include paths to the managed build compiler, paths relative to project #}
{%- if include_root %}
<includePath languageCompatibility="c cpp" uri="."/>
{%- endif %}
{%- for path in include_paths %} {%- for path in include_paths %}
<includePath languageCompatibility="c cpp" uri="studio:/project/{{ path }}/"/> <includePath languageCompatibility="c cpp" uri="studio:/project/{{ path }}/"/>
{%- endfor %} {%- endfor %}