From c2d6e9146ce33416b4c7dbd329527f2e7e6c92f5 Mon Sep 17 00:00:00 2001
From: Lingkai Dong <lingkai.dong@arm.com>
Date: Wed, 11 Nov 2020 16:14:07 +0000
Subject: [PATCH] Turn TDBStore and FileSystemStore into standalone libraries

---
 .../include/filesystemstore}/FileSystemStore.h                 | 0
 storage/kvstore/filesystemstore/mbed_lib.json                  | 3 +++
 .../kvstore/{ => filesystemstore}/source/FileSystemStore.cpp   | 2 +-
 .../{include/kvstore => tdbstore/include/tdbstore}/TDBStore.h  | 0
 storage/kvstore/tdbstore/mbed_lib.json                         | 3 +++
 storage/kvstore/{ => tdbstore}/source/TDBStore.cpp             | 2 +-
 6 files changed, 8 insertions(+), 2 deletions(-)
 rename storage/kvstore/{include/kvstore => filesystemstore/include/filesystemstore}/FileSystemStore.h (100%)
 create mode 100644 storage/kvstore/filesystemstore/mbed_lib.json
 rename storage/kvstore/{ => filesystemstore}/source/FileSystemStore.cpp (99%)
 rename storage/kvstore/{include/kvstore => tdbstore/include/tdbstore}/TDBStore.h (100%)
 create mode 100644 storage/kvstore/tdbstore/mbed_lib.json
 rename storage/kvstore/{ => tdbstore}/source/TDBStore.cpp (99%)

diff --git a/storage/kvstore/include/kvstore/FileSystemStore.h b/storage/kvstore/filesystemstore/include/filesystemstore/FileSystemStore.h
similarity index 100%
rename from storage/kvstore/include/kvstore/FileSystemStore.h
rename to storage/kvstore/filesystemstore/include/filesystemstore/FileSystemStore.h
diff --git a/storage/kvstore/filesystemstore/mbed_lib.json b/storage/kvstore/filesystemstore/mbed_lib.json
new file mode 100644
index 0000000000..dbcba1eacf
--- /dev/null
+++ b/storage/kvstore/filesystemstore/mbed_lib.json
@@ -0,0 +1,3 @@
+{
+    "name": "filesystemstore"
+}
diff --git a/storage/kvstore/source/FileSystemStore.cpp b/storage/kvstore/filesystemstore/source/FileSystemStore.cpp
similarity index 99%
rename from storage/kvstore/source/FileSystemStore.cpp
rename to storage/kvstore/filesystemstore/source/FileSystemStore.cpp
index 7f5ad5d320..c4a36c714e 100644
--- a/storage/kvstore/source/FileSystemStore.cpp
+++ b/storage/kvstore/filesystemstore/source/FileSystemStore.cpp
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-#include "kvstore/FileSystemStore.h"
+#include "filesystemstore/FileSystemStore.h"
 #include "kv_config/kv_config.h"
 #include "filesystem/Dir.h"
 #include "filesystem/File.h"
diff --git a/storage/kvstore/include/kvstore/TDBStore.h b/storage/kvstore/tdbstore/include/tdbstore/TDBStore.h
similarity index 100%
rename from storage/kvstore/include/kvstore/TDBStore.h
rename to storage/kvstore/tdbstore/include/tdbstore/TDBStore.h
diff --git a/storage/kvstore/tdbstore/mbed_lib.json b/storage/kvstore/tdbstore/mbed_lib.json
new file mode 100644
index 0000000000..9ae5f7a889
--- /dev/null
+++ b/storage/kvstore/tdbstore/mbed_lib.json
@@ -0,0 +1,3 @@
+{
+    "name": "tdbstore"
+}
diff --git a/storage/kvstore/source/TDBStore.cpp b/storage/kvstore/tdbstore/source/TDBStore.cpp
similarity index 99%
rename from storage/kvstore/source/TDBStore.cpp
rename to storage/kvstore/tdbstore/source/TDBStore.cpp
index 6c74ac0a1e..5d1539dcf5 100644
--- a/storage/kvstore/source/TDBStore.cpp
+++ b/storage/kvstore/tdbstore/source/TDBStore.cpp
@@ -16,7 +16,7 @@
 
 // ----------------------------------------------------------- Includes -----------------------------------------------------------
 
-#include "kvstore/TDBStore.h"
+#include "tdbstore/TDBStore.h"
 
 #include <algorithm>
 #include <string.h>