Diff: paths.py

Revision:

31:8ea194f6145b

Parent:

29:1210849dba19

Child:

36:96847d42f010

diff -r f12ce67666d0 -r 8ea194f6145b paths.py
--- a/paths.py	Mon Aug 29 11:56:59 2016 +0100
+++ b/paths.py	Wed Jan 04 11:58:24 2017 -0600
@@ -24,23 +24,27 @@
 BUILD_DIR = getenv("MBED_BUILD_DIR") or BUILD_DIR
 
 # Embedded Libraries Sources
-LIB_DIR = join(ROOT, "libraries")
+LIB_DIR = join(ROOT, "features/unsupported")
 
 TOOLS = join(ROOT, "tools")
 TOOLS_DATA = join(TOOLS, "data")
 TOOLS_BOOTLOADERS = join(TOOLS, "bootloaders")
 
 # mbed libraries
-MBED_BASE = join(ROOT, "hal")
+MBED_HEADER = join(ROOT, "mbed.h")
+MBED_DRIVERS = join(ROOT, "drivers")
+MBED_PLATFORM = join(ROOT, "platform")
+MBED_HAL = join(ROOT, "hal")
 
-MBED_API = join(MBED_BASE, "api")
-MBED_COMMON = join(MBED_BASE, "common")
-MBED_HAL = join(MBED_BASE, "hal")
-MBED_TARGETS_PATH = join(MBED_BASE, "targets")
+MBED_CMSIS_PATH = join(ROOT, "cmsis")
+MBED_TARGETS_PATH = join(ROOT, "targets")
 
 MBED_LIBRARIES = join(BUILD_DIR, "mbed")
+MBED_LIBRARIES_DRIVERS = join(MBED_LIBRARIES, "drivers")
+MBED_LIBRARIES_PLATFORM = join(MBED_LIBRARIES, "platform")
+MBED_LIBRARIES_HAL = join(MBED_LIBRARIES, "hal")
 
-MBED_CONFIG_FILE = join(ROOT, "mbed_lib.json")
+MBED_CONFIG_FILE = join(ROOT, "platform/mbed_lib.json")
 
 # Tests
 TEST_DIR = join(LIB_DIR, "tests")
@@ -54,7 +58,6 @@
 # mbed RTOS
 RTOS = join(ROOT, "rtos")
 MBED_RTX = join(RTOS, "rtx")
-RTOS_ABSTRACTION = join(RTOS, "rtos")
 
 RTOS_LIBRARIES = join(BUILD_DIR, "rtos")