iox-eclipse-iceoryx#2130 Move 'filesystem' types from 'iceoryx_dust' …

…to 'iceoryx_hoofs'
EgorWeders · Dec 12, 2023 · 08967a7 · 08967a7
1 parent ff5e7f2
commit 08967a7
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 9 deletions.
diff --git a/iceoryx_dust/BUILD.bazel b/iceoryx_dust/BUILD.bazel
@@ -31,16 +31,14 @@ cc_library(
     name = "iceoryx_dust",
     srcs = glob([
         "cli/source/**/*.cpp",
-        "filesystem/source/**/*.cpp",
         "posix/ipc/source/**/*.cpp",
         "posix/sync/source/**/*.cpp",
     ]),
-    hdrs = glob(["cli/**"]) + glob(["filesystem/**"]) + glob(["memory/**"]) + glob(["utility/**"]) + glob(["posix/ipc/**"]) + glob(["posix/sync/**"]) + [
+    hdrs = glob(["cli/**"]) + glob(["memory/**"]) + glob(["utility/**"]) + glob(["posix/ipc/**"]) + glob(["posix/sync/**"]) + [
         ":iceoryx_dust_deployment_hpp",
     ],
     includes = [
         "cli/include/",
-        "filesystem/include/",
         "generated/include/",
         "memory/include/",
         "posix/ipc/include/",

diff --git a/iceoryx_dust/CMakeLists.txt b/iceoryx_dust/CMakeLists.txt
@@ -47,15 +47,13 @@ iox_add_library(
     PRIVATE_LIBS_LINUX          ${CODE_COVERAGE_LIBS}
     PUBLIC_LIBS                 iceoryx_hoofs::iceoryx_hoofs
     BUILD_INTERFACE             ${PROJECT_SOURCE_DIR}/cli/include
-                                ${PROJECT_SOURCE_DIR}/filesystem/include
                                 ${PROJECT_SOURCE_DIR}/memory/include
                                 ${PROJECT_SOURCE_DIR}/posix/ipc/include
                                 ${PROJECT_SOURCE_DIR}/posix/sync/include
                                 ${PROJECT_SOURCE_DIR}/utility/include
                                 ${CMAKE_BINARY_DIR}/generated/iceoryx_dust/include
     INSTALL_INTERFACE           include/${PREFIX}
     EXPORT_INCLUDE_DIRS         cli/include/
-                                filesystem/include/
                                 memory/include/
                                 posix/ipc/include/
                                 posix/sync/include/
@@ -66,7 +64,6 @@ iox_add_library(
         cli/source/option.cpp
         cli/source/option_definition.cpp
         cli/source/option_manager.cpp
-        filesystem/source/file_reader.cpp
         posix/ipc/source/message_queue.cpp
         posix/ipc/source/named_pipe.cpp
         posix/sync/source/signal_watcher.cpp

diff --git a/iceoryx_hoofs/CMakeLists.txt b/iceoryx_hoofs/CMakeLists.txt
@@ -96,6 +96,7 @@ iox_add_library(
                                 posix/vocabulary/include/
     FILES
         design/source/functional_interface.cpp
+        filesystem/source/file_reader.cpp
         filesystem/source/filesystem.cpp
         memory/source/bump_allocator.cpp
         memory/source/memory.cpp

diff --git a/iceoryx_hoofs/README.md b/iceoryx_hoofs/README.md
@@ -62,6 +62,7 @@ The module structure is a logical grouping. It is replicated for `concurrent` an
 |`filesystem`           |          | Implementation of C++17 filesystem features for instance `iox::access_rights` and `iox::perms` to abstract file permissions                                                                                                                                    |
 |`PosixAcl`             | i        | Interface for Access Control Lists (ACL).                                                                                                                                                                                             |
 |`FileLock`             |          | File lock C++ wrapping class.                                                                                                                                                                                                         |
+|`FileReader`           | Wrapper for opening files and reading them.                                                                                                                                                                                                                                                                           |
 
 ### Functional (functional)
 

diff --git a/...st/filesystem/include/iox/file_reader.hpp → ...fs/filesystem/include/iox/file_reader.hpp b/...st/filesystem/include/iox/file_reader.hpp → ...fs/filesystem/include/iox/file_reader.hpp
@@ -15,8 +15,8 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#ifndef IOX_DUST_FILESYSTEM_FILE_READER_HPP
-#define IOX_DUST_FILESYSTEM_FILE_READER_HPP
+#ifndef IOX_HOOFS_FILESYSTEM_FILE_READER_HPP
+#define IOX_HOOFS_FILESYSTEM_FILE_READER_HPP
 
 #include <fstream>
 
@@ -71,4 +71,4 @@ class FileReader
 
 } // namespace iox
 
-#endif // IOX_DUST_FILESYSTEM_FILE_READER_HPP
+#endif // IOX_HOOFS_FILESYSTEM_FILE_READER_HPP
diff --git a/...yx_dust/filesystem/source/file_reader.cpp → ...x_hoofs/filesystem/source/file_reader.cpp b/...yx_dust/filesystem/source/file_reader.cpp → ...x_hoofs/filesystem/source/file_reader.cpp
diff --git a/...duletests/test_filesystem_file_reader.cpp → ...duletests/test_filesystem_file_reader.cpp b/...duletests/test_filesystem_file_reader.cpp → ...duletests/test_filesystem_file_reader.cpp