Remove mbedEdgeTrace and nanostack libraries

CMakeLists.txt

@@ -76,8 +76,6 @@ else ()
 endif ()
 
 add_subdirectory (common)
-add_subdirectory (nano-stack)
-add_subdirectory (mbed-trace-edge)
 add_subdirectory (edge-client)
 add_subdirectory (lib)
 add_subdirectory (edge-core)

cmake/edge_configure.cmake

@@ -251,11 +251,3 @@ SET (MBED_CONF_MBED_CLIENT_DNS_THREAD_STACK_SIZE 131072)
 SET (SA_PV_PLAT_PC 1)
 SET (RESOURCE_ATTRIBUTES_LIST 1)
 
-#Following is needed for tests
-FILE (GLOB LIBSERVICE_SOURCE
-  "${CMAKE_CURRENT_SOURCE_DIR}/lib/mbed-cloud-client/nanostack-libservice/source/libBits/common_functions.c"
-  "${CMAKE_CURRENT_SOURCE_DIR}/lib/mbed-cloud-client/nanostack-libservice/source/libList/*.c"
-  "${CMAKE_CURRENT_SOURCE_DIR}/lib/mbed-cloud-client/nanostack-libservice/source/nsdynmemLIB/*.c"
-  "${CMAKE_CURRENT_SOURCE_DIR}/lib/mbed-cloud-client/nanostack-libservice/source/libip6string/ip6tos.c"
-  )
-CREATE_LIBRARY(libservice "${LIBSERVICE_SOURCE}" "")

edge-core/CMakeLists.txt

@@ -32,7 +32,7 @@ if(ENABLE_UC_HUB)
 endif()
 if (TARGET_GROUP STREQUAL test)
 
-  target_link_libraries (edge-core jansson jsonrpc libevent-mock-lib rpc mbedTrace libservice edge-client-mock-lib pal-mock-lib test-lib pthread mbed-cloud-client-mock mbedtls)
+  target_link_libraries (edge-core jansson jsonrpc libevent-mock-lib rpc mbedTrace nanostacklibservice edge-client-mock-lib pal-mock-lib test-lib pthread mbed-cloud-client-mock mbedtls)
 else ()
   target_link_libraries (edge-core jansson websockets event rpc edge-client fccstorage)
 endif ()

pt-client-2/CMakeLists.txt

@@ -45,9 +45,9 @@ endif()
 SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -shared")
 
 if (TARGET_GROUP STREQUAL test)
-  target_link_libraries (pt-client-2 jansson rpc mbedTraceEdge)
+  target_link_libraries (pt-client-2 jansson rpc nanostacklibservice mbedTrace)
 else ()
   target_link_libraries (pt-client-2 edge-websocket-common
     edge-integer-length edge-apr-base64 edge-default-message-id-generator
-    pt-api-error-codes edge-msg-api event jansson websockets rpc nanostack mbedTraceEdge)
+    pt-api-error-codes edge-msg-api event jansson websockets rpc nanostacklibservice mbedTrace)
 endif()

pt-client/CMakeLists.txt

@@ -25,7 +25,7 @@ target_include_directories (pt-client PUBLIC ${CMAKE_CURRENT_LIST_DIR}/../edge-r
 SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -shared")
 
 if (TARGET_GROUP STREQUAL test)
-  target_link_libraries (pt-client jansson rpc mbedTraceEdge)
+  target_link_libraries (pt-client jansson rpc nanostacklibservice mbedTrace)
 else ()
-  target_link_libraries (pt-client event jansson websockets rpc nanostack mbedTraceEdge)
+  target_link_libraries (pt-client event jansson websockets rpc nanostacklibservice mbedTrace)
 endif()

test/edge-client/CMakeLists.txt

@@ -12,6 +12,6 @@ include_directories (../cpputest-custom-types)
 target_include_directories (edge-client-test PUBLIC ${CPPUTEST_HOME}/include)
 target_include_directories (edge-client-test PUBLIC ${ROOT_HOME}/test/test-lib)
 target_include_directories (edge-client-test PUBLIC ${ROOT_HOME}/lib/mbed-cloud-client/unittests/stub)
-target_link_libraries (edge-client-test edge-server-mock-lib pal-mock-lib test-lib edge-client CppUTest CppUTestExt mbedTrace libservice pthread curl)
+target_link_libraries (edge-client-test edge-server-mock-lib pal-mock-lib test-lib edge-client CppUTest CppUTestExt mbedTrace nanostacklibservice pthread curl)
 
 add_definitions(-DTEST_DATA_DIR="${TEST_DATA_DIR}")

test/edge-io-lib/CMakeLists.txt

@@ -9,5 +9,5 @@ add_definitions(-DMBED_CONF_MBED_TRACE_ENABLE=1)
 
 target_include_directories (edge-io-lib-test PUBLIC ${CPPUTEST_HOME}/include)
 
-target_link_libraries (edge-io-lib-test mbedTraceEdge CppUTest CppUTestExt)
+target_link_libraries (edge-io-lib-test nanostacklibservice mbedTrace CppUTest CppUTestExt)
 

test/edge-rpc/CMakeLists.txt

@@ -10,4 +10,4 @@ target_include_directories (edge-rpc-test PUBLIC ${CPPUTEST_HOME}/include)
 target_include_directories (edge-rpc-test PUBLIC ${ROOT_HOME}/lib/jsonrpc)
 target_include_directories (edge-rpc-test PUBLIC ${ROOT_HOME}/test/test-lib)
 
-target_link_libraries (edge-rpc-test test-lib libevent-mock-lib rpc jansson jsonrpc mbedTrace libservice CppUTest CppUTestExt)
+target_link_libraries (edge-rpc-test test-lib libevent-mock-lib rpc jansson jsonrpc mbedTrace nanostacklibservice CppUTest CppUTestExt)

test/pt-client-2/CMakeLists.txt

@@ -12,7 +12,7 @@ include_directories (../cpputest-custom-types ../libwebsocket-mock)
 target_include_directories (pt-client-2-test PUBLIC ${CPPUTEST_HOME}/include)
 target_include_directories (pt-client-2-test PUBLIC ${ROOT_HOME}/test/test-lib)
 
-target_link_libraries (pt-client-2-test nanostack edge-mutex-mock pt-client-2
+target_link_libraries (pt-client-2-test nanostacklibservice edge-mutex-mock pt-client-2
   edge-apr-base64 edge-default-message-id-generator pt-api-error-codes
   edge-websocket-common-mock edge-msg-api-common-mock edge-mutex-helper
-  libwebsocket-mock-minimal-lib libevent-mock-lib CppUTest CppUTestExt pthread)
+  libwebsocket-mock-minimal-lib libevent-mock-lib CppUTest CppUTestExt pthread mbedTrace)

test/pt-client/CMakeLists.txt

@@ -12,4 +12,4 @@ include_directories (../cpputest-custom-types ../libwebsocket-mock)
 target_include_directories (pt-client-test PUBLIC ${CPPUTEST_HOME}/include)
 target_include_directories (pt-client-test PUBLIC ${ROOT_HOME}/test/test-lib)
 
-target_link_libraries (pt-client-test nanostack pt-client libwebsocket-mock-lib libevent-mock-lib test-lib CppUTest CppUTestExt pthread)
+target_link_libraries (pt-client-test nanostacklibservice mbedTrace pt-client libwebsocket-mock-lib libevent-mock-lib test-lib CppUTest CppUTestExt pthread)