From bf7a57fc55493247a624ecfd65e4d73964e7d8d2 Mon Sep 17 00:00:00 2001 From: SulfurNitride Date: Sun, 12 Apr 2026 02:40:16 -0500 Subject: Remove vendored usvfs and Windows-only usvfs code paths The Linux port uses its own in-process FUSE VFS (FuseConnector), so usvfs was dead weight: libs/usvfs/ was never built, usvfsconnector.cpp was explicitly REMOVE_ITEM'd from the source list, and every call site was already guarded by #ifdef _WIN32 with a working Linux branch (the Windows build is also broken on this branch, since FUSE3 is a hard find_package dependency). - Drop libs/usvfs/ and src/src/usvfsconnector.{cpp,h} - Collapse #ifdef _WIN32 / usvfs include branches in organizercore, mainwindow, settings, util, spawn - Remove getUsvfsVersionString() and the "usvfs: ..." log field - Remove vfs32/64DLLName APPPARAMs (nothing reads them) - Relabel About dialog "usvfs:" row to "VFS: FUSE 3" --- libs/usvfs/test/gtest_utils/gtest_utils.h | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 libs/usvfs/test/gtest_utils/gtest_utils.h (limited to 'libs/usvfs/test/gtest_utils/gtest_utils.h') diff --git a/libs/usvfs/test/gtest_utils/gtest_utils.h b/libs/usvfs/test/gtest_utils/gtest_utils.h deleted file mode 100644 index 1dba70c..0000000 --- a/libs/usvfs/test/gtest_utils/gtest_utils.h +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once - -// this file is shared by both usvfs_global_test and usvfs_global_test_runner -// - -#include - -#include - -::testing::AssertionResult AssertDirectoryEquals(const std::filesystem::path& expected, - const std::filesystem::path& actual, - bool content = true); - -::testing::AssertionResult AssertContentEquals(std::string_view expected, - const std::filesystem::path& path, - bool trim = true); - -// macro to assert that the contents of two directories are identical - directories are -// compared recursively and file contents are compared (excluding extra spaces or lines -// in file) -// -#define ASSERT_DIRECTORY_EQ(Expected, Actual) \ - ASSERT_TRUE(AssertDirectoryEquals(Expected, Actual)) - -// macro to assert that the contents of two files are identical (excluding extra space -// or lines in file) -// -#define ASSERT_CONTENT_EQ(Expected, Path) \ - ASSERT_TRUE(AssertContentEquals(Expected, Path)) -- cgit v1.3.1