From 16a77d97f75fdcdb82367561de4b4dc3bb23f542 Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Wed, 1 Nov 2017 09:24:15 +0100 Subject: [PATCH] Move 'examples/coap-example' to 'examples/coap' --- examples/{coap-example => coap}/Makefile | 0 examples/{coap-example => coap}/README.md | 0 examples/{coap-example => coap}/coap-example-client.c | 0 .../{coap-example => coap}/coap-example-observe-client.c | 0 examples/{coap-example => coap}/coap-example-server.c | 0 examples/{coap-example => coap}/in6addr.patch | 0 examples/{coap-example => coap}/plugtest-server.c | 0 examples/{coap-example => coap}/plugtest.h | 0 examples/{coap-example => coap}/project-conf.h | 0 examples/{coap-example => coap}/resources/res-b1-sep-b2.c | 0 examples/{coap-example => coap}/resources/res-battery.c | 0 examples/{coap-example => coap}/resources/res-chunks.c | 0 examples/{coap-example => coap}/resources/res-event.c | 0 examples/{coap-example => coap}/resources/res-hello.c | 0 examples/{coap-example => coap}/resources/res-leds.c | 0 examples/{coap-example => coap}/resources/res-light.c | 0 examples/{coap-example => coap}/resources/res-mirror.c | 0 .../resources/res-plugtest-create1.c | 0 .../resources/res-plugtest-create2.c | 0 .../resources/res-plugtest-create3.c | 0 .../resources/res-plugtest-large-create.c | 0 .../resources/res-plugtest-large-update.c | 0 .../{coap-example => coap}/resources/res-plugtest-large.c | 0 .../{coap-example => coap}/resources/res-plugtest-links.c | 0 .../resources/res-plugtest-locquery.c | 0 .../resources/res-plugtest-longpath.c | 0 .../{coap-example => coap}/resources/res-plugtest-multi.c | 0 .../{coap-example => coap}/resources/res-plugtest-obs.c | 0 .../{coap-example => coap}/resources/res-plugtest-path.c | 0 .../{coap-example => coap}/resources/res-plugtest-query.c | 0 .../resources/res-plugtest-separate.c | 0 .../{coap-example => coap}/resources/res-plugtest-test.c | 0 .../resources/res-plugtest-validate.c | 0 examples/{coap-example => coap}/resources/res-push.c | 0 examples/{coap-example => coap}/resources/res-radio.c | 0 examples/{coap-example => coap}/resources/res-separate.c | 0 examples/{coap-example => coap}/resources/res-sht11.c | 0 examples/{coap-example => coap}/resources/res-sub.c | 0 .../{coap-example => coap}/resources/res-temperature.c | 0 examples/{coap-example => coap}/resources/res-toggle.c | 0 examples/{coap-example => coap}/server-client-native.csc | 8 ++++---- examples/{coap-example => coap}/server-client-observe.csc | 8 ++++---- examples/{coap-example => coap}/server-client.csc | 8 ++++---- examples/{coap-example => coap}/server-only.csc | 4 ++-- tests/02-compile-arm-ports/Makefile | 4 ++-- 45 files changed, 16 insertions(+), 16 deletions(-) rename examples/{coap-example => coap}/Makefile (100%) rename examples/{coap-example => coap}/README.md (100%) rename examples/{coap-example => coap}/coap-example-client.c (100%) rename examples/{coap-example => coap}/coap-example-observe-client.c (100%) rename examples/{coap-example => coap}/coap-example-server.c (100%) rename examples/{coap-example => coap}/in6addr.patch (100%) rename examples/{coap-example => coap}/plugtest-server.c (100%) rename examples/{coap-example => coap}/plugtest.h (100%) rename examples/{coap-example => coap}/project-conf.h (100%) rename examples/{coap-example => coap}/resources/res-b1-sep-b2.c (100%) rename examples/{coap-example => coap}/resources/res-battery.c (100%) rename examples/{coap-example => coap}/resources/res-chunks.c (100%) rename examples/{coap-example => coap}/resources/res-event.c (100%) rename examples/{coap-example => coap}/resources/res-hello.c (100%) rename examples/{coap-example => coap}/resources/res-leds.c (100%) rename examples/{coap-example => coap}/resources/res-light.c (100%) rename examples/{coap-example => coap}/resources/res-mirror.c (100%) rename examples/{coap-example => coap}/resources/res-plugtest-create1.c (100%) rename examples/{coap-example => coap}/resources/res-plugtest-create2.c (100%) rename examples/{coap-example => coap}/resources/res-plugtest-create3.c (100%) rename examples/{coap-example => coap}/resources/res-plugtest-large-create.c (100%) rename examples/{coap-example => coap}/resources/res-plugtest-large-update.c (100%) rename examples/{coap-example => coap}/resources/res-plugtest-large.c (100%) rename examples/{coap-example => coap}/resources/res-plugtest-links.c (100%) rename examples/{coap-example => coap}/resources/res-plugtest-locquery.c (100%) rename examples/{coap-example => coap}/resources/res-plugtest-longpath.c (100%) rename examples/{coap-example => coap}/resources/res-plugtest-multi.c (100%) rename examples/{coap-example => coap}/resources/res-plugtest-obs.c (100%) rename examples/{coap-example => coap}/resources/res-plugtest-path.c (100%) rename examples/{coap-example => coap}/resources/res-plugtest-query.c (100%) rename examples/{coap-example => coap}/resources/res-plugtest-separate.c (100%) rename examples/{coap-example => coap}/resources/res-plugtest-test.c (100%) rename examples/{coap-example => coap}/resources/res-plugtest-validate.c (100%) rename examples/{coap-example => coap}/resources/res-push.c (100%) rename examples/{coap-example => coap}/resources/res-radio.c (100%) rename examples/{coap-example => coap}/resources/res-separate.c (100%) rename examples/{coap-example => coap}/resources/res-sht11.c (100%) rename examples/{coap-example => coap}/resources/res-sub.c (100%) rename examples/{coap-example => coap}/resources/res-temperature.c (100%) rename examples/{coap-example => coap}/resources/res-toggle.c (100%) rename examples/{coap-example => coap}/server-client-native.csc (96%) rename examples/{coap-example => coap}/server-client-observe.csc (95%) rename examples/{coap-example => coap}/server-client.csc (96%) rename examples/{coap-example => coap}/server-only.csc (97%) diff --git a/examples/coap-example/Makefile b/examples/coap/Makefile similarity index 100% rename from examples/coap-example/Makefile rename to examples/coap/Makefile diff --git a/examples/coap-example/README.md b/examples/coap/README.md similarity index 100% rename from examples/coap-example/README.md rename to examples/coap/README.md diff --git a/examples/coap-example/coap-example-client.c b/examples/coap/coap-example-client.c similarity index 100% rename from examples/coap-example/coap-example-client.c rename to examples/coap/coap-example-client.c diff --git a/examples/coap-example/coap-example-observe-client.c b/examples/coap/coap-example-observe-client.c similarity index 100% rename from examples/coap-example/coap-example-observe-client.c rename to examples/coap/coap-example-observe-client.c diff --git a/examples/coap-example/coap-example-server.c b/examples/coap/coap-example-server.c similarity index 100% rename from examples/coap-example/coap-example-server.c rename to examples/coap/coap-example-server.c diff --git a/examples/coap-example/in6addr.patch b/examples/coap/in6addr.patch similarity index 100% rename from examples/coap-example/in6addr.patch rename to examples/coap/in6addr.patch diff --git a/examples/coap-example/plugtest-server.c b/examples/coap/plugtest-server.c similarity index 100% rename from examples/coap-example/plugtest-server.c rename to examples/coap/plugtest-server.c diff --git a/examples/coap-example/plugtest.h b/examples/coap/plugtest.h similarity index 100% rename from examples/coap-example/plugtest.h rename to examples/coap/plugtest.h diff --git a/examples/coap-example/project-conf.h b/examples/coap/project-conf.h similarity index 100% rename from examples/coap-example/project-conf.h rename to examples/coap/project-conf.h diff --git a/examples/coap-example/resources/res-b1-sep-b2.c b/examples/coap/resources/res-b1-sep-b2.c similarity index 100% rename from examples/coap-example/resources/res-b1-sep-b2.c rename to examples/coap/resources/res-b1-sep-b2.c diff --git a/examples/coap-example/resources/res-battery.c b/examples/coap/resources/res-battery.c similarity index 100% rename from examples/coap-example/resources/res-battery.c rename to examples/coap/resources/res-battery.c diff --git a/examples/coap-example/resources/res-chunks.c b/examples/coap/resources/res-chunks.c similarity index 100% rename from examples/coap-example/resources/res-chunks.c rename to examples/coap/resources/res-chunks.c diff --git a/examples/coap-example/resources/res-event.c b/examples/coap/resources/res-event.c similarity index 100% rename from examples/coap-example/resources/res-event.c rename to examples/coap/resources/res-event.c diff --git a/examples/coap-example/resources/res-hello.c b/examples/coap/resources/res-hello.c similarity index 100% rename from examples/coap-example/resources/res-hello.c rename to examples/coap/resources/res-hello.c diff --git a/examples/coap-example/resources/res-leds.c b/examples/coap/resources/res-leds.c similarity index 100% rename from examples/coap-example/resources/res-leds.c rename to examples/coap/resources/res-leds.c diff --git a/examples/coap-example/resources/res-light.c b/examples/coap/resources/res-light.c similarity index 100% rename from examples/coap-example/resources/res-light.c rename to examples/coap/resources/res-light.c diff --git a/examples/coap-example/resources/res-mirror.c b/examples/coap/resources/res-mirror.c similarity index 100% rename from examples/coap-example/resources/res-mirror.c rename to examples/coap/resources/res-mirror.c diff --git a/examples/coap-example/resources/res-plugtest-create1.c b/examples/coap/resources/res-plugtest-create1.c similarity index 100% rename from examples/coap-example/resources/res-plugtest-create1.c rename to examples/coap/resources/res-plugtest-create1.c diff --git a/examples/coap-example/resources/res-plugtest-create2.c b/examples/coap/resources/res-plugtest-create2.c similarity index 100% rename from examples/coap-example/resources/res-plugtest-create2.c rename to examples/coap/resources/res-plugtest-create2.c diff --git a/examples/coap-example/resources/res-plugtest-create3.c b/examples/coap/resources/res-plugtest-create3.c similarity index 100% rename from examples/coap-example/resources/res-plugtest-create3.c rename to examples/coap/resources/res-plugtest-create3.c diff --git a/examples/coap-example/resources/res-plugtest-large-create.c b/examples/coap/resources/res-plugtest-large-create.c similarity index 100% rename from examples/coap-example/resources/res-plugtest-large-create.c rename to examples/coap/resources/res-plugtest-large-create.c diff --git a/examples/coap-example/resources/res-plugtest-large-update.c b/examples/coap/resources/res-plugtest-large-update.c similarity index 100% rename from examples/coap-example/resources/res-plugtest-large-update.c rename to examples/coap/resources/res-plugtest-large-update.c diff --git a/examples/coap-example/resources/res-plugtest-large.c b/examples/coap/resources/res-plugtest-large.c similarity index 100% rename from examples/coap-example/resources/res-plugtest-large.c rename to examples/coap/resources/res-plugtest-large.c diff --git a/examples/coap-example/resources/res-plugtest-links.c b/examples/coap/resources/res-plugtest-links.c similarity index 100% rename from examples/coap-example/resources/res-plugtest-links.c rename to examples/coap/resources/res-plugtest-links.c diff --git a/examples/coap-example/resources/res-plugtest-locquery.c b/examples/coap/resources/res-plugtest-locquery.c similarity index 100% rename from examples/coap-example/resources/res-plugtest-locquery.c rename to examples/coap/resources/res-plugtest-locquery.c diff --git a/examples/coap-example/resources/res-plugtest-longpath.c b/examples/coap/resources/res-plugtest-longpath.c similarity index 100% rename from examples/coap-example/resources/res-plugtest-longpath.c rename to examples/coap/resources/res-plugtest-longpath.c diff --git a/examples/coap-example/resources/res-plugtest-multi.c b/examples/coap/resources/res-plugtest-multi.c similarity index 100% rename from examples/coap-example/resources/res-plugtest-multi.c rename to examples/coap/resources/res-plugtest-multi.c diff --git a/examples/coap-example/resources/res-plugtest-obs.c b/examples/coap/resources/res-plugtest-obs.c similarity index 100% rename from examples/coap-example/resources/res-plugtest-obs.c rename to examples/coap/resources/res-plugtest-obs.c diff --git a/examples/coap-example/resources/res-plugtest-path.c b/examples/coap/resources/res-plugtest-path.c similarity index 100% rename from examples/coap-example/resources/res-plugtest-path.c rename to examples/coap/resources/res-plugtest-path.c diff --git a/examples/coap-example/resources/res-plugtest-query.c b/examples/coap/resources/res-plugtest-query.c similarity index 100% rename from examples/coap-example/resources/res-plugtest-query.c rename to examples/coap/resources/res-plugtest-query.c diff --git a/examples/coap-example/resources/res-plugtest-separate.c b/examples/coap/resources/res-plugtest-separate.c similarity index 100% rename from examples/coap-example/resources/res-plugtest-separate.c rename to examples/coap/resources/res-plugtest-separate.c diff --git a/examples/coap-example/resources/res-plugtest-test.c b/examples/coap/resources/res-plugtest-test.c similarity index 100% rename from examples/coap-example/resources/res-plugtest-test.c rename to examples/coap/resources/res-plugtest-test.c diff --git a/examples/coap-example/resources/res-plugtest-validate.c b/examples/coap/resources/res-plugtest-validate.c similarity index 100% rename from examples/coap-example/resources/res-plugtest-validate.c rename to examples/coap/resources/res-plugtest-validate.c diff --git a/examples/coap-example/resources/res-push.c b/examples/coap/resources/res-push.c similarity index 100% rename from examples/coap-example/resources/res-push.c rename to examples/coap/resources/res-push.c diff --git a/examples/coap-example/resources/res-radio.c b/examples/coap/resources/res-radio.c similarity index 100% rename from examples/coap-example/resources/res-radio.c rename to examples/coap/resources/res-radio.c diff --git a/examples/coap-example/resources/res-separate.c b/examples/coap/resources/res-separate.c similarity index 100% rename from examples/coap-example/resources/res-separate.c rename to examples/coap/resources/res-separate.c diff --git a/examples/coap-example/resources/res-sht11.c b/examples/coap/resources/res-sht11.c similarity index 100% rename from examples/coap-example/resources/res-sht11.c rename to examples/coap/resources/res-sht11.c diff --git a/examples/coap-example/resources/res-sub.c b/examples/coap/resources/res-sub.c similarity index 100% rename from examples/coap-example/resources/res-sub.c rename to examples/coap/resources/res-sub.c diff --git a/examples/coap-example/resources/res-temperature.c b/examples/coap/resources/res-temperature.c similarity index 100% rename from examples/coap-example/resources/res-temperature.c rename to examples/coap/resources/res-temperature.c diff --git a/examples/coap-example/resources/res-toggle.c b/examples/coap/resources/res-toggle.c similarity index 100% rename from examples/coap-example/resources/res-toggle.c rename to examples/coap/resources/res-toggle.c diff --git a/examples/coap-example/server-client-native.csc b/examples/coap/server-client-native.csc similarity index 96% rename from examples/coap-example/server-client-native.csc rename to examples/coap/server-client-native.csc index db8daba1a..cec9ca8a7 100644 --- a/examples/coap-example/server-client-native.csc +++ b/examples/coap/server-client-native.csc @@ -48,9 +48,9 @@ org.contikios.cooja.mspmote.SkyMoteType server Erbium Server - [CONTIKI_DIR]/examples/coap-example/coap-example-server.c + [CONTIKI_DIR]/examples/coap/coap-example-server.c make coap-example-server.sky TARGET=sky - [CONTIKI_DIR]/examples/coap-example/coap-example-server.sky + [CONTIKI_DIR]/examples/coap/coap-example-server.sky org.contikios.cooja.interfaces.Position org.contikios.cooja.interfaces.RimeAddress org.contikios.cooja.interfaces.IPAddress @@ -71,9 +71,9 @@ org.contikios.cooja.mspmote.SkyMoteType client Erbium Client - [CONTIKI_DIR]/examples/coap-example/coap-example-client.c + [CONTIKI_DIR]/examples/coap/coap-example-client.c make coap-example-client.sky TARGET=sky - [CONTIKI_DIR]/examples/coap-example/coap-example-client.sky + [CONTIKI_DIR]/examples/coap/coap-example-client.sky org.contikios.cooja.interfaces.Position org.contikios.cooja.interfaces.RimeAddress org.contikios.cooja.interfaces.IPAddress diff --git a/examples/coap-example/server-client-observe.csc b/examples/coap/server-client-observe.csc similarity index 95% rename from examples/coap-example/server-client-observe.csc rename to examples/coap/server-client-observe.csc index 0b6c51d44..a7c9cca8b 100644 --- a/examples/coap-example/server-client-observe.csc +++ b/examples/coap/server-client-observe.csc @@ -48,9 +48,9 @@ org.contikios.cooja.mspmote.SkyMoteType server Erbium Server - [CONTIKI_DIR]/examples/coap-example/coap-example-server.c + [CONTIKI_DIR]/examples/coap/coap-example-server.c make coap-example-server.sky TARGET=sky - [CONTIKI_DIR]/examples/coap-example/coap-example-server.sky + [CONTIKI_DIR]/examples/coap/coap-example-server.sky org.contikios.cooja.interfaces.Position org.contikios.cooja.interfaces.RimeAddress org.contikios.cooja.interfaces.IPAddress @@ -71,9 +71,9 @@ org.contikios.cooja.mspmote.SkyMoteType client Erbium Client - [CONTIKI_DIR]/examples/coap-example/coap-example-observe-client.c + [CONTIKI_DIR]/examples/coap/coap-example-observe-client.c make coap-example-observe-client.sky TARGET=sky - [CONTIKI_DIR]/examples/coap-example/coap-example-observe-client.sky + [CONTIKI_DIR]/examples/coap/coap-example-observe-client.sky org.contikios.cooja.interfaces.Position org.contikios.cooja.interfaces.RimeAddress org.contikios.cooja.interfaces.IPAddress diff --git a/examples/coap-example/server-client.csc b/examples/coap/server-client.csc similarity index 96% rename from examples/coap-example/server-client.csc rename to examples/coap/server-client.csc index 9e8353d79..a649d048a 100644 --- a/examples/coap-example/server-client.csc +++ b/examples/coap/server-client.csc @@ -48,9 +48,9 @@ org.contikios.cooja.mspmote.SkyMoteType server Erbium Server - [CONTIKI_DIR]/examples/coap-example/coap-example-server.c + [CONTIKI_DIR]/examples/coap/coap-example-server.c make coap-example-server.sky TARGET=sky - [CONTIKI_DIR]/examples/coap-example/coap-example-server.sky + [CONTIKI_DIR]/examples/coap/coap-example-server.sky org.contikios.cooja.interfaces.Position org.contikios.cooja.interfaces.RimeAddress org.contikios.cooja.interfaces.IPAddress @@ -71,9 +71,9 @@ org.contikios.cooja.mspmote.SkyMoteType client Erbium Client - [CONTIKI_DIR]/examples/coap-example/coap-example-client.c + [CONTIKI_DIR]/examples/coap/coap-example-client.c make coap-example-client.sky TARGET=sky - [CONTIKI_DIR]/examples/coap-example/coap-example-client.sky + [CONTIKI_DIR]/examples/coap/coap-example-client.sky org.contikios.cooja.interfaces.Position org.contikios.cooja.interfaces.RimeAddress org.contikios.cooja.interfaces.IPAddress diff --git a/examples/coap-example/server-only.csc b/examples/coap/server-only.csc similarity index 97% rename from examples/coap-example/server-only.csc rename to examples/coap/server-only.csc index 683a96a38..715deae1c 100644 --- a/examples/coap-example/server-only.csc +++ b/examples/coap/server-only.csc @@ -48,9 +48,9 @@ org.contikios.cooja.mspmote.SkyMoteType server Erbium Server - [CONTIKI_DIR]/examples/coap-example/coap-example-server.c + [CONTIKI_DIR]/examples/coap/coap-example-server.c make coap-example-server.sky TARGET=sky - [CONTIKI_DIR]/examples/coap-example/coap-example-server.sky + [CONTIKI_DIR]/examples/coap/coap-example-server.sky org.contikios.cooja.interfaces.Position org.contikios.cooja.interfaces.RimeAddress org.contikios.cooja.interfaces.IPAddress diff --git a/tests/02-compile-arm-ports/Makefile b/tests/02-compile-arm-ports/Makefile index 172769621..c6dddad5e 100644 --- a/tests/02-compile-arm-ports/Makefile +++ b/tests/02-compile-arm-ports/Makefile @@ -16,7 +16,7 @@ rpl-border-router/cc2538dk \ rpl-border-router/srf06-cc26xx:BOARD=launchpad/cc2650 \ rpl-border-router/zoul \ rpl-udp/cc2538dk \ -coap-example/cc2538dk \ +coap/cc2538dk \ slip-radio/cc2538dk \ ipso-objects/cc2538dk \ multicast/cc2538dk \ @@ -29,7 +29,7 @@ platform-specific/cc2538-common/mqtt-demo/zoul \ platform-specific/cc2538-common/crypto/zoul \ platform-specific/cc2538-common/pka/zoul \ platform-specific/zoul/orion/ip64-router/zoul:BOARD=orion \ -coap-example/zoul \ +coap/zoul \ ipso-objects/zoul \ hello-world/zoul \ sensniff/cc2538dk \