system/FmtError: move to lib/fmt/

2022-11-28 23:05:15 +01:00 · 2022-11-28 23:05:15 +01:00 · 66029c405f
commit 66029c405f
parent 7d8c076e06
23 changed files with 31 additions and 23 deletions
--- a/src/LogInit.cxx
+++ b/src/LogInit.cxx
@ -30,7 +30,7 @@
 #include "util/Domain.hxx"
 #include "util/RuntimeError.hxx"
 #include "util/StringAPI.hxx"
-#include "system/FmtError.hxx"
+#include "lib/fmt/SystemError.hxx"

 #include <cassert>

--- a/src/archive/plugins/ZzipArchivePlugin.cxx
+++ b/src/archive/plugins/ZzipArchivePlugin.cxx
@ -27,7 +27,7 @@
 #include "../ArchiveVisitor.hxx"
 #include "input/InputStream.hxx"
 #include "fs/Path.hxx"
-#include "system/FmtError.hxx"
+#include "lib/fmt/SystemError.hxx"
 #include "util/RuntimeError.hxx"
 #include "util/UTF8.hxx"

--- a/src/archive/plugins/meson.build
+++ b/src/archive/plugins/meson.build
@ -31,6 +31,7 @@ archive_plugins = static_library(
  archive_plugins_sources,
  include_directories: inc,
  dependencies: [
+    fmt_dep,
    libbz2_dep,
    libiso9660_dep,
    libzzip_dep,
--- a/src/db/plugins/simple/SimpleDatabasePlugin.cxx
+++ b/src/db/plugins/simple/SimpleDatabasePlugin.cxx
@ -40,7 +40,7 @@
 #include "fs/FileInfo.hxx"
 #include "config/Block.hxx"
 #include "fs/FileSystem.hxx"
-#include "system/FmtError.hxx"
+#include "lib/fmt/SystemError.hxx"
 #include "util/CharUtil.hxx"
 #include "util/Domain.hxx"
 #include "util/RecursiveMap.hxx"
--- a/src/event/InotifyEvent.cxx
+++ b/src/event/InotifyEvent.cxx
@ -31,7 +31,7 @@
 */

 #include "InotifyEvent.hxx"
-#include "system/FmtError.hxx"
+#include "lib/fmt/SystemError.hxx"
 #include "io/UniqueFileDescriptor.hxx"

 #include <array>
--- a/src/fs/DirectoryReader.cxx
+++ b/src/fs/DirectoryReader.cxx
@ -19,7 +19,7 @@

 #include "DirectoryReader.hxx"
 #include "lib/fmt/PathFormatter.hxx"
-#include "system/FmtError.hxx"
+#include "lib/fmt/SystemError.hxx"

 #ifdef _WIN32

--- a/src/fs/FileInfo.hxx
+++ b/src/fs/FileInfo.hxx
@ -22,7 +22,7 @@

 #include "Path.hxx"
 #include "lib/fmt/PathFormatter.hxx"
-#include "system/FmtError.hxx"
+#include "lib/fmt/SystemError.hxx"

 #ifdef _WIN32
 #include "time/FileTime.hxx"
--- a/src/fs/FileSystem.cxx
+++ b/src/fs/FileSystem.cxx
@ -21,7 +21,7 @@
 #include "AllocatedPath.hxx"
 #include "Limits.hxx"
 #include "lib/fmt/PathFormatter.hxx"
-#include "system/FmtError.hxx"
+#include "lib/fmt/SystemError.hxx"

 #ifdef _WIN32
 #include <handleapi.h> // for CloseHandle()
--- a/src/input/plugins/UringInputPlugin.cxx
+++ b/src/input/plugins/UringInputPlugin.cxx
@ -21,7 +21,7 @@
 #include "../AsyncInputStream.hxx"
 #include "event/Call.hxx"
 #include "event/Loop.hxx"
-#include "system/FmtError.hxx"
+#include "lib/fmt/SystemError.hxx"
 #include "io/Open.hxx"
 #include "io/UniqueFileDescriptor.hxx"
 #include "io/uring/ReadOperation.hxx"
--- a/src/io/FileOutputStream.cxx
+++ b/src/io/FileOutputStream.cxx
@ -29,7 +29,7 @@

 #include "FileOutputStream.hxx"
 #include "lib/fmt/PathFormatter.hxx"
-#include "system/FmtError.hxx"
+#include "lib/fmt/SystemError.hxx"
 #include "util/StringFormat.hxx"

 #ifdef _WIN32
--- a/src/io/FileReader.cxx
+++ b/src/io/FileReader.cxx
@ -30,7 +30,7 @@
 #include "FileReader.hxx"
 #include "lib/fmt/PathFormatter.hxx"
 #include "fs/FileInfo.hxx"
-#include "system/FmtError.hxx"
+#include "lib/fmt/SystemError.hxx"
 #include "io/Open.hxx"

 #include <cassert>
--- a/src/io/Open.cxx
+++ b/src/io/Open.cxx
@ -29,7 +29,7 @@

 #include "Open.hxx"
 #include "UniqueFileDescriptor.hxx"
-#include "system/FmtError.hxx"
+#include "lib/fmt/SystemError.hxx"

 #include <fcntl.h>

--- a/src/lib/fmt/SystemError.cxx
+++ b/src/lib/fmt/SystemError.cxx
@ -27,8 +27,8 @@
 * OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include "FmtError.hxx"
-#include "lib/fmt/ToBuffer.hxx"
+#include "SystemError.hxx"
+#include "ToBuffer.hxx"

 #include <array>

--- a/src/lib/fmt/SystemError.hxx
+++ b/src/lib/fmt/SystemError.hxx
@ -29,7 +29,7 @@

 #pragma once

-#include "Error.hxx" // IWYU pragma: export
+#include "system/Error.hxx" // IWYU pragma: export

 #include <fmt/core.h>
 #if FMT_VERSION >= 80000 && FMT_VERSION < 90000
--- a/src/lib/fmt/meson.build
+++ b/src/lib/fmt/meson.build
@ -8,6 +8,14 @@ if compiler.get_id() == 'clang' and compiler.version().version_compare('<15')
  )
 endif

-fmt_dep = declare_dependency(
+fmt = static_library(
+  'fmt',
+  'SystemError.cxx',
+  include_directories: inc,
+  dependencies: libfmt,
+)
+
+fmt_dep = declare_dependency(
+  link_with: fmt,
  dependencies: libfmt,
 )
--- a/src/mixer/plugins/OssMixerPlugin.cxx
+++ b/src/mixer/plugins/OssMixerPlugin.cxx
@ -21,7 +21,7 @@
 #include "mixer/Mixer.hxx"
 #include "config/Block.hxx"
 #include "io/FileDescriptor.hxx"
-#include "system/FmtError.hxx"
+#include "lib/fmt/SystemError.hxx"
 #include "util/ASCII.hxx"
 #include "util/Domain.hxx"
 #include "util/RuntimeError.hxx"
--- a/src/output/plugins/FifoOutputPlugin.cxx
+++ b/src/output/plugins/FifoOutputPlugin.cxx
@ -24,7 +24,7 @@
 #include "fs/AllocatedPath.hxx"
 #include "fs/FileSystem.hxx"
 #include "fs/FileInfo.hxx"
-#include "system/FmtError.hxx"
+#include "lib/fmt/SystemError.hxx"
 #include "util/Domain.hxx"
 #include "util/RuntimeError.hxx"
 #include "Log.hxx"
--- a/src/output/plugins/OssOutputPlugin.cxx
+++ b/src/output/plugins/OssOutputPlugin.cxx
@ -22,7 +22,7 @@
 #include "mixer/plugins/OssMixerPlugin.hxx"
 #include "pcm/Export.hxx"
 #include "io/UniqueFileDescriptor.hxx"
-#include "system/FmtError.hxx"
+#include "lib/fmt/SystemError.hxx"
 #include "util/Domain.hxx"
 #include "util/ByteOrder.hxx"
 #include "util/Manual.hxx"
--- a/src/output/plugins/PipeOutputPlugin.cxx
+++ b/src/output/plugins/PipeOutputPlugin.cxx
@ -19,7 +19,7 @@

 #include "PipeOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
-#include "system/FmtError.hxx"
+#include "lib/fmt/SystemError.hxx"

 #include <string>
 #include <stdexcept>
--- a/src/output/plugins/SolarisOutputPlugin.cxx
+++ b/src/output/plugins/SolarisOutputPlugin.cxx
@ -20,7 +20,7 @@
 #include "SolarisOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
 #include "io/FileDescriptor.hxx"
-#include "system/FmtError.hxx"
+#include "lib/fmt/SystemError.hxx"

 #include <cerrno>

--- a/src/system/meson.build
+++ b/src/system/meson.build
@ -1,6 +1,5 @@
 system_sources = [
  'EventPipe.cxx',
-  'FmtError.cxx',
 ]

 if host_machine.system() == 'linux'
--- a/src/unix/Daemon.cxx
+++ b/src/unix/Daemon.cxx
@ -20,7 +20,7 @@
 #include "config.h"
 #include "Daemon.hxx"
 #include "lib/fmt/PathFormatter.hxx"
-#include "system/FmtError.hxx"
+#include "lib/fmt/SystemError.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "util/RuntimeError.hxx"

--- a/src/unix/PidFile.hxx
+++ b/src/unix/PidFile.hxx
@ -23,7 +23,7 @@
 #include "lib/fmt/PathFormatter.hxx"
 #include "fs/FileSystem.hxx"
 #include "fs/AllocatedPath.hxx"
-#include "system/FmtError.hxx"
+#include "lib/fmt/SystemError.hxx"

 #include <cassert>