Diff: export/simplicityv3.py

Revision:

32:8ea194f6145b

Parent:

13:ab47a20b66f0

--- a/export/simplicityv3.py	Mon Aug 29 11:56:59 2016 +0100
+++ b/export/simplicityv3.py	Wed Jan 04 11:58:24 2017 -0600
@@ -1,6 +1,6 @@
 """
 mbed SDK
-Copyright (c) 2014 ARM Limited
+Copyright (c) 2014-2016 ARM Limited
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -147,7 +147,7 @@
                 libraries.append(l[3:])
 
         defines = []
-        for define in self.get_symbols():
+        for define in self.toolchain.get_symbols():
             if '=' in define:
                 keyval = define.split('=')
                 defines.append( (keyval[0], keyval[1]) )
@@ -157,7 +157,7 @@
         self.check_and_add_path(split(self.resources.linker_script)[0])
 
         ctx = {
-            'name': self.program_name,
+            'name': self.project_name,
             'main_files': main_files,
             'recursiveFolders': self.orderedPaths,
             'object_files': self.resources.objects,
@@ -165,17 +165,17 @@
             'library_paths': self.resources.lib_dirs,
             'linker_script': self.resources.linker_script,
             'libraries': libraries,
-            'symbols': self.get_symbols(),
             'defines': defines,
             'part': self.PARTS[self.target],
             'kit': self.KITS[self.target],
             'loopcount': 0
         }
-        ctx.update(self.progen_flags)
+        ctx.update(self.flags)
 
         ## 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
@@ -191,4 +191,4 @@
                 print("\t" + bpath.name + "\n")
         '''
 
-        self.gen_file('simplicityv3_slsproj.tmpl', ctx, '%s.slsproj' % self.program_name)
+        self.gen_file('simplicityv3_slsproj.tmpl', ctx, '%s.slsproj' % self.project_name)