Start splitting fspp-fuse from fspp-interface

src/cryfs-cli/CMakeLists.txt

@@ -12,7 +12,7 @@ set(SOURCES
 )
 
 add_library(${PROJECT_NAME} ${SOURCES})
-target_link_libraries(${PROJECT_NAME} PUBLIC cryfs cpp-utils gitversion)
+target_link_libraries(${PROJECT_NAME} PUBLIC cryfs cpp-utils gitversion fspp-fuse)
 target_enable_style_warnings(${PROJECT_NAME})
 target_activate_cpp14(${PROJECT_NAME})
 

src/cryfs/CMakeLists.txt

@@ -48,8 +48,7 @@ set(LIB_SOURCES
 
 add_library(${PROJECT_NAME} STATIC ${LIB_SOURCES})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME cryfs)
-target_link_libraries(${PROJECT_NAME} PUBLIC cpp-utils fspp)
-target_link_libraries(${PROJECT_NAME} PRIVATE blockstore blobstore gitversion) # TODO Check that dependent projects don't get this linked in
+target_link_libraries(${PROJECT_NAME} PUBLIC cpp-utils fspp-interface blockstore blobstore gitversion)
 target_add_boost(${PROJECT_NAME} program_options chrono) # TODO Check that dependent projects don't get boost added (use PRIVATE here)
 target_enable_style_warnings(${PROJECT_NAME})
 target_activate_cpp14(${PROJECT_NAME})

src/cryfs/filesystem/CryDevice.cpp

@@ -7,7 +7,7 @@
 #include "CryFile.h"
 #include "CrySymlink.h"
 
-#include <fspp/fuse/FuseErrnoException.h>
+#include <fspp/fs_interface/FuseErrnoException.h>
 #include <blobstore/implementations/onblocks/BlobStoreOnBlocks.h>
 #include <blobstore/implementations/onblocks/BlobOnBlocks.h>
 #include <blockstore/implementations/low2highlevel/LowToHighLevelBlockStore.h>

src/cryfs/filesystem/CryDir.cpp

@@ -5,7 +5,7 @@
 #include <fcntl.h>
 #include <dirent.h>
 
-#include <fspp/fuse/FuseErrnoException.h>
+#include <fspp/fs_interface/FuseErrnoException.h>
 #include "CryDevice.h"
 #include "CryFile.h"
 #include "CryOpenFile.h"

src/cryfs/filesystem/CryFile.cpp

@@ -2,7 +2,7 @@
 
 #include "CryDevice.h"
 #include "CryOpenFile.h"
-#include <fspp/fuse/FuseErrnoException.h>
+#include <fspp/fs_interface/FuseErrnoException.h>
 
 
 //TODO Get rid of this in favor of exception hierarchy

src/cryfs/filesystem/CryNode.cpp

@@ -5,7 +5,7 @@
 #include "CryDevice.h"
 #include "CryDir.h"
 #include "CryFile.h"
-#include <fspp/fuse/FuseErrnoException.h>
+#include <fspp/fs_interface/FuseErrnoException.h>
 #include <cpp-utils/pointer/cast.h>
 #include <cpp-utils/system/time.h>
 #include <cpp-utils/system/stat.h>

src/cryfs/filesystem/CryOpenFile.cpp

@@ -4,7 +4,7 @@
 #include <fcntl.h>
 
 #include "CryDevice.h"
-#include <fspp/fuse/FuseErrnoException.h>
+#include <fspp/fs_interface/FuseErrnoException.h>
 
 
 using std::shared_ptr;

src/cryfs/filesystem/CrySymlink.cpp

@@ -1,6 +1,6 @@
 #include "CrySymlink.h"
 
-#include <fspp/fuse/FuseErrnoException.h>
+#include <fspp/fs_interface/FuseErrnoException.h>
 #include "CryDevice.h"
 #include "CrySymlink.h"
 #include "parallelaccessfsblobstore/SymlinkBlobRef.h"

src/cryfs/filesystem/fsblobstore/DirBlob.cpp

@@ -2,7 +2,7 @@
 #include <cassert>
 
 //TODO Remove and replace with exception hierarchy
-#include <fspp/fuse/FuseErrnoException.h>
+#include <fspp/fs_interface/FuseErrnoException.h>
 
 #include <blobstore/implementations/onblocks/utils/Math.h>
 #include <cpp-utils/data/Data.h>

