ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

restructure - Reverted move of requirements.txt 

- Reverted requirements.txt for external dependency in mbed CLI
- Fixed MBED_CONFIG_FILE in paths.py
- Fixed MBED_LIBRARIES in paths.py
- Decreased include namespace for rtos.h
pull/2878/head
Christopher Haster 2016-09-30 18:47:58 -05:00
parent 03bbc86dd6
commit e35050d61b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mbed.h
View File

@ -19,7 +19,7 @@
#define MBED_LIBRARY_VERSION 123 #define MBED_LIBRARY_VERSION 123
#if MBED_CONF_RTOS_PRESENT #if MBED_CONF_RTOS_PRESENT
#include "rtos/rtos.h" #include "rtos.h"
#endif #endif
#if MBED_CONF_NSAPI_PRESENT #if MBED_CONF_NSAPI_PRESENT

0
tools/requirements.txt → requirements.txt
View File

6
tools/paths.py
View File

@ -24,7 +24,7 @@ from tools.settings import ROOT, BUILD_DIR
BUILD_DIR = getenv("MBED_BUILD_DIR") or BUILD_DIR BUILD_DIR = getenv("MBED_BUILD_DIR") or BUILD_DIR
# Embedded Libraries Sources # Embedded Libraries Sources
LIB_DIR = join(ROOT, "libraries") LIB_DIR = join(ROOT, "features/unsupported")
TOOLS = join(ROOT, "tools") TOOLS = join(ROOT, "tools")
TOOLS_DATA = join(TOOLS, "data") TOOLS_DATA = join(TOOLS, "data")
@ -40,7 +40,7 @@ MBED_TARGETS_PATH = join(ROOT, "targets")
MBED_LIBRARIES = join(BUILD_DIR, "mbed") MBED_LIBRARIES = join(BUILD_DIR, "mbed")
MBED_CONFIG_FILE = join(ROOT, "mbed_lib.json") MBED_CONFIG_FILE = join(ROOT, "platform/mbed_lib.json")
# Tests # Tests
TEST_DIR = join(LIB_DIR, "tests") TEST_DIR = join(LIB_DIR, "tests")
@ -54,7 +54,7 @@ RPC_LIBRARY = join(BUILD_DIR, "rpc")
# mbed RTOS # mbed RTOS
RTOS = join(ROOT, "rtos") RTOS = join(ROOT, "rtos")
MBED_RTX = join(RTOS, "rtx") MBED_RTX = join(RTOS, "rtx")
RTOS_ABSTRACTION = join(RTOS, "rtos") RTOS_ABSTRACTION = RTOS
RTOS_LIBRARIES = join(BUILD_DIR, "rtos") RTOS_LIBRARIES = join(BUILD_DIR, "rtos")