Moved Antelope to a new storage directory.

2017-09-01 15:43:43 +02:00 · 2017-09-01 15:43:43 +02:00 · c528562908
parent 4a14896770
commit c528562908
26 changed files with 4 additions and 3 deletions
--- a/Makefile.include
+++ b/Makefile.include
@ -100,7 +100,7 @@ endif
 CONTIKI_SOURCEFILES += $(CONTIKIFILES)

 CONTIKIDIRS += ${addprefix $(CONTIKI)/os/,dev lib net net/mac \
-                 sys cfs . }
+                 storage storage/cfs sys . }

 oname = ${patsubst %.c,%.o,${patsubst %.S,%.o,$(1)}}

--- a/examples/antelope/shell/Makefile
+++ b/examples/antelope/shell/Makefile
@ -1,6 +1,7 @@
-CONTIKI = ../../../
+CONTIKI = ../../..

-APPS += antelope unit-test
+MODULES += os/storage/antelope
+APPS += unit-test

 all: shell-db

--- a/os/storage/antelope/antelope.c
+++ b/os/storage/antelope/antelope.c
--- a/os/storage/antelope/antelope.h
+++ b/os/storage/antelope/antelope.h
--- a/os/storage/antelope/aql-adt.c
+++ b/os/storage/antelope/aql-adt.c
--- a/os/storage/antelope/aql-exec.c
+++ b/os/storage/antelope/aql-exec.c
--- a/os/storage/antelope/aql-lexer.c
+++ b/os/storage/antelope/aql-lexer.c
--- a/os/storage/antelope/aql-parser.c
+++ b/os/storage/antelope/aql-parser.c
--- a/os/storage/antelope/aql.h
+++ b/os/storage/antelope/aql.h
--- a/os/storage/antelope/attribute.h
+++ b/os/storage/antelope/attribute.h
--- a/os/storage/antelope/db-options.h
+++ b/os/storage/antelope/db-options.h
--- a/os/storage/antelope/db-types.h
+++ b/os/storage/antelope/db-types.h
--- a/os/storage/antelope/debug.h
+++ b/os/storage/antelope/debug.h
--- a/os/storage/antelope/index-inline.c
+++ b/os/storage/antelope/index-inline.c
--- a/os/storage/antelope/index-maxheap.c
+++ b/os/storage/antelope/index-maxheap.c
--- a/os/storage/antelope/index-memhash.c
+++ b/os/storage/antelope/index-memhash.c
--- a/os/storage/antelope/index.c
+++ b/os/storage/antelope/index.c
--- a/os/storage/antelope/index.h
+++ b/os/storage/antelope/index.h
--- a/os/storage/antelope/lvm.c
+++ b/os/storage/antelope/lvm.c
--- a/os/storage/antelope/lvm.h
+++ b/os/storage/antelope/lvm.h
--- a/os/storage/antelope/relation.c
+++ b/os/storage/antelope/relation.c
--- a/os/storage/antelope/relation.h
+++ b/os/storage/antelope/relation.h
--- a/os/storage/antelope/result.c
+++ b/os/storage/antelope/result.c
--- a/os/storage/antelope/result.h
+++ b/os/storage/antelope/result.h
--- a/os/storage/antelope/storage-cfs.c
+++ b/os/storage/antelope/storage-cfs.c
--- a/os/storage/antelope/storage.h
+++ b/os/storage/antelope/storage.h