Skip to content

Commit

Permalink
cmake: Client examples as individual projects
Browse files Browse the repository at this point in the history
The client example projects now use Wakaama as a direct dependency. They
have also been split into three different projects (udp, tinydtls and
raw_block1). The CI and integration tests were adjusted for the new
project.
  • Loading branch information
LukasWoodtli committed Sep 10, 2024
1 parent a82c05e commit 00fb991
Show file tree
Hide file tree
Showing 23 changed files with 2,056 additions and 2,918 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

strategy:
matrix:
example: ["bootstrap_server", "client", "lightclient", "server"]
example: ["bootstrap_server", "client/udp", "client/tinydtls", "client/raw_block1", "lightclient", "server"]

steps:
- name: Checkout code including full history and submodules
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_and_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:

- name: Build examples for integration tests
run: |
for example in "server" "bootstrap_server"
for example in "server" "bootstrap_server" "client/udp"
do
echo "Building example ${example}"
tools/ci/run_ci.sh \
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -198,11 +198,11 @@ Options:

### Test client example

* ``cmake -S examples/client -B build-client -DWAKAAMA_MODE_CLIENT=ON``
* ``cmake --build build-client``
* ``cmake -S examples/client/udp -B build-client-udp``
* ``cmake --build build-client-udp``
* ``./build-client/lwm2mclient [Options]``

Next to lwm2mclient a DTLS enabled variant named lwm2mclient_tinydtls gets built.
Next to lwm2mclient there are also examples with DTLS enabled and with raw block1 transfer enabled.

The lwm2mclient features nine LWM2M objects:
- Security Object (id: 0)
Expand Down
2 changes: 0 additions & 2 deletions examples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,3 @@ cmake_minimum_required(VERSION 3.21)

# Our examples are designed for POSIX systems
add_compile_definitions(_POSIX_C_SOURCE=200809)

add_subdirectory(client)
51 changes: 0 additions & 51 deletions examples/client/CMakeLists.txt

This file was deleted.

Loading

0 comments on commit 00fb991

Please sign in to comment.