Skip to content

Commit a88438c

Browse files
committed
Move mbed-trace into platform
1 parent 9073a48 commit a88438c

File tree

19 files changed

+11
-12
lines changed

19 files changed

+11
-12
lines changed

UNITTESTS/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ set(unittest-includes-base
114114
"${PROJECT_SOURCE_DIR}/../features"
115115
"${PROJECT_SOURCE_DIR}/../platform/include"
116116
"${PROJECT_SOURCE_DIR}/../platform/include/platform"
117+
"${PROJECT_SOURCE_DIR}/../platform/mbed-trace/include"
117118
"${PROJECT_SOURCE_DIR}/../storage/filesystem/littlefs/include"
118119
"${PROJECT_SOURCE_DIR}/../storage/filesystem/fat/include"
119120
"${PROJECT_SOURCE_DIR}/../storage/blockdevice/include"
@@ -132,7 +133,6 @@ set(unittest-includes-base
132133
"${PROJECT_SOURCE_DIR}/../events/source"
133134
"${PROJECT_SOURCE_DIR}/../rtos/include"
134135
"${PROJECT_SOURCE_DIR}/../features/frameworks"
135-
"${PROJECT_SOURCE_DIR}/../features/frameworks/mbed-trace"
136136
"${PROJECT_SOURCE_DIR}/../connectivity/libraries/nanostack-libservice"
137137
"${PROJECT_SOURCE_DIR}/../connectivity/libraries/nanostack-libservice/mbed-client-libservice"
138138
"${PROJECT_SOURCE_DIR}/../connectivity/netsocket/include"

UNITTESTS/empty_baseline/unittest.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set(unittest-includes ${unittest-includes}
88
..
99
../connectivity/mbedtls/include/mbedtls/
1010
../connectivity/mbedtls/platform/inc/
11-
../features/frameworks/mbed-trace/mbed-trace/
11+
../platform/mbed-trace/mbed-trace/
1212
)
1313

1414
set(unittest-test-sources

connectivity/drivers/cellular/COMPONENT_STMOD_CELLULAR/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ The STMOD+ Connector specification can be found [here](https://www.st.com/conten
1313

1414
## Debug print
1515

16-
mbed_trace feature is used: https://github.com/ARMmbed/mbed-os/blob/master/features/frameworks/mbed-trace/README.md
16+
mbed_trace feature is used: https://github.com/ARMmbed/mbed-os/blob/master/platform/mbed-trace/README.md
1717

1818
Enable it in your mbed_app.json file:
1919

drivers/source/SFDP.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
#if (DEVICE_SPI || DEVICE_QSPI)
2828

29-
#include "features/frameworks/mbed-trace/mbed-trace/mbed_trace.h"
29+
#include "platform/mbed-trace/mbed-trace/mbed_trace.h"
3030
#define TRACE_GROUP "SFDP"
3131

3232
namespace {

features/frameworks/mbed-trace/CMakeLists.txt renamed to platform/mbed-trace/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,3 @@ set (MBED_TRACE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/source/mbed_trace.c)
1515

1616

1717
CREATE_LIBRARY(mbedTrace "${MBED_TRACE_SRC}" "")
18-
File renamed without changes.

features/frameworks/mbed-trace/Jenkinsfile renamed to platform/mbed-trace/Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def morpheusBuildStep(target, compilerLabel, toolchain) {
8282
execute("mbed --version")
8383
execute("echo https://github.com/armmbed/mbed-os/#6a0a86538c0b9b2bfcc4583b1e2b7fea8f4e71e9 > mbed-os.lib")
8484
execute("mbed deploy")
85-
execute("rm -rf ./mbed-os/features/frameworks/mbed-trace")
85+
execute("rm -rf ./mbed-os/platform/mbed-trace")
8686
execute("mbed compile -m ${target} -t ${toolchain} --library")
8787
setBuildStatus('SUCCESS', "build ${buildName}", "build done")
8888
} catch (err) {
@@ -102,7 +102,7 @@ def morpheusBuildStep(target, compilerLabel, toolchain) {
102102
execute("echo \"https://github.com/ARMmbed/mbed-trace#${env.GIT_COMMIT_HASH}\" > mbed-trace.lib")
103103
execute("mbed new .")
104104
execute("mbed deploy")
105-
execute("rm -rf ./mbed-os/features/frameworks/mbed-trace")
105+
execute("rm -rf ./mbed-os/platform/mbed-trace")
106106
execute("rm -rf ./mbed-trace/example")
107107
execute("rm -rf ./mbed-trace/test")
108108
execute("mbed compile -t ${toolchain} -m ${target}")
File renamed without changes.

0 commit comments

Comments
 (0)