From 28647182f4e309615aa612cca510e0ff8d7a3115 Mon Sep 17 00:00:00 2001 From: Steven Cooreman Date: Mon, 12 Sep 2016 17:23:05 +0200 Subject: [PATCH] Fix exporter to pull root path Simplicity Studio exporter doesnt really support header files in the root directory (looking at you, mbed_config.h), so this is a workaround for that issue. --- tools/export/simplicityv3.py | 1 + tools/export/simplicityv3_slsproj.tmpl | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/tools/export/simplicityv3.py b/tools/export/simplicityv3.py index ba6f6f185b..624da00184 100644 --- a/tools/export/simplicityv3.py +++ b/tools/export/simplicityv3.py @@ -175,6 +175,7 @@ class SimplicityV3(Exporter): ## 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 index 596226d814..2a319c2134 100644 --- a/tools/export/simplicityv3_slsproj.tmpl +++ b/tools/export/simplicityv3_slsproj.tmpl @@ -18,6 +18,9 @@ {%- for file in main_files -%} {%- endfor %} + {%- if include_root %} + + {%- endif %} @@ -25,6 +28,9 @@ {# Add all include paths to the managed build compiler, paths relative to project #} + {%- if include_root %} + + {%- endif %} {%- for path in include_paths %} {%- endfor %} @@ -83,6 +89,9 @@ {# Add all include paths to the managed build compiler, paths relative to project #} + {%- if include_root %} + + {%- endif %} {%- for path in include_paths %} {%- endfor %}