Skip to content

Commit be1ae59

Browse files
committed
make: Client examples as individual projects
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.
1 parent 1f57c8e commit be1ae59

23 files changed

+2056
-2918
lines changed

.github/workflows/build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242

4343
strategy:
4444
matrix:
45-
example: ["bootstrap_server", "client", "lightclient", "server"]
45+
example: ["bootstrap_server", "client/udp", "client/tinydtls", "client/raw_block1", "lightclient", "server"]
4646

4747
steps:
4848
- name: Checkout code including full history and submodules

.github/workflows/build_and_test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
- name: Build examples for integration tests
4747
run: |
48-
for example in "server" "bootstrap_server"
48+
for example in "server" "bootstrap_server" "client/udp"
4949
do
5050
echo "Building example ${example}"
5151
tools/ci/run_ci.sh \

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -202,11 +202,11 @@ Options:
202202

203203
### Test client example
204204

205-
* ``cmake -S examples/client -B build-client -DWAKAAMA_MODE_CLIENT=ON``
206-
* ``cmake --build build-client``
207-
* ``./build-client/lwm2mclient [Options]``
205+
* ``cmake -S examples/client/udp -B build-client-udp``
206+
* ``cmake --build build-client-udp``
207+
* ``./build-client-udp/lwm2mclient [Options]``
208208

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

211211
The lwm2mclient features nine LWM2M objects:
212212
- Security Object (id: 0)

examples/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,3 @@ cmake_minimum_required(VERSION 3.21)
22

33
# Our examples are designed for POSIX systems
44
add_compile_definitions(_POSIX_C_SOURCE=200809)
5-
6-
add_subdirectory(client)

examples/client/CMakeLists.txt

-51
This file was deleted.

0 commit comments

Comments
 (0)