From 8045de5fbd43d9f828a40983b7342c48f04ac4a2 Mon Sep 17 00:00:00 2001 From: David Navarro Date: Thu, 7 Apr 2016 22:45:37 +0200 Subject: [PATCH] Remove platforms folder. Signed-off-by: David Navarro --- .gitmodules | 2 +- examples/bootstrap_server/CMakeLists.txt | 9 +++--- examples/client/CMakeLists.txt | 9 +++--- examples/lightclient/CMakeLists.txt | 10 +++--- examples/server/CMakeLists.txt | 9 +++--- examples/{utils => shared}/commandline.c | 0 examples/{utils => shared}/commandline.h | 0 .../Linux => examples/shared}/connection.c | 0 .../Linux => examples/shared}/connection.h | 0 .../shared}/dtlsconnection.c | 0 .../shared}/dtlsconnection.h | 0 .../Linux => examples/shared}/memtrace.c | 0 .../Linux => examples/shared}/platform.c | 0 examples/shared/shared.cmake | 31 +++++++++++++++++++ {platforms/Linux => examples/shared}/tinydtls | 0 .../Linux => examples/shared}/tinydtls.cmake | 0 examples/utils/utils.cmake | 8 ----- platforms/Linux/platform.cmake | 18 ----------- platforms/readme.md | 24 -------------- tests/CMakeLists.txt | 9 +++--- 20 files changed, 52 insertions(+), 77 deletions(-) rename examples/{utils => shared}/commandline.c (100%) rename examples/{utils => shared}/commandline.h (100%) rename {platforms/Linux => examples/shared}/connection.c (100%) rename {platforms/Linux => examples/shared}/connection.h (100%) rename {platforms/Linux => examples/shared}/dtlsconnection.c (100%) rename {platforms/Linux => examples/shared}/dtlsconnection.h (100%) rename {platforms/Linux => examples/shared}/memtrace.c (100%) rename {platforms/Linux => examples/shared}/platform.c (100%) create mode 100644 examples/shared/shared.cmake rename {platforms/Linux => examples/shared}/tinydtls (100%) rename {platforms/Linux => examples/shared}/tinydtls.cmake (100%) delete mode 100644 examples/utils/utils.cmake delete mode 100644 platforms/Linux/platform.cmake delete mode 100644 platforms/readme.md diff --git a/.gitmodules b/.gitmodules index 307eec2..72782e3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "platforms/Linux/tinydtls"] - path = platforms/Linux/tinydtls + path = examples/shared/tinydtls url = https://git.eclipse.org/r/tinydtls/org.eclipse.tinydtls diff --git a/examples/bootstrap_server/CMakeLists.txt b/examples/bootstrap_server/CMakeLists.txt index 1f23985..21efeac 100644 --- a/examples/bootstrap_server/CMakeLists.txt +++ b/examples/bootstrap_server/CMakeLists.txt @@ -3,13 +3,12 @@ cmake_minimum_required (VERSION 3.0) project (bootstrap_server) include(${CMAKE_CURRENT_LIST_DIR}/../../core/wakaama.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/../../platforms/Linux/platform.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/../utils/utils.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/../shared/shared.cmake) add_definitions(-DLWM2M_BOOTSTRAP_SERVER_MODE) -add_definitions(${PLATFORM_DEFINITIONS} ${WAKAAMA_DEFINITIONS}) +add_definitions(${SHARED_DEFINITIONS} ${WAKAAMA_DEFINITIONS}) -include_directories (${WAKAAMA_SOURCES_DIR} ${PLATFORM_INCLUDE_DIRS} ${UTILS_SOURCES_DIR}) +include_directories (${WAKAAMA_SOURCES_DIR} ${SHARED_INCLUDE_DIRS}) SET(SOURCES bootstrap_server.c @@ -20,7 +19,7 @@ SET(SOURCES SET(AUXILIARY_FILES bootstrap_server.ini) -add_executable(${PROJECT_NAME} ${SOURCES} ${AUXILIARY_FILES} ${WAKAAMA_SOURCES} ${PLATFORM_SOURCES} ${UTILS_SOURCES}) +add_executable(${PROJECT_NAME} ${SOURCES} ${AUXILIARY_FILES} ${WAKAAMA_SOURCES} ${SHARED_SOURCES}) # Add WITH_LOGS to debug variant set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY COMPILE_DEFINITIONS $<$:WITH_LOGS>) diff --git a/examples/client/CMakeLists.txt b/examples/client/CMakeLists.txt index f04f485..a9c7f98 100644 --- a/examples/client/CMakeLists.txt +++ b/examples/client/CMakeLists.txt @@ -5,13 +5,12 @@ project (lwm2mclient) option(DTLS "Enable DTLS" OFF) include(${CMAKE_CURRENT_LIST_DIR}/../../core/wakaama.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/../../platforms/Linux/platform.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/../utils/utils.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/../shared/shared.cmake) add_definitions(-DLWM2M_CLIENT_MODE -DLWM2M_BOOTSTRAP -DLWM2M_SUPPORT_JSON) -add_definitions(${PLATFORM_DEFINITIONS} ${WAKAAMA_DEFINITIONS}) +add_definitions(${SHARED_DEFINITIONS} ${WAKAAMA_DEFINITIONS}) -include_directories (${WAKAAMA_SOURCES_DIR} ${PLATFORM_INCLUDE_DIRS} ${UTILS_SOURCES_DIR}) +include_directories (${WAKAAMA_SOURCES_DIR} ${SHARED_INCLUDE_DIRS}) SET(SOURCES lwm2mclient.c @@ -28,7 +27,7 @@ SET(SOURCES test_object.c ) -add_executable(${PROJECT_NAME} ${SOURCES} ${WAKAAMA_SOURCES} ${PLATFORM_SOURCES} ${UTILS_SOURCES}) +add_executable(${PROJECT_NAME} ${SOURCES} ${WAKAAMA_SOURCES} ${SHARED_SOURCES}) # Add WITH_LOGS to debug variant set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY COMPILE_DEFINITIONS $<$:WITH_LOGS>) diff --git a/examples/lightclient/CMakeLists.txt b/examples/lightclient/CMakeLists.txt index f7e5d81..68d6d86 100644 --- a/examples/lightclient/CMakeLists.txt +++ b/examples/lightclient/CMakeLists.txt @@ -3,14 +3,12 @@ cmake_minimum_required (VERSION 3.0) project (lightclient) include(${CMAKE_CURRENT_LIST_DIR}/../../core/wakaama.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/../../platforms/Linux/platform.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/../utils/utils.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/../shared/shared.cmake) add_definitions(-DLWM2M_CLIENT_MODE) -add_definitions(${PLATFORM_DEFINITIONS} ${WAKAAMA_DEFINITIONS}) +add_definitions(${SHARED_DEFINITIONS} ${WAKAAMA_DEFINITIONS}) - -include_directories (${WAKAAMA_SOURCES_DIR} ${PLATFORM_INCLUDE_DIRS} ${UTILS_SOURCES_DIR}) +include_directories (${WAKAAMA_SOURCES_DIR} ${SHARED_INCLUDE_DIRS}) SET(SOURCES lightclient.c @@ -20,7 +18,7 @@ SET(SOURCES test_object.c ) -add_executable(${PROJECT_NAME} ${SOURCES} ${WAKAAMA_SOURCES} ${PLATFORM_SOURCES} ${UTILS_SOURCES}) +add_executable(${PROJECT_NAME} ${SOURCES} ${WAKAAMA_SOURCES} ${SHARED_SOURCES}) # Add WITH_LOGS to debug variant set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY COMPILE_DEFINITIONS $<$:WITH_LOGS>) diff --git a/examples/server/CMakeLists.txt b/examples/server/CMakeLists.txt index 78471ea..774d6c0 100644 --- a/examples/server/CMakeLists.txt +++ b/examples/server/CMakeLists.txt @@ -3,19 +3,18 @@ cmake_minimum_required (VERSION 3.0) project (lwm2mserver) include(${CMAKE_CURRENT_LIST_DIR}/../../core/wakaama.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/../../platforms/Linux/platform.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/../utils/utils.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/../shared/shared.cmake) add_definitions(-DLWM2M_SERVER_MODE) -add_definitions(${PLATFORM_DEFINITIONS} ${WAKAAMA_DEFINITIONS}) +add_definitions(${SHARED_DEFINITIONS} ${WAKAAMA_DEFINITIONS}) -include_directories (${WAKAAMA_SOURCES_DIR} ${PLATFORM_INCLUDE_DIRS} ${UTILS_SOURCES_DIR}) +include_directories (${WAKAAMA_SOURCES_DIR} ${SHARED_INCLUDE_DIRS}) SET(SOURCES lwm2mserver.c ) -add_executable(${PROJECT_NAME} ${SOURCES} ${WAKAAMA_SOURCES} ${PLATFORM_SOURCES} ${UTILS_SOURCES}) +add_executable(${PROJECT_NAME} ${SOURCES} ${WAKAAMA_SOURCES} ${SHARED_SOURCES}) # Add WITH_LOGS to debug variant set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY COMPILE_DEFINITIONS $<$:WITH_LOGS>) diff --git a/examples/utils/commandline.c b/examples/shared/commandline.c similarity index 100% rename from examples/utils/commandline.c rename to examples/shared/commandline.c diff --git a/examples/utils/commandline.h b/examples/shared/commandline.h similarity index 100% rename from examples/utils/commandline.h rename to examples/shared/commandline.h diff --git a/platforms/Linux/connection.c b/examples/shared/connection.c similarity index 100% rename from platforms/Linux/connection.c rename to examples/shared/connection.c diff --git a/platforms/Linux/connection.h b/examples/shared/connection.h similarity index 100% rename from platforms/Linux/connection.h rename to examples/shared/connection.h diff --git a/platforms/Linux/dtlsconnection.c b/examples/shared/dtlsconnection.c similarity index 100% rename from platforms/Linux/dtlsconnection.c rename to examples/shared/dtlsconnection.c diff --git a/platforms/Linux/dtlsconnection.h b/examples/shared/dtlsconnection.h similarity index 100% rename from platforms/Linux/dtlsconnection.h rename to examples/shared/dtlsconnection.h diff --git a/platforms/Linux/memtrace.c b/examples/shared/memtrace.c similarity index 100% rename from platforms/Linux/memtrace.c rename to examples/shared/memtrace.c diff --git a/platforms/Linux/platform.c b/examples/shared/platform.c similarity index 100% rename from platforms/Linux/platform.c rename to examples/shared/platform.c diff --git a/examples/shared/shared.cmake b/examples/shared/shared.cmake new file mode 100644 index 0000000..a626d44 --- /dev/null +++ b/examples/shared/shared.cmake @@ -0,0 +1,31 @@ +# Provides SHARED_SOURCES_DIR, SHARED_SOURCES, SHARED_INCLUDE_DIRS and SHARED_DEFINITIONS variables + +set(SHARED_SOURCES_DIR ${CMAKE_CURRENT_LIST_DIR}) + +set(SHARED_SOURCES + ${SHARED_SOURCES_DIR}/commandline.c + ${SHARED_SOURCES_DIR}/platform.c + ${SHARED_SOURCES_DIR}/memtrace.c) + +if(DTLS) + include(${CMAKE_CURRENT_LIST_DIR}/tinydtls.cmake) + + set(SHARED_SOURCES + ${SHARED_SOURCES} + ${TINYDTLS_SOURCES} + ${SHARED_SOURCES_DIR}/dtlsconnection.c) + + set(SHARED_INCLUDE_DIRS + ${SHARED_SOURCES_DIR} + ${TINYDTLS_SOURCES_DIR}) + + set(SHARED_DEFINITIONS -DWITH_TINYDTLS) +else() + set(SHARED_SOURCES + ${SHARED_SOURCES} + ${SHARED_SOURCES_DIR}/connection.c) + + set(SHARED_INCLUDE_DIRS ${SHARED_SOURCES_DIR}) +endif() + + diff --git a/platforms/Linux/tinydtls b/examples/shared/tinydtls similarity index 100% rename from platforms/Linux/tinydtls rename to examples/shared/tinydtls diff --git a/platforms/Linux/tinydtls.cmake b/examples/shared/tinydtls.cmake similarity index 100% rename from platforms/Linux/tinydtls.cmake rename to examples/shared/tinydtls.cmake diff --git a/examples/utils/utils.cmake b/examples/utils/utils.cmake deleted file mode 100644 index 707a3e3..0000000 --- a/examples/utils/utils.cmake +++ /dev/null @@ -1,8 +0,0 @@ -# Provides UTILS_SOURCES_DIR and UTILS_SOURCES variables - -set(UTILS_SOURCES_DIR ${CMAKE_CURRENT_LIST_DIR}) - -set(UTILS_SOURCES - ${UTILS_SOURCES_DIR}/commandline.c - ${UTILS_SOURCES_DIR}/commandline.h) - diff --git a/platforms/Linux/platform.cmake b/platforms/Linux/platform.cmake deleted file mode 100644 index cc0abb1..0000000 --- a/platforms/Linux/platform.cmake +++ /dev/null @@ -1,18 +0,0 @@ -# Provides PLATFORM_SOURCES and PLATFORM_INCLUDE_DIRS and PLATFORM_DEFINITIONS variables - -set(PLATFORM_SOURCES_DIR ${CMAKE_CURRENT_LIST_DIR}) -set(PLATFORM_SOURCES - ${PLATFORM_SOURCES_DIR}/platform.c - ${PLATFORM_SOURCES_DIR}/memtrace.c) - -if(DTLS) - include(${CMAKE_CURRENT_LIST_DIR}/tinydtls.cmake) - set(PLATFORM_INCLUDE_DIRS ${PLATFORM_SOURCES_DIR} ${TINYDTLS_SOURCES_DIR}) - set(PLATFORM_SOURCES ${PLATFORM_SOURCES} ${TINYDTLS_SOURCES} ${PLATFORM_SOURCES_DIR}/dtlsconnection.c ${PLATFORM_SOURCES_DIR}/dtlsconnection.h) - set(PLATFORM_INCLUDE_DIRS ${PLATFORM_SOURCES_DIR} ${TINYDTLS_SOURCES_DIR}) - set(PLATFORM_DEFINITIONS -DWITH_TINYDTLS) -else() - set(PLATFORM_SOURCES ${PLATFORM_SOURCES} ${PLATFORM_SOURCES_DIR}/connection.c ${PLATFORM_SOURCES_DIR}/connection.h) - set(PLATFORM_INCLUDE_DIRS ${PLATFORM_SOURCES_DIR}) -endif() - diff --git a/platforms/readme.md b/platforms/readme.md deleted file mode 100644 index 2a0bd66..0000000 --- a/platforms/readme.md +++ /dev/null @@ -1,24 +0,0 @@ -# Platforms -A platform directory (for example "Linux") have to implement the following methods: - -* lwm2m_malloc(size_t s) -* void lwm2m_free(void * p) -* char * lwm2m_strdup(const char * str) -* int lwm2m_strncmp(const char * s1, const char * s2, size_t n) -* time_t lwm2m_gettime(void) -* void lwm2m_printf(const char * format, ...) - -## Requirements for the examples directory - -To make the examples directory compile on your platform, -your platform has to provide a bsd socket API including select(), FD_ZERO(), FD_SET() and FD_ISSET() -and you also have to implement the following methods: - -* int create_socket(const char * portStr, int ai_family); -* connection_t * connection_find(connection_t * connList, struct sockaddr_storage * addr, size_t addrLen); -* connection_t * connection_new_incoming(connection_t * connList, int sock, struct sockaddr * addr, size_t addrLen); -* connection_t * connection_create(connection_t * connList, int sock, char * host, char * port, int addressFamily); -* void connection_free(connection_t * connList); -* int connection_send(connection_t *connP, uint8_t * buffer, size_t length); - - diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index d9a238f..f254d1e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -3,20 +3,19 @@ cmake_minimum_required (VERSION 3.0) project (lwm2munittests) include(${CMAKE_CURRENT_LIST_DIR}/../core/wakaama.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/../platforms/Linux/platform.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/../examples/utils/utils.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/../examples/shared/shared.cmake) add_definitions(-DLWM2M_CLIENT_MODE -DLWM2M_SUPPORT_JSON) -add_definitions(${PLATFORM_DEFINITIONS} ${WAKAAMA_DEFINITIONS}) +add_definitions(${SHARED_DEFINITIONS} ${WAKAAMA_DEFINITIONS}) # Enable all warnings for this test build add_definitions(-Wall -Wextra -Wfloat-equal -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wswitch-default -Wswitch-enum) -include_directories (${WAKAAMA_SOURCES_DIR} ${PLATFORM_INCLUDE_DIRS} ${UTILS_SOURCES_DIR}) +include_directories (${WAKAAMA_SOURCES_DIR} ${SHARED_INCLUDE_DIRS}) file(GLOB SOURCES "*.c") -add_executable(${PROJECT_NAME} ${SOURCES} ${WAKAAMA_SOURCES} ${PLATFORM_SOURCES} ${UTILS_SOURCES}) +add_executable(${PROJECT_NAME} ${SOURCES} ${WAKAAMA_SOURCES} ${SHARED_SOURCES}) target_link_libraries(lwm2munittests cunit) # Enable CMake Test Framework (CTest) which make testing available by