Diff: paths.py

Revision:

29:1210849dba19

Parent:

13:ab47a20b66f0

Child:

31:8ea194f6145b

diff -r e080013bb94e -r 1210849dba19 paths.py
--- a/paths.py	Mon Aug 29 10:55:42 2016 +0100
+++ b/paths.py	Mon Aug 29 11:18:36 2016 +0100
@@ -18,7 +18,7 @@
 from os import getenv
 
 # Conventions about the directory structure
-from settings import ROOT, BUILD_DIR
+from tools.settings import ROOT, BUILD_DIR
 
 # Allow overriding some of the build parameters using environment variables
 BUILD_DIR = getenv("MBED_BUILD_DIR") or BUILD_DIR
@@ -40,6 +40,8 @@
 
 MBED_LIBRARIES = join(BUILD_DIR, "mbed")
 
+MBED_CONFIG_FILE = join(ROOT, "mbed_lib.json")
+
 # Tests
 TEST_DIR = join(LIB_DIR, "tests")
 HOST_TESTS = join(ROOT, "tools", "host_tests")
@@ -102,8 +104,10 @@
 CPPUTEST_INC = join(CPPUTEST_DIR, "cpputest", "include")
 CPPUTEST_INC_EXT = join(CPPUTEST_DIR, "cpputest", "include", "CppUTest")
 # Platform dependant code is here (for armcc compiler)
-CPPUTEST_PLATFORM_SRC = join(CPPUTEST_DIR, "cpputest", "src", "Platforms", "armcc")
-CPPUTEST_PLATFORM_INC = join(CPPUTEST_DIR, "cpputest", "include", "Platforms", "armcc")
+CPPUTEST_PLATFORM_SRC = join(CPPUTEST_DIR, "cpputest", "src", "Platforms",
+                             "armcc")
+CPPUTEST_PLATFORM_INC = join(CPPUTEST_DIR, "cpputest", "include", "Platforms",
+                             "armcc")
 # Function 'main' used to run all compiled UTs
 CPPUTEST_TESTRUNNER_SCR = join(TEST_DIR, "utest", "testrunner")
 CPPUTEST_TESTRUNNER_INC = join(TEST_DIR, "utest", "testrunner")