Merge pull request #2672 from stevew817/bugfix/EFM32_exporter_mbed_co…

…nfig [EFM32] Fix exporter to pull root path
ARMmbed · Sep 16, 2016 · bd4d29d · bd4d29d
2 parents 1f7c341 + f4f1f6e
commit bd4d29d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/tools/export/simplicityv3.py b/tools/export/simplicityv3.py
@@ -175,6 +175,7 @@ def generate(self):
         ## Strip main folder from include paths because ssproj is not capable of handling it
         if '.' in ctx['include_paths']:
             ctx['include_paths'].remove('.')
+            ctx['include_root'] = True
 
         '''
         Suppress print statements

diff --git a/tools/export/simplicityv3_slsproj.tmpl b/tools/export/simplicityv3_slsproj.tmpl
@@ -18,13 +18,19 @@
   {%- for file in main_files -%}
   <file name = "{{ file }}" uri = "file:./{{ file }}" partCompatibility = ""/>
   {%- endfor %}
+  {%- if include_root %}
+  <file name = "mbed_config.h" uri = "file:./mbed_config.h" partCompatibility = ""/>
+  {%- endif %}
 
   <sourceFolder></sourceFolder>
   <model:property key="cppProjectCommon.languageId" value="org.eclipse.cdt.core.g++"/>
   <model:property key="projectCommon.buildArtifactType" value="EXE"/>
   <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>
 {# 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 %}
     <includePath languageCompatibility="c cpp" uri="studio:/project/{{ path }}/"/>
     {%- 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">
     <model:description></model:description>
 {# 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 %}
     <includePath languageCompatibility="c cpp" uri="studio:/project/{{ path }}/"/>
     {%- endfor %}