From bbd058a57024ef547ecfe09055aa199ce50e3873 Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Fri, 1 Sep 2017 16:01:11 +0200 Subject: [PATCH] Move json to os/lib --- examples/ipv6/json-ws/Makefile | 3 ++- .../platform-specific/jn516x/rpl/coap-dongle-node/Makefile | 3 +-- .../platform-specific/jn516x/rpl/coap-dr1175-node/Makefile | 3 +-- .../platform-specific/jn516x/rpl/coap-dr1199-node/Makefile | 3 +-- .../jn516x/tsch/simple-sensor-network/node/Makefile | 3 +-- .../tsch/simple-sensor-network/rpl-border-router/Makefile | 3 +-- .../jn516x/tsch/tx-power-verification/node/Makefile | 3 +-- .../tsch/tx-power-verification/rpl-border-router/Makefile | 3 +-- .../platform-specific/jn516x/tsch/uart1-test-node/Makefile | 3 +-- {apps => os/lib}/json/json.h | 0 {apps => os/lib}/json/jsonparse.c | 0 {apps => os/lib}/json/jsonparse.h | 0 {apps => os/lib}/json/jsontree.c | 0 {apps => os/lib}/json/jsontree.h | 0 14 files changed, 10 insertions(+), 17 deletions(-) rename {apps => os/lib}/json/json.h (100%) rename {apps => os/lib}/json/jsonparse.c (100%) rename {apps => os/lib}/json/jsonparse.h (100%) rename {apps => os/lib}/json/jsontree.c (100%) rename {apps => os/lib}/json/jsontree.h (100%) diff --git a/examples/ipv6/json-ws/Makefile b/examples/ipv6/json-ws/Makefile index efeaa2374..f8e9e28df 100644 --- a/examples/ipv6/json-ws/Makefile +++ b/examples/ipv6/json-ws/Makefile @@ -11,7 +11,8 @@ ifdef WITH_UDP PROJECT_SOURCEFILES += json-ws-udp.c endif -APPS += httpd-ws json +APPS += httpd-ws +MODULES += os/lib/json CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\" diff --git a/examples/platform-specific/jn516x/rpl/coap-dongle-node/Makefile b/examples/platform-specific/jn516x/rpl/coap-dongle-node/Makefile index 4d18974bb..743963472 100644 --- a/examples/platform-specific/jn516x/rpl/coap-dongle-node/Makefile +++ b/examples/platform-specific/jn516x/rpl/coap-dongle-node/Makefile @@ -8,14 +8,13 @@ CONTIKI=../../../../.. CONTIKI_WITH_IPV6 = 1 -MODULES += os/net/mac/tsch +MODULES += os/net/mac/tsch os/lib/json PROJECTDIRS += .. ../tools PROJECT_SOURCEFILES += rpl-tools.c CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\" CFLAGS += -DWITH_COAP CFLAGS += -DUIP_CONF_TCP=0 -APPS = json APPS += er-coap include $(CONTIKI)/Makefile.include diff --git a/examples/platform-specific/jn516x/rpl/coap-dr1175-node/Makefile b/examples/platform-specific/jn516x/rpl/coap-dr1175-node/Makefile index efea366f5..6107de25c 100644 --- a/examples/platform-specific/jn516x/rpl/coap-dr1175-node/Makefile +++ b/examples/platform-specific/jn516x/rpl/coap-dr1175-node/Makefile @@ -8,14 +8,13 @@ CONTIKI=../../../../.. CONTIKI_WITH_IPV6 = 1 -MODULES += os/net/mac/tsch +MODULES += os/net/mac/tsch os/lib/json PROJECTDIRS += .. ../tools PROJECT_SOURCEFILES += rpl-tools.c CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\" CFLAGS += -DWITH_COAP CFLAGS += -DUIP_CONF_TCP=0 -APPS = json APPS += er-coap include $(CONTIKI)/Makefile.include diff --git a/examples/platform-specific/jn516x/rpl/coap-dr1199-node/Makefile b/examples/platform-specific/jn516x/rpl/coap-dr1199-node/Makefile index 3ee148824..f12c10f4b 100644 --- a/examples/platform-specific/jn516x/rpl/coap-dr1199-node/Makefile +++ b/examples/platform-specific/jn516x/rpl/coap-dr1199-node/Makefile @@ -8,14 +8,13 @@ CONTIKI=../../../../.. CONTIKI_WITH_IPV6 = 1 -MODULES += os/net/mac/tsch +MODULES += os/net/mac/tsch os/lib/json PROJECTDIRS += .. ../tools PROJECT_SOURCEFILES += rpl-tools.c CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\" CFLAGS += -DWITH_COAP CFLAGS += -DUIP_CONF_TCP=0 -APPS = json APPS += er-coap include $(CONTIKI)/Makefile.include diff --git a/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile b/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile index f49bdff34..0c7ae71e1 100644 --- a/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile +++ b/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile @@ -13,10 +13,9 @@ PROJECT_SOURCEFILES += rpl-tools.c CFLAGS += -DWITH_COAP CFLAGS += -DREST=coap_rest_implementation CFLAGS += -DUIP_CONF_TCP=0 -APPS += json APPS += er-coap -MODULES += os/net/mac/tsch os/services/orchestra +MODULES += os/net/mac/tsch os/services/orchestra os/lib/json all: $(CONTIKI_PROJECT) diff --git a/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile b/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile index 5c284a82d..f400ee6af 100644 --- a/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile +++ b/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile @@ -15,10 +15,9 @@ PROJECT_SOURCEFILES += rpl-tools.c CFLAGS += -DWITH_COAP CFLAGS += -DREST=coap_rest_implementation CFLAGS += -DUIP_CONF_TCP=0 -APPS += json APPS += er-coap -MODULES += os/net/mac/tsch os/services/orchestra +MODULES += os/net/mac/tsch os/services/orchestra os/lib/json all: $(CONTIKI_PROJECT) include $(CONTIKI)/Makefile.include diff --git a/examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile b/examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile index 3fef027dd..a9e1d813a 100644 --- a/examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile +++ b/examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile @@ -13,10 +13,9 @@ PROJECT_SOURCEFILES += rpl-tools.c CFLAGS += -DWITH_COAP CFLAGS += -DREST=coap_rest_implementation CFLAGS += -DUIP_CONF_TCP=0 -APPS += json APPS += er-coap -MODULES += os/net/mac/tsch os/services/orchestra +MODULES += os/net/mac/tsch os/services/orchestra os/lib/json all: $(CONTIKI_PROJECT) diff --git a/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/Makefile b/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/Makefile index 48cc65d97..ba0d3a5d2 100644 --- a/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/Makefile +++ b/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/Makefile @@ -16,10 +16,9 @@ PROJECT_SOURCEFILES += rpl-tools.c CFLAGS += -DWITH_COAP CFLAGS += -DREST=coap_rest_implementation CFLAGS += -DUIP_CONF_TCP=0 -APPS += json APPS += er-coap -MODULES += os/net/mac/tsch os/services/orchestra +MODULES += os/net/mac/tsch os/services/orchestra os/lib/json all: $(CONTIKI_PROJECT) include $(CONTIKI)/Makefile.include diff --git a/examples/platform-specific/jn516x/tsch/uart1-test-node/Makefile b/examples/platform-specific/jn516x/tsch/uart1-test-node/Makefile index 2880d9625..1c6307318 100644 --- a/examples/platform-specific/jn516x/tsch/uart1-test-node/Makefile +++ b/examples/platform-specific/jn516x/tsch/uart1-test-node/Makefile @@ -14,10 +14,9 @@ PROJECT_SOURCEFILES += rpl-tools.c CFLAGS += -DWITH_COAP CFLAGS += -DREST=coap_rest_implementation CFLAGS += -DUIP_CONF_TCP=0 -APPS += json APPS += er-coap -MODULES += os/net/mac/tsch os/services/orchestra +MODULES += os/net/mac/tsch os/services/orchestra os/lib/json all: $(CONTIKI_PROJECT) diff --git a/apps/json/json.h b/os/lib/json/json.h similarity index 100% rename from apps/json/json.h rename to os/lib/json/json.h diff --git a/apps/json/jsonparse.c b/os/lib/json/jsonparse.c similarity index 100% rename from apps/json/jsonparse.c rename to os/lib/json/jsonparse.c diff --git a/apps/json/jsonparse.h b/os/lib/json/jsonparse.h similarity index 100% rename from apps/json/jsonparse.h rename to os/lib/json/jsonparse.h diff --git a/apps/json/jsontree.c b/os/lib/json/jsontree.c similarity index 100% rename from apps/json/jsontree.c rename to os/lib/json/jsontree.c diff --git a/apps/json/jsontree.h b/os/lib/json/jsontree.h similarity index 100% rename from apps/json/jsontree.h rename to os/lib/json/jsontree.h