eclipse/wakaama
1
0
Fork 0
mirror of https://github.com/eclipse/wakaama.git synced 2025-05-08 23:31:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove platforms folder.

Browse Source 
Signed-off-by: David Navarro <david.navarro@intel.com>
This commit is contained in:
David Navarro 2016-04-07 22:45:37 +02:00
parent b5397be48f
commit 8045de5fbd
20 changed files with 52 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -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

9
examples/bootstrap_server/CMakeLists.txt
View File

@ -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 $<$<CONFIG:Debug>:WITH_LOGS>)

9
examples/client/CMakeLists.txt
View File

@ -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 $<$<CONFIG:Debug>:WITH_LOGS>)

10
examples/lightclient/CMakeLists.txt
View File

@ -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 $<$<CONFIG:Debug>:WITH_LOGS>)

9
examples/server/CMakeLists.txt
View File

@ -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 $<$<CONFIG:Debug>:WITH_LOGS>)

0
examples/utils/commandline.c → examples/shared/commandline.c
View File

0
examples/utils/commandline.h → examples/shared/commandline.h
View File

0
platforms/Linux/connection.c → examples/shared/connection.c
View File

0
platforms/Linux/connection.h → examples/shared/connection.h
View File

0
platforms/Linux/dtlsconnection.c → examples/shared/dtlsconnection.c
View File

0
platforms/Linux/dtlsconnection.h → examples/shared/dtlsconnection.h
View File

0
platforms/Linux/memtrace.c → examples/shared/memtrace.c
View File

0
platforms/Linux/platform.c → examples/shared/platform.c
View File

31
examples/shared/shared.cmake Normal file
View File

@ -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()

0
platforms/Linux/tinydtls → examples/shared/tinydtls
View File

0
platforms/Linux/tinydtls.cmake → examples/shared/tinydtls.cmake
View File

8
examples/utils/utils.cmake
View File

@ -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)

18
platforms/Linux/platform.cmake
View File

@ -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()

24
platforms/readme.md
View File

@ -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);

9
tests/CMakeLists.txt
View File

@ -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