From 9bd2b4e4b17f9f7df2799f79eb128ea6bce8e0f0 Mon Sep 17 00:00:00 2001 From: Mihail Stoyanov Date: Sun, 15 May 2016 11:28:34 +0100 Subject: [PATCH] Align paths config (paths.py) with the new directory layout. Also rename the output build folder to .build --- workspace_tools/paths.py | 4 ++-- workspace_tools/settings.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/workspace_tools/paths.py b/workspace_tools/paths.py index ec9741a38d..849995fb97 100644 --- a/workspace_tools/paths.py +++ b/workspace_tools/paths.py @@ -31,7 +31,7 @@ TOOLS_DATA = join(TOOLS, "data") TOOLS_BOOTLOADERS = join(TOOLS, "bootloaders") # mbed libraries -MBED_BASE = join(LIB_DIR, "mbed") +MBED_BASE = join(ROOT, "hal") MBED_API = join(MBED_BASE, "api") MBED_COMMON = join(MBED_BASE, "common") @@ -50,7 +50,7 @@ MBED_RPC = join(LIB_DIR, "rpc") RPC_LIBRARY = join(BUILD_DIR, "rpc") # mbed RTOS -RTOS = join(LIB_DIR, "rtos") +RTOS = join(ROOT, "rtos") MBED_RTX = join(RTOS, "rtx") RTOS_ABSTRACTION = join(RTOS, "rtos") diff --git a/workspace_tools/settings.py b/workspace_tools/settings.py index ef4ef034c0..b2bea273d2 100644 --- a/workspace_tools/settings.py +++ b/workspace_tools/settings.py @@ -24,7 +24,7 @@ ROOT = abspath(join(dirname(__file__), "..")) ############################################################################## # Build System Settings ############################################################################## -BUILD_DIR = abspath(join(ROOT, "build")) +BUILD_DIR = abspath(join(ROOT, ".build")) # ARM armcc = "standalone" # "keil", or "standalone", or "ds-5"