src/cryfs/filesystem/fsblobstore/utils/DirEntryList.cpp

@@ -3,7 +3,7 @@
 #include <cpp-utils/system/time.h>
 
 //TODO Get rid of that in favor of better error handling
-#include <fspp/fuse/FuseErrnoException.h>
+#include <fspp/fs_interface/FuseErrnoException.h>
 
 using cpputils::Data;
 using std::string;

src/fspp/CMakeLists.txt

@@ -1,26 +1,2 @@
-project (fspp)
-
-set(SOURCES
-  impl/FilesystemImpl.cpp
-  impl/Profiler.cpp
-  fuse/Fuse.cpp
-)
-
-add_library(${PROJECT_NAME} STATIC ${SOURCES})
-
-target_compile_definitions(${PROJECT_NAME} PUBLIC _FILE_OFFSET_BITS=64)
-target_link_libraries(${PROJECT_NAME} PUBLIC cpp-utils)
-
-target_add_boost(${PROJECT_NAME} filesystem system thread chrono)
-target_enable_style_warnings(${PROJECT_NAME})
-target_activate_cpp14(${PROJECT_NAME})
-
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  set(CMAKE_FIND_FRAMEWORK LAST)
-  set(FUSE_LIB_NAME "osxfuse")
-else(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  set(FUSE_LIB_NAME "fuse")
-endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-
-find_library_with_path(FUSE ${FUSE_LIB_NAME} FUSE_LIB_PATH)
-target_link_libraries(${PROJECT_NAME} PUBLIC ${FUSE})
+add_subdirectory(fs_interface)
+add_subdirectory(fuse)

src/fspp/fs_interface/CMakeLists.txt

@@ -0,0 +1,18 @@
+project (fspp-interface)
+
+set(SOURCES
+  Device.cpp
+  Dir.cpp
+  File.cpp
+  Node.cpp
+  OpenFile.cpp
+  Symlink.cpp
+)
+
+add_library(${PROJECT_NAME} STATIC ${SOURCES})
+
+target_link_libraries(${PROJECT_NAME} PUBLIC cpp-utils)
+
+target_add_boost(${PROJECT_NAME} filesystem system)
+target_enable_style_warnings(${PROJECT_NAME})
+target_activate_cpp14(${PROJECT_NAME})

src/fspp/fs_interface/Device.cpp

@@ -0,0 +1 @@
+#include "Device.h"

src/fspp/fs_interface/Dir.cpp

@@ -0,0 +1 @@
+#include "Dir.h"

src/fspp/fs_interface/File.cpp

@@ -0,0 +1 @@
+#include "File.h"

src/fspp/fs_interface/FuseErrnoException.cpp

@@ -0,0 +1 @@
+#include "FuseErrnoException.h"

src/fspp/fs_interface/FuseErrnoException.h

@@ -6,6 +6,8 @@
 #include <errno.h>
 #include <cpp-utils/assert/assert.h>
 
+// TODO Need a portable way to report errors
+
 namespace fspp {
 namespace fuse{
 

src/fspp/fs_interface/Node.cpp

@@ -0,0 +1 @@
+#include "Node.h"

src/fspp/fs_interface/OpenFile.cpp

@@ -0,0 +1 @@
+#include "OpenFile.h"

src/fspp/fs_interface/Symlink.cpp

@@ -0,0 +1 @@
+#include "Symlink.h"

src/fspp/fstest/FsppDeviceTest.h

@@ -2,7 +2,7 @@
 #ifndef MESSMER_FSPP_FSTEST_FSPPDEVICETEST_H_
 #define MESSMER_FSPP_FSTEST_FSPPDEVICETEST_H_
 
-#include <fspp/fuse/FuseErrnoException.h>
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 template<class ConcreteFileSystemTestFixture>
 class FsppDeviceTest: public FileSystemTest<ConcreteFileSystemTestFixture> {

src/fspp/fstest/FsppNodeTest_Rename.h

@@ -3,7 +3,7 @@
 #define MESSMER_FSPP_FSTEST_FSPPNODETEST_RENAME_H_
 
 #include "testutils/FsppNodeTest.h"
-#include "../fuse/FuseErrnoException.h"
+#include "../fs_interface/FuseErrnoException.h"
 
 template<class ConcreteFileSystemTestFixture>
 class FsppNodeTest_Rename: public FsppNodeTest<ConcreteFileSystemTestFixture> {

src/fspp/fstest/FsppNodeTest_Stat.h

@@ -3,7 +3,7 @@
 #define MESSMER_FSPP_FSTEST_FSPPNODETEST_STAT_H_
 
 #include "testutils/FsppNodeTest.h"
-#include "../fuse/FuseErrnoException.h"
+#include "../fs_interface/FuseErrnoException.h"
 
 template<class ConcreteFileSystemTestFixture>
 class FsppNodeTest_Stat: public FsppNodeTest<ConcreteFileSystemTestFixture> {

src/fspp/fstest/FsppNodeTest_Timestamps.h

@@ -3,7 +3,7 @@
 #define MESSMER_FSPP_FSTEST_FSPPNODETEST_TIMESTAMPS_H_
 
 #include "testutils/FsppNodeTest.h"
-#include "../fuse/FuseErrnoException.h"
+#include "../fs_interface/FuseErrnoException.h"
 #include "testutils/TimestampTestUtils.h"
 #include <cpp-utils/system/stat.h>
 

src/fspp/fuse/CMakeLists.txt

@@ -0,0 +1,26 @@
+project (fspp-fuse)
+
+set(SOURCES
+  ../impl/FilesystemImpl.cpp
+  ../impl/Profiler.cpp
+  ../fuse/Fuse.cpp
+)
+
+add_library(${PROJECT_NAME} STATIC ${SOURCES})
+
+target_compile_definitions(${PROJECT_NAME} PUBLIC _FILE_OFFSET_BITS=64)
+target_link_libraries(${PROJECT_NAME} PUBLIC cpp-utils)
+
+target_add_boost(${PROJECT_NAME} filesystem system thread chrono)
+target_enable_style_warnings(${PROJECT_NAME})
+target_activate_cpp14(${PROJECT_NAME})
+
+if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+  set(CMAKE_FIND_FRAMEWORK LAST)
+  set(FUSE_LIB_NAME "osxfuse")
+else(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+  set(FUSE_LIB_NAME "fuse")
+endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+
+find_library_with_path(FUSE ${FUSE_LIB_NAME} FUSE_LIB_PATH)
+target_link_libraries(${PROJECT_NAME} PUBLIC ${FUSE})

src/fspp/fuse/Fuse.cpp

@@ -2,7 +2,7 @@
 #include <memory>
 #include <cassert>
 
-#include "FuseErrnoException.h"
+#include "../fs_interface/FuseErrnoException.h"
 #include "Filesystem.h"
 #include <iostream>
 #include <cpp-utils/assert/assert.h>

src/fspp/impl/FilesystemImpl.cpp

@@ -5,7 +5,7 @@
 #include "../fs_interface/Dir.h"
 #include "../fs_interface/Symlink.h"
 
-#include "../fuse/FuseErrnoException.h"
+#include "../fs_interface/FuseErrnoException.h"
 #include "../fs_interface/File.h"
 #include "../fs_interface/Node.h"
 

test/fspp/CMakeLists.txt

@@ -103,7 +103,7 @@ set(SOURCES
         testutils/OpenFileHandle.cpp testutils/OpenFileHandle.h)
 
 add_executable(${PROJECT_NAME} ${SOURCES})
-target_link_libraries(${PROJECT_NAME} googletest fspp)
+target_link_libraries(${PROJECT_NAME} googletest fspp-interface fspp-fuse)
 add_test(${PROJECT_NAME} ${PROJECT_NAME})
 
 target_enable_style_warnings(${PROJECT_NAME})

test/fspp/fuse/access/FuseAccessErrorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseAccessTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;

test/fspp/fuse/createAndOpenFile/FuseCreateAndOpenErrorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseCreateAndOpenTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 using ::testing::WithParamInterface;
 using ::testing::Values;

test/fspp/fuse/fdatasync/FuseFdatasyncErrorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseFdatasyncTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 using ::testing::Throw;
 using ::testing::WithParamInterface;

test/fspp/fuse/fdatasync/FuseFdatasyncFileDescriptorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseFdatasyncTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 using ::testing::WithParamInterface;
 using ::testing::Values;

test/fspp/fuse/flush/FuseFlushErrorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseFlushTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 using ::testing::WithParamInterface;
 using ::testing::StrEq;

test/fspp/fuse/fstat/FuseFstatErrorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseFstatTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::WithParamInterface;

test/fspp/fuse/fstat/FuseFstatParameterTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseFstatTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::WithParamInterface;

test/fspp/fuse/fsync/FuseFsyncErrorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseFsyncTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 using ::testing::Throw;
 using ::testing::WithParamInterface;

test/fspp/fuse/fsync/FuseFsyncFileDescriptorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseFsyncTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 using ::testing::WithParamInterface;
 using ::testing::Values;

test/fspp/fuse/ftruncate/FuseFTruncateErrorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseFTruncateTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::Throw;

test/fspp/fuse/ftruncate/FuseFTruncateFileDescriptorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseFTruncateTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::WithParamInterface;

test/fspp/fuse/lstat/FuseLstatErrorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseLstatTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 using ::testing::StrEq;
 using ::testing::_;

test/fspp/fuse/mkdir/FuseMkdirErrorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseMkdirTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;

test/fspp/fuse/openFile/FuseOpenErrorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseOpenTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 using ::testing::WithParamInterface;
 using ::testing::Values;

test/fspp/fuse/read/FuseReadErrorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseReadTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::WithParamInterface;

test/fspp/fuse/read/FuseReadFileDescriptorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseReadTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::WithParamInterface;

test/fspp/fuse/read/FuseReadOverflowTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseReadTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 using ::testing::_;
 

test/fspp/fuse/read/FuseReadReturnedDataTest.cpp

@@ -4,7 +4,7 @@
 #include "testutils/FuseReadTest.h"
 #include <cpp-utils/pointer/unique_ref.h>
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 #include <tuple>
 #include <cstdlib>

test/fspp/fuse/readDir/FuseReadDirErrorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseReadDirTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 using ::testing::StrEq;
 using ::testing::Throw;

test/fspp/fuse/readDir/FuseReadDirReturnTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseReadDirTest.h"
 #include <cpp-utils/pointer/unique_ref.h>
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 using ::testing::StrEq;
 using ::testing::WithParamInterface;

test/fspp/fuse/rename/FuseRenameErrorTest.cpp

@@ -1,5 +1,5 @@
 #include "testutils/FuseRenameTest.h"
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 using ::testing::StrEq;
 using ::testing::Throw;

test/fspp/fuse/rmdir/FuseRmdirErrorTest.cpp

@@ -1,5 +1,5 @@
 #include "testutils/FuseRmdirTest.h"
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 using ::testing::StrEq;
 using ::testing::Throw;

test/fspp/fuse/statfs/FuseStatfsErrorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseStatfsTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 using ::testing::StrEq;
 using ::testing::_;

test/fspp/fuse/truncate/FuseTruncateErrorTest.cpp

@@ -1,5 +1,5 @@
 #include "testutils/FuseTruncateTest.h"
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;

test/fspp/fuse/unlink/FuseUnlinkErrorTest.cpp

@@ -1,5 +1,5 @@
 #include "testutils/FuseUnlinkTest.h"
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 using ::testing::StrEq;
 using ::testing::Throw;

test/fspp/fuse/utimens/FuseUtimensErrorTest.cpp

@@ -1,5 +1,5 @@
 #include "testutils/FuseUtimensTest.h"
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;

test/fspp/fuse/write/FuseWriteDataTest.cpp

@@ -2,7 +2,7 @@
 #include "testutils/FuseWriteTest.h"
 #include "../../testutils/InMemoryFile.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 #include <tuple>
 #include <cstdlib>

test/fspp/fuse/write/FuseWriteErrorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseWriteTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::WithParamInterface;

test/fspp/fuse/write/FuseWriteFileDescriptorTest.cpp

@@ -1,6 +1,6 @@
 #include "testutils/FuseWriteTest.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::WithParamInterface;

test/fspp/fuse/write/FuseWriteOverflowTest.cpp

@@ -2,7 +2,7 @@
 #include "testutils/FuseWriteTest.h"
 #include "../../testutils/InMemoryFile.h"
 
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::Invoke;

test/fspp/testutils/FuseTest.h

@@ -6,7 +6,7 @@
 #include <gmock/gmock.h>
 
 #include "fspp/fuse/Filesystem.h"
-#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fs_interface/FuseErrnoException.h"
 #include "fspp/fuse/Fuse.h"
 #include "fspp/fs_interface/Dir.h"