Resolve issues from reorg

Author: sarahmarshy

tools/export/sw4stm32.py

@@ -18,7 +18,6 @@
 from os.path import splitext, basename, join
 from random import randint
 from tools.utils import mkdir
-from targets import Target
 
 
 class Sw4STM32(Exporter):
@@ -80,7 +79,7 @@ def __generate_uid(self):
     def generate(self):
         fp_hardware = "no"
         fp_abi = "soft"
-        core = Target.get_target(self.target).core
+        core = self.target.core
         if core == "Cortex-M4F" or core == "Cortex-M7F":
             fp_hardware = "fpv4-sp-d16"
             fp_abi = "soft-fp"

tools/export/uvision5.py

@@ -83,11 +83,14 @@ def generate(self):
                                                    + self.flags['c_flags']
                                                    + self.flags['cxx_flags']))
         # not compatible with c99 flag set in the template
-        project_data['misc']['c_flags'].remove("--c99")
+        try:project_data['misc']['c_flags'].remove("--c99")
+        except ValueError: pass
         # cpp is not required as it's implicit for cpp files
-        project_data['misc']['c_flags'].remove("--cpp")
-        # we want no-vla for only cxx, but it's also applied for C in IDE, thus we remove it
-        project_data['misc']['c_flags'].remove("--no_vla")
+        try:project_data['misc']['c_flags'].remove("--cpp")
+        except ValueError: pass
+        # we want no-vla for only cxx, but it's also applied for C in IDE, thus we remove it=
+        try:project_data['misc']['c_flags'].remove("--no_vla")
+        except ValueError: pass
         project_data['misc']['ld_flags'] = self.flags['ld_flags']
 
         i = 0

tools/project.py

@@ -10,7 +10,8 @@
 from argparse import ArgumentParser
 from os.path import normpath, realpath
 
-from tools.paths import EXPORT_DIR, MBED_BASE, MBED_LIBRARIES
+from tools.paths import EXPORT_DIR, MBED_DRIVERS, MBED_PLATFORM, \
+    MBED_HAL, MBED_TARGETS_PATH, MBED_LIBRARIES
 from tools.export import EXPORTERS, mcu_ide_matrix
 from tools.tests import TESTS, TEST_MAP
 from tools.tests import test_known, test_name_known, Test
@@ -53,7 +54,11 @@ def setup_project(ide, target, program=None, source_dir=None, build=None, export
             # Substitute the mbed library builds with their sources
             if MBED_LIBRARIES in test.dependencies:
                 test.dependencies.remove(MBED_LIBRARIES)
-                test.dependencies.append(MBED_BASE)
+                test.dependencies.append(MBED_HAL)
+                test.dependencies.append(MBED_DRIVERS)
+                test.dependencies.append(MBED_PLATFORM)
+                test.dependencies.append(MBED_TARGETS_PATH)
+
 
         src_paths = [test.source_dir]
         lib_paths = test.dependencies