chore: Improve source tree structure

In preparation for adding support for using dependencies from the system
in addition to bundled or downloaded dependencies, restructure the
source tree so that:

- Third party headers are included without a third_party/ prefix, e.g.
  #include <xxhash.h> instead of #include <third_party/xxhash.h>.
- Ccache headers are included with a ccache/ prefix, e.g. #include
  <ccache/util/string.hpp> instead of #include <util/string.hpp>.

This keeps ccache and other headers separated but in another way than
before.

diff --git a/.clang-format b/.clang-format
index 3d4ec9c4e2c9c3e3731321d901b2ec14c65554eb..d18311d4384cddd545c0f18d31739951a3c0587a 100644 (file)
--- a/.clang-format
+++ b/.clang-format
@@ -24,20 +24,18 @@ ConstructorInitializerIndentWidth: 2
 ContinuationIndentWidth: 2
 IncludeBlocks: Regroup
 IncludeCategories:
-  - Regex: '^"system.hpp"$'
-    Priority: 1
-  - Regex: '^["<]third_party/'
-    Priority: 4
-  # System headers:
-  - Regex: '\.h>$'
-    Priority: 5
-  # C++ headers:
-  - Regex: '^<[^.]+>$'
-    Priority: 6
+  # Relative headers
   - Regex: '^"'
+    Priority: 1
+  # Ccache headers:
+  - Regex: '^<ccache/'
     Priority: 2
-  - Regex: '.*'
+  # System headers:
+  - Regex: '\.h.*>$'
     Priority: 3
+  # C++ headers:
+  - Regex: '^<'
+    Priority: 4
 IndentPPDirectives: AfterHash
 KeepEmptyLinesAtTheStartOfBlocks: false
 PointerAlignment: Left

diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md
index 26ecdd843b71fa0e3a4ca9f8c6e6060545015e7b..2dbc7c99420ad893e6e51ad2d43ee3be1e7794fc 100644 (file)
--- a/ARCHITECTURE.md
+++ b/ARCHITECTURE.md
@@ -17,9 +17,14 @@
 
 ### Subdirectories of `src`
 
+* `ccache`: Ccache source code.
+* `third_party`: Bundled third party code.
+
+### Subdirectories of `src/ccache`
+
 This section describes the directory structure that the project aims to
-transform the `src` directory into in the long run to make the code base easier
-to understand and work with. In other words, this is work in progress.
+transform the `src/ccache` directory into in the long run to make the code base
+easier to understand and work with. In other words, this is work in progress.
 
 * `compiler`: Knowledge about things like compiler options, compiler behavior,
   preprocessor output format, etc. Ideally this code should in the future be
@@ -29,6 +34,5 @@ to understand and work with. In other words, this is work in progress.
 * `storage`: Storage backends.
 * `storage/local`: Code for the local storage backend.
 * `storage/remote`: Code for remote storage backends.
-* `third_party`: Bundled third party code.
 * `util`: Generic utility functionality that does not depend on ccache-specific
   things.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f0dd388f39f2f31fcc1c846cb30e7074a690f43..4add5942171989f28b2b6661262ba9538dfa6983 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,12 +121,13 @@ include(CodeAnalysis)
 #
 # Source code
 #
-add_subdirectory(src)
+add_subdirectory(src/ccache)
+add_subdirectory(src/third_party)
 
 #
 # ccache executable
 #
-add_executable(ccache src/main.cpp)
+add_executable(ccache src/ccache/main.cpp)
 target_link_libraries(ccache PRIVATE standard_settings standard_warnings ccache_framework)
 
 #

diff --git a/cmake/GenerateVersionFile.cmake b/cmake/GenerateVersionFile.cmake
index 7b2ad0cd4be1f318ffde5c6c121e4569b8f01de5..55d5b88cb3e6fba1b9c800fe0fcc7b31b59388ce 100644 (file)
--- a/cmake/GenerateVersionFile.cmake
+++ b/cmake/GenerateVersionFile.cmake
@@ -1,4 +1,4 @@
 configure_file(
   ${CMAKE_SOURCE_DIR}/cmake/version.cpp.in
-  ${CMAKE_BINARY_DIR}/src/version.cpp
+  ${CMAKE_BINARY_DIR}/src/ccache/version.cpp
   @ONLY)

diff --git a/src/.clang-tidy b/src/ccache/.clang-tidy
similarity index 100%
rename from src/.clang-tidy
rename to src/ccache/.clang-tidy

diff --git a/src/Args.cpp b/src/ccache/Args.cpp
similarity index 97%
rename from src/Args.cpp
rename to src/ccache/Args.cpp
index 44a09ddbf4c701b1bf5f15c1d28ec2f93d97640c..795dd68987a4b731220273230cd766b112b6e3dc 100644 (file)
--- a/src/Args.cpp
+++ b/src/ccache/Args.cpp
@@ -18,10 +18,10 @@
 
 #include "Args.hpp"
 
-#include <core/exceptions.hpp>
-#include <util/file.hpp>
-#include <util/logging.hpp>
-#include <util/string.hpp>
+#include <ccache/core/exceptions.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/logging.hpp>
+#include <ccache/util/string.hpp>
 
 Args::Args(Args&& other) noexcept : m_args(std::move(other.m_args))
 {

diff --git a/src/Args.hpp b/src/ccache/Args.hpp
similarity index 100%
rename from src/Args.hpp
rename to src/ccache/Args.hpp

diff --git a/src/ArgsInfo.hpp b/src/ccache/ArgsInfo.hpp
similarity index 98%
rename from src/ArgsInfo.hpp
rename to src/ccache/ArgsInfo.hpp
index a6076e342b264a0a8b59a9b385e058317bcd09f2..2a46a4fb02b29991b54af4a89c0ab67cfc68196a 100644 (file)
--- a/src/ArgsInfo.hpp
+++ b/src/ccache/ArgsInfo.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2020-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "Args.hpp"
+#include <ccache/Args.hpp>
 
 #include <optional>
 #include <string>

diff --git a/src/CMakeLists.txt b/src/ccache/CMakeLists.txt
similarity index 93%
rename from src/CMakeLists.txt
rename to src/ccache/CMakeLists.txt
index 3b85874f33072f179f31770a98e80ff00522bd7d..bfd6ae330b100e7d28208b6438a685c4a40eda2e 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/ccache/CMakeLists.txt
@@ -47,7 +47,8 @@ target_link_libraries(
   PRIVATE standard_settings standard_warnings ZSTD::ZSTD Threads::Threads third_party
 )
 
-target_include_directories(ccache_framework PUBLIC ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+get_filename_component(SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
+target_include_directories(ccache_framework PUBLIC ${CMAKE_BINARY_DIR} ${SRC_DIR})
 
 if(REDIS_STORAGE_BACKEND)
   target_compile_definitions(ccache_framework PUBLIC -DHAVE_REDIS_STORAGE_BACKEND)
@@ -62,5 +63,4 @@ target_link_libraries(test-lockfile PRIVATE standard_settings standard_warnings
 
 add_subdirectory(core)
 add_subdirectory(storage)
-add_subdirectory(third_party)
 add_subdirectory(util)

diff --git a/src/Config.cpp b/src/ccache/Config.cpp
similarity index 98%
rename from src/Config.cpp
rename to src/ccache/Config.cpp
index 1440dc8655c5b17d646f582f11ba71b318ec2626..5d99f8d9083543183042e3e2a526f6d7a852dd7c 100644 (file)
--- a/src/Config.cpp
+++ b/src/ccache/Config.cpp
@@ -18,23 +18,22 @@
 
 #include "Config.hpp"
 
-#include "Util.hpp"
-
-#include <core/AtomicFile.hpp>
-#include <core/common.hpp>
-#include <core/exceptions.hpp>
-#include <core/types.hpp>
-#include <util/DirEntry.hpp>
-#include <util/Tokenizer.hpp>
-#include <util/UmaskScope.hpp>
-#include <util/assertions.hpp>
-#include <util/environment.hpp>
-#include <util/expected.hpp>
-#include <util/file.hpp>
-#include <util/filesystem.hpp>
-#include <util/format.hpp>
-#include <util/string.hpp>
-#include <util/wincompat.hpp>
+#include <ccache/Util.hpp>
+#include <ccache/core/AtomicFile.hpp>
+#include <ccache/core/common.hpp>
+#include <ccache/core/exceptions.hpp>
+#include <ccache/core/types.hpp>
+#include <ccache/util/DirEntry.hpp>
+#include <ccache/util/Tokenizer.hpp>
+#include <ccache/util/UmaskScope.hpp>
+#include <ccache/util/assertions.hpp>
+#include <ccache/util/environment.hpp>
+#include <ccache/util/expected.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/string.hpp>
+#include <ccache/util/wincompat.hpp>
 
 #ifdef HAVE_PWD_H
 #  include <pwd.h>

diff --git a/src/Config.hpp b/src/ccache/Config.hpp
similarity index 99%
rename from src/Config.hpp
rename to src/ccache/Config.hpp
index b3c28a41cdb06521da764ea5ba3411f72c10e57d..2ac11185410bff582a481a36ca1fe1460852a332 100644 (file)
--- a/src/Config.hpp
+++ b/src/ccache/Config.hpp
@@ -18,9 +18,9 @@
 
 #pragma once
 
-#include <core/Sloppiness.hpp>
-#include <util/NonCopyable.hpp>
-#include <util/string.hpp>
+#include <ccache/core/Sloppiness.hpp>
+#include <ccache/util/NonCopyable.hpp>
+#include <ccache/util/string.hpp>
 
 #include <sys/types.h>
 

diff --git a/src/Context.cpp b/src/ccache/Context.cpp
similarity index 91%
rename from src/Context.cpp
rename to src/ccache/Context.cpp
index 47f9407e0b6305d55fabcdd42c9269ebca8fe7fc..31e03745625faf2d12dd5d634e05e450b70c269f 100644 (file)
--- a/src/Context.cpp
+++ b/src/ccache/Context.cpp
@@ -18,17 +18,16 @@
 
 #include "Context.hpp"
 
-#include "SignalHandler.hpp"
-#include "Util.hpp"
-#include "hashutil.hpp"
-
-#include <util/TimePoint.hpp>
-#include <util/file.hpp>
-#include <util/logging.hpp>
-#include <util/path.hpp>
-#include <util/process.hpp>
-#include <util/string.hpp>
-#include <util/wincompat.hpp>
+#include <ccache/SignalHandler.hpp>
+#include <ccache/Util.hpp>
+#include <ccache/hashutil.hpp>
+#include <ccache/util/TimePoint.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/logging.hpp>
+#include <ccache/util/path.hpp>
+#include <ccache/util/process.hpp>
+#include <ccache/util/string.hpp>
+#include <ccache/util/wincompat.hpp>
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>

diff --git a/src/Context.hpp b/src/ccache/Context.hpp
similarity index 91%
rename from src/Context.hpp
rename to src/ccache/Context.hpp
index 98716ae3ec4e3d83b96c48b3bc7da475dc948eb9..7226162617cc955b9f816634981822a3b0173ba6 100644 (file)
--- a/src/Context.hpp
+++ b/src/ccache/Context.hpp
@@ -18,23 +18,21 @@
 
 #pragma once
 
-#include "Args.hpp"
-#include "ArgsInfo.hpp"
-#include "Config.hpp"
-
-#include <util/FileStream.hpp>
-#include <util/NonCopyable.hpp>
+#include <ccache/Args.hpp>
+#include <ccache/ArgsInfo.hpp>
+#include <ccache/Config.hpp>
+#include <ccache/Hash.hpp>
+#include <ccache/core/Manifest.hpp>
+#include <ccache/storage/Storage.hpp>
+#include <ccache/util/Bytes.hpp>
+#include <ccache/util/FileStream.hpp>
+#include <ccache/util/NonCopyable.hpp>
+#include <ccache/util/TimePoint.hpp>
 
 #ifdef INODE_CACHE_SUPPORTED
-#  include "InodeCache.hpp"
+#  include <ccache/InodeCache.hpp>
 #endif
 
-#include <Hash.hpp>
-#include <core/Manifest.hpp>
-#include <storage/Storage.hpp>
-#include <util/Bytes.hpp>
-#include <util/TimePoint.hpp>
-
 #include <sys/types.h>
 
 #include <ctime>

diff --git a/src/Depfile.cpp b/src/ccache/Depfile.cpp
similarity index 94%
rename from src/Depfile.cpp
rename to src/ccache/Depfile.cpp
index 4da675871f0e8d58321ab1a59f11dd77c9adf718..441c0427da61cb9b7e44c6b42b538eb74bf338ce 100644 (file)
--- a/src/Depfile.cpp
+++ b/src/ccache/Depfile.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2020-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,18 +18,17 @@
 
 #include "Depfile.hpp"
 
-#include "Context.hpp"
-#include "Hash.hpp"
-
-#include <Util.hpp>
-#include <core/exceptions.hpp>
-#include <util/Tokenizer.hpp>
-#include <util/assertions.hpp>
-#include <util/file.hpp>
-#include <util/filesystem.hpp>
-#include <util/logging.hpp>
-#include <util/path.hpp>
-#include <util/string.hpp>
+#include <ccache/Context.hpp>
+#include <ccache/Hash.hpp>
+#include <ccache/Util.hpp>
+#include <ccache/core/exceptions.hpp>
+#include <ccache/util/Tokenizer.hpp>
+#include <ccache/util/assertions.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/logging.hpp>
+#include <ccache/util/path.hpp>
+#include <ccache/util/string.hpp>
 
 #include <algorithm>
 

diff --git a/src/Depfile.hpp b/src/ccache/Depfile.hpp
similarity index 100%
rename from src/Depfile.hpp
rename to src/ccache/Depfile.hpp

diff --git a/src/Hash.cpp b/src/ccache/Hash.cpp
similarity index 92%
rename from src/Hash.cpp
rename to src/ccache/Hash.cpp
index f8780efd0c6fa7f521db047255bb2935cf7724ca..97db62f07fa3c2f2c1e31710e1101e7a616400d6 100644 (file)
--- a/src/Hash.cpp
+++ b/src/ccache/Hash.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2020-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,12 +18,12 @@
 
 #include "Hash.hpp"
 
-#include <util/Fd.hpp>
-#include <util/file.hpp>
-#include <util/format.hpp>
-#include <util/logging.hpp>
-#include <util/string.hpp>
-#include <util/wincompat.hpp>
+#include <ccache/util/Fd.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/logging.hpp>
+#include <ccache/util/string.hpp>
+#include <ccache/util/wincompat.hpp>
 
 #include <fcntl.h>
 #include <sys/stat.h>

diff --git a/src/Hash.hpp b/src/ccache/Hash.hpp
similarity index 96%
rename from src/Hash.hpp
rename to src/ccache/Hash.hpp
index 7fe8386e7a8fca426bd94292aceef2075ca2458b..df95b66c2014dbaa525cda90a882fbac37e5aa55 100644 (file)
--- a/src/Hash.hpp
+++ b/src/ccache/Hash.hpp
@@ -18,9 +18,9 @@
 
 #pragma once
 
-#include "third_party/blake3/blake3.h"
-#include <third_party/nonstd/span.hpp>
-#include <third_party/tl/expected.hpp>
+#include <blake3/blake3.h>
+#include <nonstd/span.hpp>
+#include <tl/expected.hpp>
 
 #include <array>
 #include <cstdint>

diff --git a/src/InodeCache.cpp b/src/ccache/InodeCache.cpp
similarity index 97%
rename from src/InodeCache.cpp
rename to src/ccache/InodeCache.cpp
index 8a869b940bc6aab0f636c3777e24c1dbcdc02535..774633b52ca5ef781b15abf5d0a74c23ee6eed72 100644 (file)
--- a/src/InodeCache.cpp
+++ b/src/ccache/InodeCache.cpp
@@ -18,19 +18,18 @@
 
 #include "InodeCache.hpp"
 
-#include "Config.hpp"
-#include "Hash.hpp"
-#include "Util.hpp"
-
-#include <util/DirEntry.hpp>
-#include <util/Fd.hpp>
-#include <util/Finalizer.hpp>
-#include <util/PathString.hpp>
-#include <util/TemporaryFile.hpp>
-#include <util/conversion.hpp>
-#include <util/file.hpp>
-#include <util/format.hpp>
-#include <util/logging.hpp>
+#include <ccache/Config.hpp>
+#include <ccache/Hash.hpp>
+#include <ccache/Util.hpp>
+#include <ccache/util/DirEntry.hpp>
+#include <ccache/util/Fd.hpp>
+#include <ccache/util/Finalizer.hpp>
+#include <ccache/util/PathString.hpp>
+#include <ccache/util/TemporaryFile.hpp>
+#include <ccache/util/conversion.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/logging.hpp>
 
 #include <fcntl.h>
 

diff --git a/src/InodeCache.hpp b/src/ccache/InodeCache.hpp
similarity index 96%
rename from src/InodeCache.hpp
rename to src/ccache/InodeCache.hpp
index 48bedcbc5a1c9c07a7531530e36a57b4dab3a051..589c35caae718461af0c5c22ac7bdfb5e233db41 100644 (file)
--- a/src/InodeCache.hpp
+++ b/src/ccache/InodeCache.hpp
@@ -18,12 +18,12 @@
 
 #pragma once
 
-#include <Hash.hpp>
-#include <hashutil.hpp>
-#include <util/Duration.hpp>
-#include <util/Fd.hpp>
-#include <util/MemoryMap.hpp>
-#include <util/TimePoint.hpp>
+#include <ccache/Hash.hpp>
+#include <ccache/hashutil.hpp>
+#include <ccache/util/Duration.hpp>
+#include <ccache/util/Fd.hpp>
+#include <ccache/util/MemoryMap.hpp>
+#include <ccache/util/TimePoint.hpp>
 
 #include <sys/types.h>
 

diff --git a/src/ProgressBar.cpp b/src/ccache/ProgressBar.cpp
similarity index 93%
rename from src/ProgressBar.cpp
rename to src/ccache/ProgressBar.cpp
index 3fa6f7e1d9995626792208951461b5d2f94a455e..428275cf89da79c59e70b48ee72b7c3ee5fe7f10 100644 (file)
--- a/src/ProgressBar.cpp
+++ b/src/ccache/ProgressBar.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2019-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2019-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,9 +18,9 @@
 
 #include "ProgressBar.hpp"
 
-#include <util/assertions.hpp>
-#include <util/format.hpp>
-#include <util/wincompat.hpp>
+#include <ccache/util/assertions.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/wincompat.hpp>
 
 #ifdef _WIN32
 #else

diff --git a/src/ProgressBar.hpp b/src/ccache/ProgressBar.hpp
similarity index 100%
rename from src/ProgressBar.hpp
rename to src/ccache/ProgressBar.hpp

diff --git a/src/SignalHandler.cpp b/src/ccache/SignalHandler.cpp
similarity index 96%
rename from src/SignalHandler.cpp
rename to src/ccache/SignalHandler.cpp
index 50d3760a09405c2d1b3e412cbc2b76e587f16c17..37c966777a30bcb901317ffd4ff9751f2cfc7ffd 100644 (file)
--- a/src/SignalHandler.cpp
+++ b/src/ccache/SignalHandler.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2020-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,9 +18,8 @@
 
 #include "SignalHandler.hpp"
 
-#include "Context.hpp"
-
-#include <util/assertions.hpp>
+#include <ccache/Context.hpp>
+#include <ccache/util/assertions.hpp>
 
 #include <signal.h> // NOLINT: sigaddset et al are defined in signal.h
 #include <sys/types.h>

diff --git a/src/SignalHandler.hpp b/src/ccache/SignalHandler.hpp
similarity index 100%
rename from src/SignalHandler.hpp
rename to src/ccache/SignalHandler.hpp

diff --git a/src/Util.cpp b/src/ccache/Util.cpp
similarity index 94%
rename from src/Util.cpp
rename to src/ccache/Util.cpp
index 96deb698aab883b7eeb7559fe74501d05752f1f1..3d35aa6843b98539afa9e240c8e791c5df1e810b 100644 (file)
--- a/src/Util.cpp
+++ b/src/ccache/Util.cpp
@@ -18,19 +18,18 @@
 
 #include "Util.hpp"
 
-#include "Context.hpp"
-
-#include <Config.hpp>
-#include <core/exceptions.hpp>
-#include <util/DirEntry.hpp>
-#include <util/expected.hpp>
-#include <util/file.hpp>
-#include <util/filesystem.hpp>
-#include <util/format.hpp>
-#include <util/logging.hpp>
-#include <util/path.hpp>
-#include <util/string.hpp>
-#include <util/wincompat.hpp>
+#include <ccache/Config.hpp>
+#include <ccache/Context.hpp>
+#include <ccache/core/exceptions.hpp>
+#include <ccache/util/DirEntry.hpp>
+#include <ccache/util/expected.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/logging.hpp>
+#include <ccache/util/path.hpp>
+#include <ccache/util/string.hpp>
+#include <ccache/util/wincompat.hpp>
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>

diff --git a/src/Util.hpp b/src/ccache/Util.hpp
similarity index 100%
rename from src/Util.hpp
rename to src/ccache/Util.hpp

diff --git a/src/argprocessing.cpp b/src/ccache/argprocessing.cpp
similarity index 99%
rename from src/argprocessing.cpp
rename to src/ccache/argprocessing.cpp
index 0a156a6837b736f8b18a04b024eea02b2c1b462c..ee9eb2d1ea267624e34c9a01092732a56c7065fe 100644 (file)
--- a/src/argprocessing.cpp
+++ b/src/ccache/argprocessing.cpp
@@ -18,20 +18,19 @@
 
 #include "argprocessing.hpp"
 
-#include "Context.hpp"
-#include "compopt.hpp"
-#include "language.hpp"
-
-#include <Depfile.hpp>
-#include <Util.hpp>
-#include <util/PathString.hpp>
-#include <util/assertions.hpp>
-#include <util/filesystem.hpp>
-#include <util/format.hpp>
-#include <util/logging.hpp>
-#include <util/path.hpp>
-#include <util/string.hpp>
-#include <util/wincompat.hpp>
+#include <ccache/Context.hpp>
+#include <ccache/Depfile.hpp>
+#include <ccache/Util.hpp>
+#include <ccache/compopt.hpp>
+#include <ccache/language.hpp>
+#include <ccache/util/PathString.hpp>
+#include <ccache/util/assertions.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/logging.hpp>
+#include <ccache/util/path.hpp>
+#include <ccache/util/string.hpp>
+#include <ccache/util/wincompat.hpp>
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>

diff --git a/src/argprocessing.hpp b/src/ccache/argprocessing.hpp
similarity index 95%
rename from src/argprocessing.hpp
rename to src/ccache/argprocessing.hpp
index bb114c6819c8df1adf39b8607755d48dae6d616d..3c2a07a46bda286219836519233fbacdbc69fe69 100644 (file)
--- a/src/argprocessing.hpp
+++ b/src/ccache/argprocessing.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2020-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,9 +18,8 @@
 
 #pragma once
 
-#include "Args.hpp"
-
-#include <core/Statistic.hpp>
+#include <ccache/Args.hpp>
+#include <ccache/core/Statistic.hpp>
 
 #include <optional>
 #include <string>

diff --git a/src/ccache.cpp b/src/ccache/ccache.cpp
similarity index 98%
rename from src/ccache.cpp
rename to src/ccache/ccache.cpp
index 10b38f1e70ba7a81f3bab6d688db6cad8a8be1bd..6a91a209dd8a24b189fa9cbde4268f9699ded70b 100644 (file)
--- a/src/ccache.cpp
+++ b/src/ccache/ccache.cpp
@@ -19,48 +19,47 @@
 
 #include "ccache.hpp"
 
-#include "Args.hpp"
-#include "ArgsInfo.hpp"
-#include "Context.hpp"
-#include "Depfile.hpp"
-#include "Hash.hpp"
-#include "SignalHandler.hpp"
-#include "Util.hpp"
-#include "argprocessing.hpp"
-#include "compopt.hpp"
-#include "execute.hpp"
-#include "hashutil.hpp"
-#include "language.hpp"
-
-#include <core/CacheEntry.hpp>
-#include <core/Manifest.hpp>
-#include <core/MsvcShowIncludesOutput.hpp>
-#include <core/Result.hpp>
-#include <core/ResultRetriever.hpp>
-#include <core/Statistics.hpp>
-#include <core/StatsLog.hpp>
-#include <core/common.hpp>
-#include <core/exceptions.hpp>
-#include <core/mainoptions.hpp>
-#include <core/types.hpp>
-#include <storage/Storage.hpp>
-#include <util/Fd.hpp>
-#include <util/FileStream.hpp>
-#include <util/Finalizer.hpp>
-#include <util/PathString.hpp>
-#include <util/TemporaryFile.hpp>
-#include <util/UmaskScope.hpp>
-#include <util/environment.hpp>
-#include <util/expected.hpp>
-#include <util/file.hpp>
-#include <util/filesystem.hpp>
-#include <util/format.hpp>
-#include <util/logging.hpp>
-#include <util/path.hpp>
-#include <util/process.hpp>
-#include <util/string.hpp>
-#include <util/time.hpp>
-#include <util/wincompat.hpp>
+#include <ccache/Args.hpp>
+#include <ccache/ArgsInfo.hpp>
+#include <ccache/Context.hpp>
+#include <ccache/Depfile.hpp>
+#include <ccache/Hash.hpp>
+#include <ccache/SignalHandler.hpp>
+#include <ccache/Util.hpp>
+#include <ccache/argprocessing.hpp>
+#include <ccache/compopt.hpp>
+#include <ccache/core/CacheEntry.hpp>
+#include <ccache/core/Manifest.hpp>
+#include <ccache/core/MsvcShowIncludesOutput.hpp>
+#include <ccache/core/Result.hpp>
+#include <ccache/core/ResultRetriever.hpp>
+#include <ccache/core/Statistics.hpp>
+#include <ccache/core/StatsLog.hpp>
+#include <ccache/core/common.hpp>
+#include <ccache/core/exceptions.hpp>
+#include <ccache/core/mainoptions.hpp>
+#include <ccache/core/types.hpp>
+#include <ccache/execute.hpp>
+#include <ccache/hashutil.hpp>
+#include <ccache/language.hpp>
+#include <ccache/storage/Storage.hpp>
+#include <ccache/util/Fd.hpp>
+#include <ccache/util/FileStream.hpp>
+#include <ccache/util/Finalizer.hpp>
+#include <ccache/util/PathString.hpp>
+#include <ccache/util/TemporaryFile.hpp>
+#include <ccache/util/UmaskScope.hpp>
+#include <ccache/util/environment.hpp>
+#include <ccache/util/expected.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/logging.hpp>
+#include <ccache/util/path.hpp>
+#include <ccache/util/process.hpp>
+#include <ccache/util/string.hpp>
+#include <ccache/util/time.hpp>
+#include <ccache/util/wincompat.hpp>
 
 #include <fcntl.h>
 

diff --git a/src/ccache.hpp b/src/ccache/ccache.hpp
similarity index 97%
rename from src/ccache.hpp
rename to src/ccache/ccache.hpp
index d5ed96070eb293401f2d6d0cdd9bfd3463fdf9a3..2377b381ff57769a9b367f2c005b63e5689926d1 100644 (file)
--- a/src/ccache.hpp
+++ b/src/ccache/ccache.hpp
@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include <Args.hpp>
-#include <Config.hpp>
+#include <ccache/Args.hpp>
+#include <ccache/Config.hpp>
 
 #include <filesystem>
 #include <functional>

diff --git a/src/compopt.cpp b/src/ccache/compopt.cpp
similarity index 99%
rename from src/compopt.cpp
rename to src/ccache/compopt.cpp
index 0554c6d7f710b7c666cde5d2d55b7d235e93d3b7..f3c3be0f969022297b355aa524a4839e4d993c12 100644 (file)
--- a/src/compopt.cpp
+++ b/src/ccache/compopt.cpp
@@ -18,7 +18,7 @@
 
 #include "compopt.hpp"
 
-#include <util/format.hpp>
+#include <ccache/util/format.hpp>
 
 // The option it too hard to handle at all.
 int TOO_HARD = 1 << 0;

diff --git a/src/compopt.hpp b/src/ccache/compopt.hpp
similarity index 100%
rename from src/compopt.hpp
rename to src/ccache/compopt.hpp

diff --git a/src/core/AtomicFile.cpp b/src/ccache/core/AtomicFile.cpp
similarity index 89%
rename from src/core/AtomicFile.cpp
rename to src/ccache/core/AtomicFile.cpp
index e508ec28ed2cb85469a98058d08954a817c1cda4..5e22295bd5fde9d2346d15c68792b07b3c7d51ad 100644 (file)
--- a/src/core/AtomicFile.cpp
+++ b/src/ccache/core/AtomicFile.cpp
@@ -16,14 +16,15 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include <core/AtomicFile.hpp>
-#include <core/exceptions.hpp>
-#include <util/TemporaryFile.hpp>
-#include <util/assertions.hpp>
-#include <util/expected.hpp>
-#include <util/file.hpp>
-#include <util/filesystem.hpp>
-#include <util/format.hpp>
+#include "AtomicFile.hpp"
+
+#include <ccache/core/exceptions.hpp>
+#include <ccache/util/TemporaryFile.hpp>
+#include <ccache/util/assertions.hpp>
+#include <ccache/util/expected.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/format.hpp>
 
 namespace fs = util::filesystem;
 

diff --git a/src/core/AtomicFile.hpp b/src/ccache/core/AtomicFile.hpp
similarity index 97%
rename from src/core/AtomicFile.hpp
rename to src/ccache/core/AtomicFile.hpp
index 666dda948b5a86fb889f9f54ff279b00a563ce0b..53563d469d664d360b56815c15fcef25c065f43e 100644 (file)
--- a/src/core/AtomicFile.hpp
+++ b/src/ccache/core/AtomicFile.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <third_party/nonstd/span.hpp>
+#include <nonstd/span.hpp>
 
 #include <cstdint>
 #include <cstdio>

diff --git a/src/core/CMakeLists.txt b/src/ccache/core/CMakeLists.txt
similarity index 100%
rename from src/core/CMakeLists.txt
rename to src/ccache/core/CMakeLists.txt

diff --git a/src/core/CacheEntry.cpp b/src/ccache/core/CacheEntry.cpp
similarity index 95%
rename from src/core/CacheEntry.cpp
rename to src/ccache/core/CacheEntry.cpp
index 926feca5778fdca9c443c002bcba72d2f96ceb0d..335e05317a3abad9283bba52ee7a7c4858f5b21b 100644 (file)
--- a/src/core/CacheEntry.cpp
+++ b/src/ccache/core/CacheEntry.cpp
@@ -18,20 +18,20 @@
 
 #include "CacheEntry.hpp"
 
-#include <ccache.hpp>
-#include <core/CacheEntryDataReader.hpp>
-#include <core/CacheEntryDataWriter.hpp>
-#include <core/Result.hpp>
-#include <core/exceptions.hpp>
-#include <core/types.hpp>
-#include <util/TimePoint.hpp>
-#include <util/XXH3_128.hpp>
-#include <util/expected.hpp>
-#include <util/file.hpp>
-#include <util/filesystem.hpp>
-#include <util/format.hpp>
-#include <util/logging.hpp>
-#include <util/zstd.hpp>
+#include <ccache/ccache.hpp>
+#include <ccache/core/CacheEntryDataReader.hpp>
+#include <ccache/core/CacheEntryDataWriter.hpp>
+#include <ccache/core/Result.hpp>
+#include <ccache/core/exceptions.hpp>
+#include <ccache/core/types.hpp>
+#include <ccache/util/TimePoint.hpp>
+#include <ccache/util/XXH3_128.hpp>
+#include <ccache/util/expected.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/logging.hpp>
+#include <ccache/util/zstd.hpp>
 
 #include <cstring>
 

diff --git a/src/core/CacheEntry.hpp b/src/ccache/core/CacheEntry.hpp
similarity index 96%
rename from src/core/CacheEntry.hpp
rename to src/ccache/core/CacheEntry.hpp
index ce0ebf7246b9fc17f0af6567dd7721f004593023..b5777296695f02877521f1edfb5fae3c0bbbc584 100644 (file)
--- a/src/core/CacheEntry.hpp
+++ b/src/ccache/core/CacheEntry.hpp
@@ -18,11 +18,11 @@
 
 #pragma once
 
-#include <core/Serializer.hpp>
-#include <core/types.hpp>
-#include <util/Bytes.hpp>
+#include <ccache/core/Serializer.hpp>
+#include <ccache/core/types.hpp>
+#include <ccache/util/Bytes.hpp>
 
-#include <third_party/nonstd/span.hpp>
+#include <nonstd/span.hpp>
 
 #include <cstdint>
 #include <filesystem>

diff --git a/src/core/CacheEntryDataReader.hpp b/src/ccache/core/CacheEntryDataReader.hpp
similarity index 91%
rename from src/core/CacheEntryDataReader.hpp
rename to src/ccache/core/CacheEntryDataReader.hpp
index 465e9677ee8baedccf9e89f69c16eaab85ba6bd8..2fc12c6039c7c610f50facfd4745876400e1ba38 100644 (file)
--- a/src/core/CacheEntryDataReader.hpp
+++ b/src/ccache/core/CacheEntryDataReader.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2022-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2022-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,12 +18,12 @@
 
 #pragma once
 
-#include <core/exceptions.hpp>
-#include <util/conversion.hpp>
-#include <util/format.hpp>
-#include <util/string.hpp>
+#include <ccache/core/exceptions.hpp>
+#include <ccache/util/conversion.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/string.hpp>
 
-#include <third_party/nonstd/span.hpp>
+#include <nonstd/span.hpp>
 
 #include <cstddef>
 #include <string_view>

diff --git a/src/core/CacheEntryDataWriter.hpp b/src/ccache/core/CacheEntryDataWriter.hpp
similarity index 91%
rename from src/core/CacheEntryDataWriter.hpp
rename to src/ccache/core/CacheEntryDataWriter.hpp
index 1022195a8131c9877b2e8dcd5316f4ffb904f821..df44d9bc49014128b956dc768fa58ff931350ac4 100644 (file)
--- a/src/core/CacheEntryDataWriter.hpp
+++ b/src/ccache/core/CacheEntryDataWriter.hpp
@@ -18,12 +18,12 @@
 
 #pragma once
 
-#include <core/exceptions.hpp>
-#include <util/conversion.hpp>
-#include <util/format.hpp>
-#include <util/string.hpp>
+#include <ccache/core/exceptions.hpp>
+#include <ccache/util/conversion.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/string.hpp>
 
-#include <third_party/nonstd/span.hpp>
+#include <nonstd/span.hpp>
 
 #include <cstddef>
 #include <cstring>

diff --git a/src/core/FileRecompressor.cpp b/src/ccache/core/FileRecompressor.cpp
similarity index 92%
rename from src/core/FileRecompressor.cpp
rename to src/ccache/core/FileRecompressor.cpp
index c2e6c0333205268a174f0b3514ce6dca99e6bf5e..945d902cc76ed1ef7949d9ac4f42dc96d393b725 100644 (file)
--- a/src/core/FileRecompressor.cpp
+++ b/src/ccache/core/FileRecompressor.cpp
@@ -18,13 +18,13 @@
 
 #include "FileRecompressor.hpp"
 
-#include <Util.hpp>
-#include <core/AtomicFile.hpp>
-#include <core/CacheEntry.hpp>
-#include <core/exceptions.hpp>
-#include <util/expected.hpp>
-#include <util/file.hpp>
-#include <util/format.hpp>
+#include <ccache/Util.hpp>
+#include <ccache/core/AtomicFile.hpp>
+#include <ccache/core/CacheEntry.hpp>
+#include <ccache/core/exceptions.hpp>
+#include <ccache/util/expected.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/format.hpp>
 
 using util::DirEntry;
 

diff --git a/src/core/FileRecompressor.hpp b/src/ccache/core/FileRecompressor.hpp
similarity index 97%
rename from src/core/FileRecompressor.hpp
rename to src/ccache/core/FileRecompressor.hpp
index 7b047f49b96df0361a2c6480a5c1295500bd4757..bf2d6d1159ab8cb42b32f1b30a82ba732c364cfd 100644 (file)
--- a/src/core/FileRecompressor.hpp
+++ b/src/ccache/core/FileRecompressor.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <util/DirEntry.hpp>
+#include <ccache/util/DirEntry.hpp>
 
 #include <atomic>
 #include <cstdint>

diff --git a/src/core/Manifest.cpp b/src/ccache/core/Manifest.cpp
similarity index 97%
rename from src/core/Manifest.cpp
rename to src/ccache/core/Manifest.cpp
index 2d60dfbe93323db4b86068c4664796a81c8261b1..5c0bc34cb3e0d2e2ed40ecb105619ca84e73cc84 100644 (file)
--- a/src/core/Manifest.cpp
+++ b/src/ccache/core/Manifest.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2009-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,16 +18,16 @@
 
 #include "Manifest.hpp"
 
-#include <Context.hpp>
-#include <Hash.hpp>
-#include <core/CacheEntryDataReader.hpp>
-#include <core/CacheEntryDataWriter.hpp>
-#include <core/exceptions.hpp>
-#include <hashutil.hpp>
-#include <util/XXH3_64.hpp>
-#include <util/format.hpp>
-#include <util/logging.hpp>
-#include <util/string.hpp>
+#include <ccache/Context.hpp>
+#include <ccache/Hash.hpp>
+#include <ccache/core/CacheEntryDataReader.hpp>
+#include <ccache/core/CacheEntryDataWriter.hpp>
+#include <ccache/core/exceptions.hpp>
+#include <ccache/hashutil.hpp>
+#include <ccache/util/XXH3_64.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/logging.hpp>
+#include <ccache/util/string.hpp>
 
 // Manifest data format
 // ====================

diff --git a/src/core/Manifest.hpp b/src/ccache/core/Manifest.hpp
similarity index 95%
rename from src/core/Manifest.hpp
rename to src/ccache/core/Manifest.hpp
index 18f7ef40399d888cee3594ead5b9d2db747142e7..a46982edd6e89e0f640a79bb7ad2e0549e414544 100644 (file)
--- a/src/core/Manifest.hpp
+++ b/src/ccache/core/Manifest.hpp
@@ -18,12 +18,12 @@
 
 #pragma once
 
-#include <Hash.hpp>
-#include <core/Serializer.hpp>
-#include <util/Bytes.hpp>
-#include <util/TimePoint.hpp>
+#include <ccache/Hash.hpp>
+#include <ccache/core/Serializer.hpp>
+#include <ccache/util/Bytes.hpp>
+#include <ccache/util/TimePoint.hpp>
 
-#include <third_party/nonstd/span.hpp>
+#include <nonstd/span.hpp>
 
 #include <cstdint>
 #include <cstdio>

diff --git a/src/core/MsvcShowIncludesOutput.cpp b/src/ccache/core/MsvcShowIncludesOutput.cpp
similarity index 95%
rename from src/core/MsvcShowIncludesOutput.cpp
rename to src/ccache/core/MsvcShowIncludesOutput.cpp
index dcc15398595ddd25eea15588c452c4cc19fd6b57..7170935b313314e5c3aee593d7e475b9883290f8 100644 (file)
--- a/src/core/MsvcShowIncludesOutput.cpp
+++ b/src/ccache/core/MsvcShowIncludesOutput.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2022-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2022-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,8 +18,8 @@
 
 #include "MsvcShowIncludesOutput.hpp"
 
-#include <Context.hpp>
-#include <util/string.hpp>
+#include <ccache/Context.hpp>
+#include <ccache/util/string.hpp>
 
 namespace core::MsvcShowIncludesOutput {
 

diff --git a/src/core/MsvcShowIncludesOutput.hpp b/src/ccache/core/MsvcShowIncludesOutput.hpp
similarity index 92%
rename from src/core/MsvcShowIncludesOutput.hpp
rename to src/ccache/core/MsvcShowIncludesOutput.hpp
index 97c59c06132ef49935086f5389f9a211fb1c3c4f..ac1cc8a6f57548839ee2d01ddd2e6871903b30d8 100644 (file)
--- a/src/core/MsvcShowIncludesOutput.hpp
+++ b/src/ccache/core/MsvcShowIncludesOutput.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 Joel Rosdahl and other contributors
+// Copyright (C) 2022-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <util/Bytes.hpp>
+#include <ccache/util/Bytes.hpp>
 
 #include <string_view>
 #include <vector>

diff --git a/src/core/Result.cpp b/src/ccache/core/Result.cpp
similarity index 93%
rename from src/core/Result.cpp
rename to src/ccache/core/Result.cpp
index 94a6b0c7cf702f028f86d048f1105ad005b158cd..b22ae0e7da6f4d1d936529c3711fdb5dca2932dc 100644 (file)
--- a/src/core/Result.cpp
+++ b/src/ccache/core/Result.cpp
@@ -18,25 +18,24 @@
 
 #include "Result.hpp"
 
-#include "Config.hpp"
-#include "Context.hpp"
-
-#include <ccache.hpp>
-#include <core/CacheEntryDataReader.hpp>
-#include <core/CacheEntryDataWriter.hpp>
-#include <core/Statistic.hpp>
-#include <core/exceptions.hpp>
-#include <util/Bytes.hpp>
-#include <util/DirEntry.hpp>
-#include <util/FileStream.hpp>
-#include <util/expected.hpp>
-#include <util/file.hpp>
-#include <util/filesystem.hpp>
-#include <util/format.hpp>
-#include <util/logging.hpp>
-#include <util/path.hpp>
-#include <util/string.hpp>
-#include <util/wincompat.hpp>
+#include <ccache/Config.hpp>
+#include <ccache/Context.hpp>
+#include <ccache/ccache.hpp>
+#include <ccache/core/CacheEntryDataReader.hpp>
+#include <ccache/core/CacheEntryDataWriter.hpp>
+#include <ccache/core/Statistic.hpp>
+#include <ccache/core/exceptions.hpp>
+#include <ccache/util/Bytes.hpp>
+#include <ccache/util/DirEntry.hpp>
+#include <ccache/util/FileStream.hpp>
+#include <ccache/util/expected.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/logging.hpp>
+#include <ccache/util/path.hpp>
+#include <ccache/util/string.hpp>
+#include <ccache/util/wincompat.hpp>
 
 #include <fcntl.h>
 #include <sys/stat.h>

diff --git a/src/core/Result.hpp b/src/ccache/core/Result.hpp
similarity index 98%
rename from src/core/Result.hpp
rename to src/ccache/core/Result.hpp
index 6ec343d5a44fce34bafbf3853edd7ca76b31229c..01ddfb6ffa220328da81ba08cc8a048a0e2036ec 100644 (file)
--- a/src/core/Result.hpp
+++ b/src/ccache/core/Result.hpp
@@ -18,10 +18,10 @@
 
 #pragma once
 
-#include <core/Serializer.hpp>
-#include <util/Bytes.hpp>
+#include <ccache/core/Serializer.hpp>
+#include <ccache/util/Bytes.hpp>
 
-#include <third_party/nonstd/span.hpp>
+#include <nonstd/span.hpp>
 
 #include <cstdint>
 #include <string>

diff --git a/src/core/ResultExtractor.cpp b/src/ccache/core/ResultExtractor.cpp
similarity index 89%
rename from src/core/ResultExtractor.cpp
rename to src/ccache/core/ResultExtractor.cpp
index 77a96291fdc9222be9108fedf5932a70ebe83043..f765da4b4fde7a385a3f98dca41df21ad894ac2c 100644 (file)
--- a/src/core/ResultExtractor.cpp
+++ b/src/ccache/core/ResultExtractor.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2020-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,15 +18,14 @@
 
 #include "ResultExtractor.hpp"
 
-#include "Util.hpp"
-
-#include <core/exceptions.hpp>
-#include <util/Bytes.hpp>
-#include <util/DirEntry.hpp>
-#include <util/expected.hpp>
-#include <util/file.hpp>
-#include <util/format.hpp>
-#include <util/wincompat.hpp>
+#include <ccache/Util.hpp>
+#include <ccache/core/exceptions.hpp>
+#include <ccache/util/Bytes.hpp>
+#include <ccache/util/DirEntry.hpp>
+#include <ccache/util/expected.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/wincompat.hpp>
 
 #include <fcntl.h>
 #include <sys/stat.h>

diff --git a/src/core/ResultExtractor.hpp b/src/ccache/core/ResultExtractor.hpp
similarity index 96%
rename from src/core/ResultExtractor.hpp
rename to src/ccache/core/ResultExtractor.hpp
index 325ec4f0c4d547b5aa9a2b6e3587d3752009ab66..b840ba81efe72f4ab920a9c773acf88736a7b9ba 100644 (file)
--- a/src/core/ResultExtractor.hpp
+++ b/src/ccache/core/ResultExtractor.hpp
@@ -18,9 +18,9 @@
 
 #pragma once
 
-#include <core/Result.hpp>
+#include <ccache/core/Result.hpp>
 
-#include <third_party/nonstd/span.hpp>
+#include <nonstd/span.hpp>
 
 #include <cstdint>
 #include <functional>

diff --git a/src/core/ResultInspector.cpp b/src/ccache/core/ResultInspector.cpp
similarity index 91%
rename from src/core/ResultInspector.cpp
rename to src/ccache/core/ResultInspector.cpp
index f25102664fc2b26eccb8a97f44b27200825dd205..aaa8165633301d066f16a5c6872f76015a988d92 100644 (file)
--- a/src/core/ResultInspector.cpp
+++ b/src/ccache/core/ResultInspector.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Joel Rosdahl and other contributors
+// Copyright (C) 2020-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,10 +18,9 @@
 
 #include "ResultInspector.hpp"
 
-#include "Context.hpp"
-
-#include <util/format.hpp>
-#include <util/logging.hpp>
+#include <ccache/Context.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/logging.hpp>
 
 namespace core {
 

diff --git a/src/core/ResultInspector.hpp b/src/ccache/core/ResultInspector.hpp
similarity index 95%
rename from src/core/ResultInspector.hpp
rename to src/ccache/core/ResultInspector.hpp
index 374240d1702f992fc4d4f26b9f0b09d9ff76ad64..a1b132bcf6c3e17f1aeb184fae80df5bdcf9c5c0 100644 (file)
--- a/src/core/ResultInspector.hpp
+++ b/src/ccache/core/ResultInspector.hpp
@@ -18,9 +18,9 @@
 
 #pragma once
 
-#include <core/Result.hpp>
+#include <ccache/core/Result.hpp>
 
-#include <third_party/nonstd/span.hpp>
+#include <nonstd/span.hpp>
 
 #include <cstdint>
 #include <cstdio>

diff --git a/src/core/ResultRetriever.cpp b/src/ccache/core/ResultRetriever.cpp
similarity index 92%
rename from src/core/ResultRetriever.cpp
rename to src/ccache/core/ResultRetriever.cpp
index fceb2c738778fcb8a853ee258f25faf7cf677784..9f0cbb86bcc142fb3d28f9cf300b355642a77b77 100644 (file)
--- a/src/core/ResultRetriever.cpp
+++ b/src/ccache/core/ResultRetriever.cpp
@@ -18,22 +18,21 @@
 
 #include "ResultRetriever.hpp"
 
-#include "Depfile.hpp"
-
-#include <Context.hpp>
-#include <core/MsvcShowIncludesOutput.hpp>
-#include <core/common.hpp>
-#include <core/exceptions.hpp>
-#include <util/DirEntry.hpp>
-#include <util/Fd.hpp>
-#include <util/expected.hpp>
-#include <util/file.hpp>
-#include <util/filesystem.hpp>
-#include <util/format.hpp>
-#include <util/logging.hpp>
-#include <util/path.hpp>
-#include <util/string.hpp>
-#include <util/wincompat.hpp>
+#include <ccache/Context.hpp>
+#include <ccache/Depfile.hpp>
+#include <ccache/core/MsvcShowIncludesOutput.hpp>
+#include <ccache/core/common.hpp>
+#include <ccache/core/exceptions.hpp>
+#include <ccache/util/DirEntry.hpp>
+#include <ccache/util/Fd.hpp>
+#include <ccache/util/expected.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/logging.hpp>
+#include <ccache/util/path.hpp>
+#include <ccache/util/string.hpp>
+#include <ccache/util/wincompat.hpp>
 
 #include <fcntl.h>
 #include <sys/stat.h>

diff --git a/src/core/ResultRetriever.hpp b/src/ccache/core/ResultRetriever.hpp
similarity index 93%
rename from src/core/ResultRetriever.hpp
rename to src/ccache/core/ResultRetriever.hpp
index 74e5e102f6c7c3853453db80dae2ca913731e66a..9582c47c1b63251129ddef03a283dd27d574b3bc 100644 (file)
--- a/src/core/ResultRetriever.hpp
+++ b/src/ccache/core/ResultRetriever.hpp
@@ -18,11 +18,11 @@
 
 #pragma once
 
-#include <Hash.hpp>
-#include <core/Result.hpp>
-#include <core/exceptions.hpp>
+#include <ccache/Hash.hpp>
+#include <ccache/core/Result.hpp>
+#include <ccache/core/exceptions.hpp>
 
-#include <third_party/nonstd/span.hpp>
+#include <nonstd/span.hpp>
 
 #include <cstdint>
 #include <optional>

diff --git a/src/core/Serializer.hpp b/src/ccache/core/Serializer.hpp
similarity index 89%
rename from src/core/Serializer.hpp
rename to src/ccache/core/Serializer.hpp
index bb5ddd0342c4d5e0006336f2f9d3a1d901e9d084..01b3860d498f521d9db2ba7cd3bf1550b8ff923d 100644 (file)
--- a/src/core/Serializer.hpp
+++ b/src/ccache/core/Serializer.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 Joel Rosdahl and other contributors
+// Copyright (C) 2022-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,9 +18,9 @@
 
 #pragma once
 
-#include <util/Bytes.hpp>
+#include <ccache/util/Bytes.hpp>
 
-#include <third_party/nonstd/span.hpp>
+#include <nonstd/span.hpp>
 
 #include <cstdint>
 

diff --git a/src/core/Sloppiness.hpp b/src/ccache/core/Sloppiness.hpp
similarity index 95%
rename from src/core/Sloppiness.hpp
rename to src/ccache/core/Sloppiness.hpp
index 2466934be509460cff17219a8abda4ef62c929a4..9afc08a52e031287873b5c0b66b6429f9f289b80 100644 (file)
--- a/src/core/Sloppiness.hpp
+++ b/src/ccache/core/Sloppiness.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2021-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <util/BitSet.hpp>
+#include <ccache/util/BitSet.hpp>
 
 #include <cstdint>
 #include <string>

diff --git a/src/core/Statistic.hpp b/src/ccache/core/Statistic.hpp
similarity index 100%
rename from src/core/Statistic.hpp
rename to src/ccache/core/Statistic.hpp

diff --git a/src/core/Statistics.cpp b/src/ccache/core/Statistics.cpp
similarity index 98%
rename from src/core/Statistics.cpp
rename to src/ccache/core/Statistics.cpp
index 85063da751e3032ca17363d64ae14abd83bf8c13..1f012a428edf0b7cecdcc106063c77e4ab52e2b9 100644 (file)
--- a/src/core/Statistics.cpp
+++ b/src/ccache/core/Statistics.cpp
@@ -18,13 +18,13 @@
 
 #include "Statistics.hpp"
 
-#include <Config.hpp>
-#include <Util.hpp>
-#include <util/TextTable.hpp>
-#include <util/format.hpp>
-#include <util/logging.hpp>
-#include <util/string.hpp>
-#include <util/time.hpp>
+#include <ccache/Config.hpp>
+#include <ccache/Util.hpp>
+#include <ccache/util/TextTable.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/logging.hpp>
+#include <ccache/util/string.hpp>
+#include <ccache/util/time.hpp>
 
 #include <algorithm>
 

diff --git a/src/core/Statistics.hpp b/src/ccache/core/Statistics.hpp
similarity index 95%
rename from src/core/Statistics.hpp
rename to src/ccache/core/Statistics.hpp
index 54f7641fac74341c3c947fc6615981039eb183e4..27d4b3537d057da2c93cd6324e3d5533d9106b43 100644 (file)
--- a/src/core/Statistics.hpp
+++ b/src/ccache/core/Statistics.hpp
@@ -18,9 +18,9 @@
 
 #pragma once
 
-#include <core/Statistic.hpp>
-#include <core/StatisticsCounters.hpp>
-#include <util/TimePoint.hpp>
+#include <ccache/core/Statistic.hpp>
+#include <ccache/core/StatisticsCounters.hpp>
+#include <ccache/util/TimePoint.hpp>
 
 #include <cstdint>
 #include <string>

diff --git a/src/core/StatisticsCounters.cpp b/src/ccache/core/StatisticsCounters.cpp
similarity index 97%
rename from src/core/StatisticsCounters.cpp
rename to src/ccache/core/StatisticsCounters.cpp
index 3c08a27144af71481317e9e887fafd2510ced3e6..147efade7b87da83eaeef8d05a3d5d9f8ce57618 100644 (file)
--- a/src/core/StatisticsCounters.cpp
+++ b/src/ccache/core/StatisticsCounters.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2010-2022 Joel Rosdahl and other contributors
+// Copyright (C) 2010-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,7 +18,7 @@
 
 #include "StatisticsCounters.hpp"
 
-#include <util/assertions.hpp>
+#include <ccache/util/assertions.hpp>
 
 #include <algorithm>
 

diff --git a/src/core/StatisticsCounters.hpp b/src/ccache/core/StatisticsCounters.hpp
similarity index 100%
rename from src/core/StatisticsCounters.hpp
rename to src/ccache/core/StatisticsCounters.hpp

diff --git a/src/core/StatsLog.cpp b/src/ccache/core/StatsLog.cpp
similarity index 92%
rename from src/core/StatsLog.cpp
rename to src/ccache/core/StatsLog.cpp
index 30acb0fcfc77d71bcd3e99d37f8ee20749e783ba..487a26ee6a2678d712d17302311e866baa7885a9 100644 (file)
--- a/src/core/StatsLog.cpp
+++ b/src/ccache/core/StatsLog.cpp
@@ -18,10 +18,10 @@
 
 #include "StatsLog.hpp"
 
-#include <core/Statistics.hpp>
-#include <util/FileStream.hpp>
-#include <util/format.hpp>
-#include <util/logging.hpp>
+#include <ccache/core/Statistics.hpp>
+#include <ccache/util/FileStream.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/logging.hpp>
 
 #include <cstring>
 #include <fstream>

diff --git a/src/core/StatsLog.hpp b/src/ccache/core/StatsLog.hpp
similarity index 100%
rename from src/core/StatsLog.hpp
rename to src/ccache/core/StatsLog.hpp

diff --git a/src/core/common.cpp b/src/ccache/core/common.cpp
similarity index 93%
rename from src/core/common.cpp
rename to src/ccache/core/common.cpp
index cf5a8ed5be833ae29f2a1ef17687b88ac7cdf86d..4018123448576c378f5a37701e6b0cdbdbe9b4d1 100644 (file)
--- a/src/core/common.cpp
+++ b/src/ccache/core/common.cpp
@@ -18,16 +18,16 @@
 
 #include "common.hpp"
 
-#include <Context.hpp>
-#include <core/exceptions.hpp>
-#include <util/Finalizer.hpp>
-#include <util/PathString.hpp>
-#include <util/Tokenizer.hpp>
-#include <util/expected.hpp>
-#include <util/file.hpp>
-#include <util/filesystem.hpp>
-#include <util/format.hpp>
-#include <util/path.hpp>
+#include <ccache/Context.hpp>
+#include <ccache/core/exceptions.hpp>
+#include <ccache/util/Finalizer.hpp>
+#include <ccache/util/PathString.hpp>
+#include <ccache/util/Tokenizer.hpp>
+#include <ccache/util/expected.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/path.hpp>
 
 using IncludeDelimiter = util::Tokenizer::IncludeDelimiter;
 using pstr = util::PathString;

diff --git a/src/core/common.hpp b/src/ccache/core/common.hpp
similarity index 100%
rename from src/core/common.hpp
rename to src/ccache/core/common.hpp

diff --git a/src/core/exceptions.hpp b/src/ccache/core/exceptions.hpp
similarity index 97%
rename from src/core/exceptions.hpp
rename to src/ccache/core/exceptions.hpp
index 7bdf5094302e6079d43e428f93ebe958ce096fda..7017e930a714720fdf3b8ab26ac055946245df4c 100644 (file)
--- a/src/core/exceptions.hpp
+++ b/src/ccache/core/exceptions.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <third_party/fmt/core.h>
+#include <fmt/core.h>
 
 #include <optional>
 #include <stdexcept>

diff --git a/src/core/mainoptions.cpp b/src/ccache/core/mainoptions.cpp
similarity index 95%
rename from src/core/mainoptions.cpp
rename to src/ccache/core/mainoptions.cpp
index 2eb20ad340f74de1480467fb8f7bcbe40ec88391..7695d7f73865caacddaff03e60d65bacdeba1ceb 100644 (file)
--- a/src/core/mainoptions.cpp
+++ b/src/ccache/core/mainoptions.cpp
@@ -18,39 +18,39 @@
 
 #include "mainoptions.hpp"
 
-#include <Config.hpp>
-#include <Hash.hpp>
-#include <InodeCache.hpp>
-#include <ProgressBar.hpp>
-#include <Util.hpp>
-#include <ccache.hpp>
-#include <core/CacheEntry.hpp>
-#include <core/FileRecompressor.hpp>
-#include <core/Manifest.hpp>
-#include <core/Result.hpp>
-#include <core/ResultExtractor.hpp>
-#include <core/ResultInspector.hpp>
-#include <core/Statistics.hpp>
-#include <core/StatsLog.hpp>
-#include <core/exceptions.hpp>
-#include <storage/Storage.hpp>
-#include <storage/local/LocalStorage.hpp>
-#include <util/Fd.hpp>
-#include <util/FileStream.hpp>
-#include <util/PathString.hpp>
-#include <util/TemporaryFile.hpp>
-#include <util/TextTable.hpp>
-#include <util/ThreadPool.hpp>
-#include <util/UmaskScope.hpp>
-#include <util/XXH3_128.hpp>
-#include <util/assertions.hpp>
-#include <util/environment.hpp>
-#include <util/expected.hpp>
-#include <util/file.hpp>
-#include <util/filesystem.hpp>
-#include <util/format.hpp>
-#include <util/logging.hpp>
-#include <util/string.hpp>
+#include <ccache/Config.hpp>
+#include <ccache/Hash.hpp>
+#include <ccache/InodeCache.hpp>
+#include <ccache/ProgressBar.hpp>
+#include <ccache/Util.hpp>
+#include <ccache/ccache.hpp>
+#include <ccache/core/CacheEntry.hpp>
+#include <ccache/core/FileRecompressor.hpp>
+#include <ccache/core/Manifest.hpp>
+#include <ccache/core/Result.hpp>
+#include <ccache/core/ResultExtractor.hpp>
+#include <ccache/core/ResultInspector.hpp>
+#include <ccache/core/Statistics.hpp>
+#include <ccache/core/StatsLog.hpp>
+#include <ccache/core/exceptions.hpp>
+#include <ccache/storage/Storage.hpp>
+#include <ccache/storage/local/LocalStorage.hpp>
+#include <ccache/util/Fd.hpp>
+#include <ccache/util/FileStream.hpp>
+#include <ccache/util/PathString.hpp>
+#include <ccache/util/TemporaryFile.hpp>
+#include <ccache/util/TextTable.hpp>
+#include <ccache/util/ThreadPool.hpp>
+#include <ccache/util/UmaskScope.hpp>
+#include <ccache/util/XXH3_128.hpp>
+#include <ccache/util/assertions.hpp>
+#include <ccache/util/environment.hpp>
+#include <ccache/util/expected.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/logging.hpp>
+#include <ccache/util/string.hpp>
 
 #include <fcntl.h>
 
@@ -68,10 +68,10 @@
 #ifdef HAVE_GETOPT_LONG
 #  include <getopt.h>
 #elif defined(_WIN32)
-#  include <third_party/win32/getopt.h>
+#  include <win32/getopt.h>
 #else
 extern "C" {
-#  include <third_party/getopt_long.h>
+#  include <getopt_long.h>
 }
 #endif
 

diff --git a/src/core/mainoptions.hpp b/src/ccache/core/mainoptions.hpp
similarity index 100%
rename from src/core/mainoptions.hpp
rename to src/ccache/core/mainoptions.hpp

diff --git a/src/core/types.cpp b/src/ccache/core/types.cpp
similarity index 90%
rename from src/core/types.cpp
rename to src/ccache/core/types.cpp
index d76942725cf917e50b185b998c94630d5be4304b..3a49b3f7c4554dcb5eed22d2f6b4ab7a2b21ad0b 100644 (file)
--- a/src/core/types.cpp
+++ b/src/ccache/core/types.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2022 Joel Rosdahl and other contributors
+// Copyright (C) 2021-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,10 +18,10 @@
 
 #include "types.hpp"
 
-#include <Config.hpp>
-#include <core/exceptions.hpp>
-#include <util/assertions.hpp>
-#include <util/format.hpp>
+#include <ccache/Config.hpp>
+#include <ccache/core/exceptions.hpp>
+#include <ccache/util/assertions.hpp>
+#include <ccache/util/format.hpp>
 
 namespace core {
 

diff --git a/src/core/types.hpp b/src/ccache/core/types.hpp
similarity index 100%
rename from src/core/types.hpp
rename to src/ccache/core/types.hpp

diff --git a/src/execute.cpp b/src/ccache/execute.cpp
similarity index 94%
rename from src/execute.cpp
rename to src/ccache/execute.cpp
index 2ea741fac5a222990367279e71285efb1ca75030..11c2750d365b9d01ded71af6c7e1a9f0888eb8a6 100644 (file)
--- a/src/execute.cpp
+++ b/src/ccache/execute.cpp
@@ -19,27 +19,26 @@
 
 #include "execute.hpp"
 
-#include "Config.hpp"
-#include "Context.hpp"
-#include "SignalHandler.hpp"
-#include "Util.hpp"
-
-#include <ccache.hpp>
-#include <core/exceptions.hpp>
-#include <util/DirEntry.hpp>
-#include <util/Fd.hpp>
-#include <util/Finalizer.hpp>
-#include <util/PathString.hpp>
-#include <util/TemporaryFile.hpp>
-#include <util/error.hpp>
-#include <util/expected.hpp>
-#include <util/file.hpp>
-#include <util/filesystem.hpp>
-#include <util/format.hpp>
-#include <util/logging.hpp>
-#include <util/path.hpp>
-#include <util/string.hpp>
-#include <util/wincompat.hpp>
+#include <ccache/Config.hpp>
+#include <ccache/Context.hpp>
+#include <ccache/SignalHandler.hpp>
+#include <ccache/Util.hpp>
+#include <ccache/ccache.hpp>
+#include <ccache/core/exceptions.hpp>
+#include <ccache/util/DirEntry.hpp>
+#include <ccache/util/Fd.hpp>
+#include <ccache/util/Finalizer.hpp>
+#include <ccache/util/PathString.hpp>
+#include <ccache/util/TemporaryFile.hpp>
+#include <ccache/util/error.hpp>
+#include <ccache/util/expected.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/logging.hpp>
+#include <ccache/util/path.hpp>
+#include <ccache/util/string.hpp>
+#include <ccache/util/wincompat.hpp>
 
 #include <vector>
 

diff --git a/src/execute.hpp b/src/ccache/execute.hpp
similarity index 98%
rename from src/execute.hpp
rename to src/ccache/execute.hpp
index 653b19181d372f10252e5afdbc10e124f5c0b218..7eaa33d12bb159c388162f9493265082a23c0bbb 100644 (file)
--- a/src/execute.hpp
+++ b/src/ccache/execute.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <util/Fd.hpp>
+#include <ccache/util/Fd.hpp>
 
 #include <filesystem>
 #include <optional>

diff --git a/src/hashutil.cpp b/src/ccache/hashutil.cpp
similarity index 96%
rename from src/hashutil.cpp
rename to src/ccache/hashutil.cpp
index c78f52885e5666e21dba73ee225fd1a0684e0647..e783921cbf213d0ebe69599150695964b94ce2b0 100644 (file)
--- a/src/hashutil.cpp
+++ b/src/ccache/hashutil.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2009-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,26 +18,25 @@
 
 #include "hashutil.hpp"
 
-#include "Args.hpp"
-#include "Config.hpp"
-#include "Context.hpp"
-#include "execute.hpp"
-#include "macroskip.hpp"
-
-#include <core/exceptions.hpp>
-#include <util/DirEntry.hpp>
-#include <util/file.hpp>
-#include <util/format.hpp>
-#include <util/logging.hpp>
-#include <util/string.hpp>
-#include <util/time.hpp>
-#include <util/wincompat.hpp>
+#include <ccache/Args.hpp>
+#include <ccache/Config.hpp>
+#include <ccache/Context.hpp>
+#include <ccache/core/exceptions.hpp>
+#include <ccache/execute.hpp>
+#include <ccache/macroskip.hpp>
+#include <ccache/util/DirEntry.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/logging.hpp>
+#include <ccache/util/string.hpp>
+#include <ccache/util/time.hpp>
+#include <ccache/util/wincompat.hpp>
 
 #ifdef INODE_CACHE_SUPPORTED
 #  include "InodeCache.hpp"
 #endif
 
-#include "third_party/blake3/blake3_cpu_supports_avx2.h"
+#include <blake3/blake3_cpu_supports_avx2.h>
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>

diff --git a/src/hashutil.hpp b/src/ccache/hashutil.hpp
similarity index 95%
rename from src/hashutil.hpp
rename to src/ccache/hashutil.hpp
index c036b429af9c232a7d6e49efdfb1d93297051f51..37746b07d41b9890e6690ae4c89b8bb972e12186 100644 (file)
--- a/src/hashutil.hpp
+++ b/src/ccache/hashutil.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2009-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include <Hash.hpp>
-#include <util/BitSet.hpp>
+#include <ccache/Hash.hpp>
+#include <ccache/util/BitSet.hpp>
 
 #include <cstddef>
 #include <string>

diff --git a/src/language.cpp b/src/ccache/language.cpp
similarity index 99%
rename from src/language.cpp
rename to src/ccache/language.cpp
index f58de52dfd349461086797155f0ad335273c1c3d..66522de00da8a49e02809f1ce6c79c5fcf81c818 100644 (file)
--- a/src/language.cpp
+++ b/src/ccache/language.cpp
@@ -18,7 +18,7 @@
 
 #include "language.hpp"
 
-#include <util/filesystem.hpp>
+#include <ccache/util/filesystem.hpp>
 
 namespace fs = util::filesystem;
 

diff --git a/src/language.hpp b/src/ccache/language.hpp
similarity index 94%
rename from src/language.hpp
rename to src/ccache/language.hpp
index 3e79bdf51193d1e99c525db5913aba4c9e3bab73..1ab0f977c98fa3cc328a06ed99bb1d760d3c1be3 100644 (file)
--- a/src/language.hpp
+++ b/src/ccache/language.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2010-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2010-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "Config.hpp"
+#include <ccache/Config.hpp>
 
 #include <string>
 

diff --git a/src/macroskip.hpp b/src/ccache/macroskip.hpp
similarity index 100%
rename from src/macroskip.hpp
rename to src/ccache/macroskip.hpp

diff --git a/src/main.cpp b/src/ccache/main.cpp
similarity index 100%
rename from src/main.cpp
rename to src/ccache/main.cpp

diff --git a/src/storage/CMakeLists.txt b/src/ccache/storage/CMakeLists.txt
similarity index 100%
rename from src/storage/CMakeLists.txt
rename to src/ccache/storage/CMakeLists.txt

diff --git a/src/storage/Storage.cpp b/src/ccache/storage/Storage.cpp
similarity index 95%
rename from src/storage/Storage.cpp
rename to src/ccache/storage/Storage.cpp
index ddb21b7a04c6336f06b991b30e892bd2ca93f713..7155f705a0b74e6b5d41382ebcb4ca5814342ac2 100644 (file)
--- a/src/storage/Storage.cpp
+++ b/src/ccache/storage/Storage.cpp
@@ -18,28 +18,28 @@
 
 #include "Storage.hpp"
 
-#include <Config.hpp>
-#include <Util.hpp>
-#include <core/CacheEntry.hpp>
-#include <core/Statistic.hpp>
-#include <core/exceptions.hpp>
-#include <storage/remote/FileStorage.hpp>
-#include <storage/remote/HttpStorage.hpp>
-#include <util/assertions.hpp>
-#include <util/format.hpp>
-#include <util/logging.hpp>
+#include <ccache/Config.hpp>
+#include <ccache/Util.hpp>
+#include <ccache/core/CacheEntry.hpp>
+#include <ccache/core/Statistic.hpp>
+#include <ccache/core/exceptions.hpp>
+#include <ccache/storage/remote/FileStorage.hpp>
+#include <ccache/storage/remote/HttpStorage.hpp>
 #ifdef HAVE_REDIS_STORAGE_BACKEND
-#  include <storage/remote/RedisStorage.hpp>
+#  include <ccache/storage/remote/RedisStorage.hpp>
 #endif
-#include <util/Bytes.hpp>
-#include <util/Timer.hpp>
-#include <util/Tokenizer.hpp>
-#include <util/XXH3_64.hpp>
-#include <util/expected.hpp>
-#include <util/file.hpp>
-#include <util/string.hpp>
-
-#include <third_party/url.hpp>
+#include <ccache/util/Bytes.hpp>
+#include <ccache/util/Timer.hpp>
+#include <ccache/util/Tokenizer.hpp>
+#include <ccache/util/XXH3_64.hpp>
+#include <ccache/util/assertions.hpp>
+#include <ccache/util/expected.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/logging.hpp>
+#include <ccache/util/string.hpp>
+
+#include <url.hpp>
 
 #include <cmath>
 #include <memory>

diff --git a/src/storage/Storage.hpp b/src/ccache/storage/Storage.hpp
similarity index 92%
rename from src/storage/Storage.hpp
rename to src/ccache/storage/Storage.hpp
index d709065c235e26e97c2a6e7cbb8b222259e3198d..3d46486d0e9a7c1fbe64c452dabfe8de12530afb 100644 (file)
--- a/src/storage/Storage.hpp
+++ b/src/ccache/storage/Storage.hpp
@@ -18,13 +18,13 @@
 
 #pragma once
 
-#include <Hash.hpp>
-#include <core/types.hpp>
-#include <storage/local/LocalStorage.hpp>
-#include <storage/remote/RemoteStorage.hpp>
-#include <util/Bytes.hpp>
+#include <ccache/Hash.hpp>
+#include <ccache/core/types.hpp>
+#include <ccache/storage/local/LocalStorage.hpp>
+#include <ccache/storage/remote/RemoteStorage.hpp>
+#include <ccache/util/Bytes.hpp>
 
-#include <third_party/nonstd/span.hpp>
+#include <nonstd/span.hpp>
 
 #include <cstdint>
 #include <functional>

diff --git a/src/storage/local/CMakeLists.txt b/src/ccache/storage/local/CMakeLists.txt
similarity index 100%
rename from src/storage/local/CMakeLists.txt
rename to src/ccache/storage/local/CMakeLists.txt

diff --git a/src/storage/local/LocalStorage.cpp b/src/ccache/storage/local/LocalStorage.cpp
similarity index 98%
rename from src/storage/local/LocalStorage.cpp
rename to src/ccache/storage/local/LocalStorage.cpp
index 1a38afedc6b6665d94fe80fa60fbd116bbf930df..fc33104229cafce3377e53e277e27dcea7d6c185 100644 (file)
--- a/src/storage/local/LocalStorage.cpp
+++ b/src/ccache/storage/local/LocalStorage.cpp
@@ -18,33 +18,33 @@
 
 #include "LocalStorage.hpp"
 
-#include <Config.hpp>
-#include <Context.hpp>
-#include <core/AtomicFile.hpp>
-#include <core/CacheEntry.hpp>
-#include <core/FileRecompressor.hpp>
-#include <core/Manifest.hpp>
-#include <core/Statistics.hpp>
-#include <core/common.hpp>
-#include <core/exceptions.hpp>
-#include <util/Duration.hpp>
-#include <util/FileStream.hpp>
-#include <util/PathString.hpp>
-#include <util/TemporaryFile.hpp>
-#include <util/TextTable.hpp>
-#include <util/ThreadPool.hpp>
-#include <util/assertions.hpp>
-#include <util/expected.hpp>
-#include <util/file.hpp>
-#include <util/filesystem.hpp>
-#include <util/format.hpp>
-#include <util/logging.hpp>
-#include <util/process.hpp>
-#include <util/string.hpp>
-#include <util/wincompat.hpp>
+#include <ccache/Config.hpp>
+#include <ccache/Context.hpp>
+#include <ccache/core/AtomicFile.hpp>
+#include <ccache/core/CacheEntry.hpp>
+#include <ccache/core/FileRecompressor.hpp>
+#include <ccache/core/Manifest.hpp>
+#include <ccache/core/Statistics.hpp>
+#include <ccache/core/common.hpp>
+#include <ccache/core/exceptions.hpp>
+#include <ccache/util/Duration.hpp>
+#include <ccache/util/FileStream.hpp>
+#include <ccache/util/PathString.hpp>
+#include <ccache/util/TemporaryFile.hpp>
+#include <ccache/util/TextTable.hpp>
+#include <ccache/util/ThreadPool.hpp>
+#include <ccache/util/assertions.hpp>
+#include <ccache/util/expected.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/logging.hpp>
+#include <ccache/util/process.hpp>
+#include <ccache/util/string.hpp>
+#include <ccache/util/wincompat.hpp>
 
 #ifdef INODE_CACHE_SUPPORTED
-#  include <InodeCache.hpp>
+#  include <ccache/InodeCache.hpp>
 #endif
 
 #include <fcntl.h>

diff --git a/src/storage/local/LocalStorage.hpp b/src/ccache/storage/local/LocalStorage.hpp
similarity index 93%
rename from src/storage/local/LocalStorage.hpp
rename to src/ccache/storage/local/LocalStorage.hpp
index 64036864c5475ef96311e92471bd10a269f9731b..313f8acd069527e7eaa997fb9c4eaf3ab7f8f67c 100644 (file)
--- a/src/storage/local/LocalStorage.hpp
+++ b/src/ccache/storage/local/LocalStorage.hpp
@@ -18,20 +18,20 @@
 
 #pragma once
 
-#include <Hash.hpp>
-#include <core/Result.hpp>
-#include <core/Statistic.hpp>
-#include <core/StatisticsCounters.hpp>
-#include <core/types.hpp>
-#include <storage/local/StatsFile.hpp>
-#include <storage/local/util.hpp>
-#include <util/Bytes.hpp>
-#include <util/DirEntry.hpp>
-#include <util/LockFile.hpp>
-#include <util/LongLivedLockFileManager.hpp>
-#include <util/TimePoint.hpp>
-
-#include <third_party/nonstd/span.hpp>
+#include <ccache/Hash.hpp>
+#include <ccache/core/Result.hpp>
+#include <ccache/core/Statistic.hpp>
+#include <ccache/core/StatisticsCounters.hpp>
+#include <ccache/core/types.hpp>
+#include <ccache/storage/local/StatsFile.hpp>
+#include <ccache/storage/local/util.hpp>
+#include <ccache/util/Bytes.hpp>
+#include <ccache/util/DirEntry.hpp>
+#include <ccache/util/LockFile.hpp>
+#include <ccache/util/LongLivedLockFileManager.hpp>
+#include <ccache/util/TimePoint.hpp>
+
+#include <nonstd/span.hpp>
 
 #include <cstdint>
 #include <filesystem>

diff --git a/src/storage/local/StatsFile.cpp b/src/ccache/storage/local/StatsFile.cpp
similarity index 89%
rename from src/storage/local/StatsFile.cpp
rename to src/ccache/storage/local/StatsFile.cpp
index a0216066234da52548d75da629582bfc2cffdca8..9b5f54e04ee3fccc534d952ec7aa7b4e8688f89a 100644 (file)
--- a/src/storage/local/StatsFile.cpp
+++ b/src/ccache/storage/local/StatsFile.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2021-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,12 +18,12 @@
 
 #include "StatsFile.hpp"
 
-#include <core/AtomicFile.hpp>
-#include <core/exceptions.hpp>
-#include <util/LockFile.hpp>
-#include <util/file.hpp>
-#include <util/format.hpp>
-#include <util/logging.hpp>
+#include <ccache/core/AtomicFile.hpp>
+#include <ccache/core/exceptions.hpp>
+#include <ccache/util/LockFile.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/logging.hpp>
 
 namespace storage::local {
 

diff --git a/src/storage/local/StatsFile.hpp b/src/ccache/storage/local/StatsFile.hpp
similarity index 93%
rename from src/storage/local/StatsFile.hpp
rename to src/ccache/storage/local/StatsFile.hpp
index cab947c7860aedd5229d80127358c7123f8eef95..c9d39222606f12a5083fc751e93f7f7c957890a7 100644 (file)
--- a/src/storage/local/StatsFile.hpp
+++ b/src/ccache/storage/local/StatsFile.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2021-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <core/StatisticsCounters.hpp>
+#include <ccache/core/StatisticsCounters.hpp>
 
 #include <functional>
 #include <optional>

diff --git a/src/storage/local/util.cpp b/src/ccache/storage/local/util.cpp
similarity index 90%
rename from src/storage/local/util.cpp
rename to src/ccache/storage/local/util.cpp
index 6de7729db982be3af325ee47b3e6a9c4f4977469..7e9b979c5dd290df43b4fa88fbfa86a6e5bee42f 100644 (file)
--- a/src/storage/local/util.cpp
+++ b/src/ccache/storage/local/util.cpp
@@ -18,13 +18,13 @@
 
 #include "util.hpp"
 
-#include <Util.hpp>
-#include <core/exceptions.hpp>
-#include <util/PathString.hpp>
-#include <util/expected.hpp>
-#include <util/file.hpp>
-#include <util/format.hpp>
-#include <util/string.hpp>
+#include <ccache/Util.hpp>
+#include <ccache/core/exceptions.hpp>
+#include <ccache/util/PathString.hpp>
+#include <ccache/util/expected.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/string.hpp>
 
 using util::DirEntry;
 using pstr = util::PathString;

diff --git a/src/storage/local/util.hpp b/src/ccache/storage/local/util.hpp
similarity index 95%
rename from src/storage/local/util.hpp
rename to src/ccache/storage/local/util.hpp
index d48af32f8b7f393fa500ab0bef406208073f03fd..71e432d3b10c28148f6b3e219f34b6ae82def535 100644 (file)
--- a/src/storage/local/util.hpp
+++ b/src/ccache/storage/local/util.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2021-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <util/DirEntry.hpp>
+#include <ccache/util/DirEntry.hpp>
 
 #include <functional>
 #include <string>

diff --git a/src/storage/remote/CMakeLists.txt b/src/ccache/storage/remote/CMakeLists.txt
similarity index 100%
rename from src/storage/remote/CMakeLists.txt
rename to src/ccache/storage/remote/CMakeLists.txt

diff --git a/src/storage/remote/FileStorage.cpp b/src/ccache/storage/remote/FileStorage.cpp
similarity index 91%
rename from src/storage/remote/FileStorage.cpp
rename to src/ccache/storage/remote/FileStorage.cpp
index 768505543785bf065752c18055ad965598417cc3..51d7f1d65cbe257ce4785351f82cfbba9a9fe564 100644 (file)
--- a/src/storage/remote/FileStorage.cpp
+++ b/src/ccache/storage/remote/FileStorage.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2021-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,19 +18,19 @@
 
 #include "FileStorage.hpp"
 
-#include <Util.hpp>
-#include <core/AtomicFile.hpp>
-#include <core/exceptions.hpp>
-#include <util/Bytes.hpp>
-#include <util/DirEntry.hpp>
-#include <util/UmaskScope.hpp>
-#include <util/assertions.hpp>
-#include <util/expected.hpp>
-#include <util/file.hpp>
-#include <util/filesystem.hpp>
-#include <util/format.hpp>
-#include <util/logging.hpp>
-#include <util/string.hpp>
+#include <ccache/Util.hpp>
+#include <ccache/core/AtomicFile.hpp>
+#include <ccache/core/exceptions.hpp>
+#include <ccache/util/Bytes.hpp>
+#include <ccache/util/DirEntry.hpp>
+#include <ccache/util/UmaskScope.hpp>
+#include <ccache/util/assertions.hpp>
+#include <ccache/util/expected.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/logging.hpp>
+#include <ccache/util/string.hpp>
 
 #include <sys/stat.h> // for mode_t
 

diff --git a/src/storage/remote/FileStorage.hpp b/src/ccache/storage/remote/FileStorage.hpp
similarity index 93%
rename from src/storage/remote/FileStorage.hpp
rename to src/ccache/storage/remote/FileStorage.hpp
index 6dee11dd08ea08f17b7bf6f65b35e41f9d68101e..4fb61b1aa0880cdc6e3686b298d549eb8c18079a 100644 (file)
--- a/src/storage/remote/FileStorage.hpp
+++ b/src/ccache/storage/remote/FileStorage.hpp
@@ -18,9 +18,9 @@
 
 #pragma once
 
-#include <storage/remote/RemoteStorage.hpp>
+#include <ccache/storage/remote/RemoteStorage.hpp>
 
-#include <third_party/url.hpp>
+#include <url.hpp>
 
 #include <memory>
 #include <vector>

diff --git a/src/storage/remote/HttpStorage.cpp b/src/ccache/storage/remote/HttpStorage.cpp
similarity index 95%
rename from src/storage/remote/HttpStorage.cpp
rename to src/ccache/storage/remote/HttpStorage.cpp
index a64e153824b3a2cfa1fc9ac978bd720fa156601b..cf469f99e40355d9aed397fba4be8407287723e7 100644 (file)
--- a/src/storage/remote/HttpStorage.cpp
+++ b/src/ccache/storage/remote/HttpStorage.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2021-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,19 +18,19 @@
 
 #include "HttpStorage.hpp"
 
-#include <Hash.hpp>
-#include <ccache.hpp>
-#include <core/exceptions.hpp>
-#include <storage/Storage.hpp>
-#include <util/assertions.hpp>
-#include <util/expected.hpp>
-#include <util/format.hpp>
-#include <util/logging.hpp>
-#include <util/string.hpp>
-#include <util/types.hpp>
-
-#include <third_party/httplib.h>
-#include <third_party/url.hpp>
+#include <ccache/Hash.hpp>
+#include <ccache/ccache.hpp>
+#include <ccache/core/exceptions.hpp>
+#include <ccache/storage/Storage.hpp>
+#include <ccache/util/assertions.hpp>
+#include <ccache/util/expected.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/logging.hpp>
+#include <ccache/util/string.hpp>
+#include <ccache/util/types.hpp>
+
+#include <httplib.h>
+#include <url.hpp>
 
 #include <string_view>
 

diff --git a/src/storage/remote/HttpStorage.hpp b/src/ccache/storage/remote/HttpStorage.hpp
similarity index 94%
rename from src/storage/remote/HttpStorage.hpp
rename to src/ccache/storage/remote/HttpStorage.hpp
index 0e721ec4114d60b1bbb6f3397e92c8f14cd507ba..fd3f4cfe1e43ab19a15f6bcc55a4faf38ad115e5 100644 (file)
--- a/src/storage/remote/HttpStorage.hpp
+++ b/src/ccache/storage/remote/HttpStorage.hpp
@@ -18,9 +18,9 @@
 
 #pragma once
 
-#include <storage/remote/RemoteStorage.hpp>
+#include <ccache/storage/remote/RemoteStorage.hpp>
 
-#include <third_party/url.hpp>
+#include <url.hpp>
 
 #include <memory>
 #include <vector>

diff --git a/src/storage/remote/RedisStorage.cpp b/src/ccache/storage/remote/RedisStorage.cpp
similarity index 96%
rename from src/storage/remote/RedisStorage.cpp
rename to src/ccache/storage/remote/RedisStorage.cpp
index 6316b23210da7347f8ea88f710f7934185f94acd..11870277bc3101d65fb43015312f228348aae466 100644 (file)
--- a/src/storage/remote/RedisStorage.cpp
+++ b/src/ccache/storage/remote/RedisStorage.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2021-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,15 +18,15 @@
 
 #include "RedisStorage.hpp"
 
-#include <Hash.hpp>
-#include <core/exceptions.hpp>
-#include <storage/Storage.hpp>
-#include <util/assertions.hpp>
-#include <util/expected.hpp>
-#include <util/format.hpp>
-#include <util/logging.hpp>
-#include <util/string.hpp>
-#include <util/wincompat.hpp> // for timeval
+#include <ccache/Hash.hpp>
+#include <ccache/core/exceptions.hpp>
+#include <ccache/storage/Storage.hpp>
+#include <ccache/util/assertions.hpp>
+#include <ccache/util/expected.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/logging.hpp>
+#include <ccache/util/string.hpp>
+#include <ccache/util/wincompat.hpp> // for timeval
 
 #ifdef HAVE_SYS_UTIME_H
 #  include <sys/utime.h> // for timeval

diff --git a/src/storage/remote/RedisStorage.hpp b/src/ccache/storage/remote/RedisStorage.hpp
similarity index 93%
rename from src/storage/remote/RedisStorage.hpp
rename to src/ccache/storage/remote/RedisStorage.hpp
index 6989782e9aa40af2164fcbda330a5f1a61dac443..be4ac2794e6e816f4b0435cceca0e1a9a8a3874b 100644 (file)
--- a/src/storage/remote/RedisStorage.hpp
+++ b/src/ccache/storage/remote/RedisStorage.hpp
@@ -18,9 +18,9 @@
 
 #pragma once
 
-#include <storage/remote/RemoteStorage.hpp>
+#include <ccache/storage/remote/RemoteStorage.hpp>
 
-#include <third_party/url.hpp>
+#include <url.hpp>
 
 #include <memory>
 #include <vector>

diff --git a/src/storage/remote/RemoteStorage.cpp b/src/ccache/storage/remote/RemoteStorage.cpp
similarity index 90%
rename from src/storage/remote/RemoteStorage.cpp
rename to src/ccache/storage/remote/RemoteStorage.cpp
index e31039018a7387821eb19ff1d5bb7504ebba316b..ca0703fa8adef73b2a02f2c73f52bc750fda5a81 100644 (file)
--- a/src/storage/remote/RemoteStorage.cpp
+++ b/src/ccache/storage/remote/RemoteStorage.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2022 Joel Rosdahl and other contributors
+// Copyright (C) 2021-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,8 +18,8 @@
 
 #include "RemoteStorage.hpp"
 
-#include <util/expected.hpp>
-#include <util/string.hpp>
+#include <ccache/util/expected.hpp>
+#include <ccache/util/string.hpp>
 
 namespace storage::remote {
 

diff --git a/src/storage/remote/RemoteStorage.hpp b/src/ccache/storage/remote/RemoteStorage.hpp
similarity index 96%
rename from src/storage/remote/RemoteStorage.hpp
rename to src/ccache/storage/remote/RemoteStorage.hpp
index 5a393ff3f710031647a667fb9a3cb7a70ab7a373..5551bd1d2db3b678d5b970955800123db318a687 100644 (file)
--- a/src/storage/remote/RemoteStorage.hpp
+++ b/src/ccache/storage/remote/RemoteStorage.hpp
@@ -18,12 +18,12 @@
 
 #pragma once
 
-#include <Hash.hpp>
-#include <util/Bytes.hpp>
+#include <ccache/Hash.hpp>
+#include <ccache/util/Bytes.hpp>
 
-#include <third_party/nonstd/span.hpp>
-#include <third_party/tl/expected.hpp>
-#include <third_party/url.hpp>
+#include <nonstd/span.hpp>
+#include <tl/expected.hpp>
+#include <url.hpp>
 
 #include <chrono>
 #include <memory>

diff --git a/src/storage/types.hpp b/src/ccache/storage/types.hpp
similarity index 100%
rename from src/storage/types.hpp
rename to src/ccache/storage/types.hpp

diff --git a/src/test_lockfile.cpp b/src/ccache/test_lockfile.cpp
similarity index 88%
rename from src/test_lockfile.cpp
rename to src/ccache/test_lockfile.cpp
index 9c0db1086ee22e7caabc29407737136f00c695b6..ee79419394d9479c0d495e9328fa85644faa955d 100644 (file)
--- a/src/test_lockfile.cpp
+++ b/src/ccache/test_lockfile.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2022-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2022-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,12 +16,12 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include <Config.hpp>
-#include <util/LockFile.hpp>
-#include <util/LongLivedLockFileManager.hpp>
-#include <util/format.hpp>
-#include <util/logging.hpp>
-#include <util/string.hpp>
+#include <ccache/Config.hpp>
+#include <ccache/util/LockFile.hpp>
+#include <ccache/util/LongLivedLockFileManager.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/logging.hpp>
+#include <ccache/util/string.hpp>
 
 #include <memory>
 #include <string>

diff --git a/src/util/BitSet.hpp b/src/ccache/util/BitSet.hpp
similarity index 100%
rename from src/util/BitSet.hpp
rename to src/ccache/util/BitSet.hpp

diff --git a/src/util/Bytes.cpp b/src/ccache/util/Bytes.cpp
similarity index 98%
rename from src/util/Bytes.cpp
rename to src/ccache/util/Bytes.cpp
index 32d181881b2474cd6cdc8caaf1506baec8ed6e1e..edd0a72c552f6e19831160f5ad3dd69f0b867eee 100644 (file)
--- a/src/util/Bytes.cpp
+++ b/src/ccache/util/Bytes.cpp
@@ -18,7 +18,7 @@
 
 #include "Bytes.hpp"
 
-#include <util/assertions.hpp>
+#include <ccache/util/assertions.hpp>
 
 namespace util {
 

diff --git a/src/util/Bytes.hpp b/src/ccache/util/Bytes.hpp
similarity index 99%
rename from src/util/Bytes.hpp
rename to src/ccache/util/Bytes.hpp
index 33032d085f3315e0bdbcfc9b11bf7ffda76e4e5e..0bfa2284e8ccadfa993c50ffb7e84ff0b8919844 100644 (file)
--- a/src/util/Bytes.hpp
+++ b/src/ccache/util/Bytes.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <third_party/nonstd/span.hpp>
+#include <nonstd/span.hpp>
 
 #include <cstdint>
 #include <cstring>

diff --git a/src/util/CMakeLists.txt b/src/ccache/util/CMakeLists.txt
similarity index 100%
rename from src/util/CMakeLists.txt
rename to src/ccache/util/CMakeLists.txt

diff --git a/src/util/DirEntry.cpp b/src/ccache/util/DirEntry.cpp
similarity index 96%
rename from src/util/DirEntry.cpp
rename to src/ccache/util/DirEntry.cpp
index 53bfdee8d348d43e230f7b5e6b85eb7527c2cff0..ec36098b1836167bea45977bc7c0ef19b911f323 100644 (file)
--- a/src/util/DirEntry.cpp
+++ b/src/ccache/util/DirEntry.cpp
@@ -18,15 +18,15 @@
 
 #include "DirEntry.hpp"
 
-#include <util/Finalizer.hpp>
-#include <util/PathString.hpp>
-#include <util/file.hpp>
-#include <util/format.hpp>
-#include <util/logging.hpp>
-#include <util/wincompat.hpp>
+#include <ccache/util/Finalizer.hpp>
+#include <ccache/util/PathString.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/logging.hpp>
+#include <ccache/util/wincompat.hpp>
 
 #ifdef _WIN32
-#  include <third_party/win32/winerror_to_errno.h>
+#  include <win32/winerror_to_errno.h>
 #endif
 
 #include <cstring>

diff --git a/src/util/DirEntry.hpp b/src/ccache/util/DirEntry.hpp
similarity index 98%
rename from src/util/DirEntry.hpp
rename to src/ccache/util/DirEntry.hpp
index 138263b4090e31d178d2ebfbcdc6d981bfcf7bff..90e02123f74f76d8a2a27f6246b3172c50f75ff6 100644 (file)
--- a/src/util/DirEntry.hpp
+++ b/src/ccache/util/DirEntry.hpp
@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include <util/TimePoint.hpp>
-#include <util/wincompat.hpp>
+#include <ccache/util/TimePoint.hpp>
+#include <ccache/util/wincompat.hpp>
 
 #include <sys/stat.h>
 

diff --git a/src/util/Duration.hpp b/src/ccache/util/Duration.hpp
similarity index 100%
rename from src/util/Duration.hpp
rename to src/ccache/util/Duration.hpp

diff --git a/src/util/Fd.hpp b/src/ccache/util/Fd.hpp
similarity index 91%
rename from src/util/Fd.hpp
rename to src/ccache/util/Fd.hpp
index 03067b2f41417bbed02cb5728989056a5350eb15..9859f243deea0ce587c3a79696a78b2727935657 100644 (file)
--- a/src/util/Fd.hpp
+++ b/src/ccache/util/Fd.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2020-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,9 +18,9 @@
 
 #pragma once
 
-#include <util/NonCopyable.hpp>
-#include <util/assertions.hpp>
-#include <util/wincompat.hpp>
+#include <ccache/util/NonCopyable.hpp>
+#include <ccache/util/assertions.hpp>
+#include <ccache/util/wincompat.hpp>
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>

diff --git a/src/util/FileStream.hpp b/src/ccache/util/FileStream.hpp
similarity index 95%
rename from src/util/FileStream.hpp
rename to src/ccache/util/FileStream.hpp
index e50e47a0881b40ae1a16b510de8f647f4c727557..d91e9c76d796db86953c15911df13757a589ee45 100644 (file)
--- a/src/util/FileStream.hpp
+++ b/src/ccache/util/FileStream.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2019-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2019-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <util/NonCopyable.hpp>
+#include <ccache/util/NonCopyable.hpp>
 
 #include <cstdio>
 #include <string>

diff --git a/src/util/Finalizer.hpp b/src/ccache/util/Finalizer.hpp
similarity index 100%
rename from src/util/Finalizer.hpp
rename to src/ccache/util/Finalizer.hpp

diff --git a/src/util/LockFile.cpp b/src/ccache/util/LockFile.cpp
similarity index 96%
rename from src/util/LockFile.cpp
rename to src/ccache/util/LockFile.cpp
index cbc36311a2be2de4430717dd933fa6a954ca98b9..43b62cd10dec126f6af8d32463703921c0b89f5a 100644 (file)
--- a/src/util/LockFile.cpp
+++ b/src/ccache/util/LockFile.cpp
@@ -18,18 +18,17 @@
 
 #include "LockFile.hpp"
 
-#include "Util.hpp"
-
-#include <util/DirEntry.hpp>
-#include <util/PathString.hpp>
-#include <util/assertions.hpp>
-#include <util/error.hpp>
-#include <util/file.hpp>
-#include <util/filesystem.hpp>
-#include <util/format.hpp>
-#include <util/logging.hpp>
-#include <util/process.hpp>
-#include <util/wincompat.hpp>
+#include <ccache/Util.hpp>
+#include <ccache/util/DirEntry.hpp>
+#include <ccache/util/PathString.hpp>
+#include <ccache/util/assertions.hpp>
+#include <ccache/util/error.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/logging.hpp>
+#include <ccache/util/process.hpp>
+#include <ccache/util/wincompat.hpp>
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>

diff --git a/src/util/LockFile.hpp b/src/ccache/util/LockFile.hpp
similarity index 92%
rename from src/util/LockFile.hpp
rename to src/ccache/util/LockFile.hpp
index a04511d90e525a6c19aa25300b8f87419d6a2d32..95b984054d51109d42ab064a89a892383d4d8301 100644 (file)
--- a/src/util/LockFile.hpp
+++ b/src/ccache/util/LockFile.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2020-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,9 +18,9 @@
 
 #pragma once
 
-#include <util/LongLivedLockFileManager.hpp>
-#include <util/NonCopyable.hpp>
-#include <util/TimePoint.hpp>
+#include <ccache/util/LongLivedLockFileManager.hpp>
+#include <ccache/util/NonCopyable.hpp>
+#include <ccache/util/TimePoint.hpp>
 
 #include <filesystem>
 #include <optional>

diff --git a/src/util/LongLivedLockFileManager.cpp b/src/ccache/util/LongLivedLockFileManager.cpp
similarity index 92%
rename from src/util/LongLivedLockFileManager.cpp
rename to src/ccache/util/LongLivedLockFileManager.cpp
index 7fa7c841e360ad6e4a687f9099446f78baf26950..bf6e22791b7d2fafbf9ca397eed7d8b52f477a4a 100644 (file)
--- a/src/util/LongLivedLockFileManager.cpp
+++ b/src/ccache/util/LongLivedLockFileManager.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2022-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2022-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,10 +18,10 @@
 
 #include "LongLivedLockFileManager.hpp"
 
-#include <Util.hpp>
-#include <util/file.hpp>
-#include <util/filesystem.hpp>
-#include <util/logging.hpp>
+#include <ccache/Util.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/logging.hpp>
 
 #include <chrono>
 

diff --git a/src/util/LongLivedLockFileManager.hpp b/src/ccache/util/LongLivedLockFileManager.hpp
similarity index 93%
rename from src/util/LongLivedLockFileManager.hpp
rename to src/ccache/util/LongLivedLockFileManager.hpp
index b65cf62c51c1c14bbb5e37cf56601e39a17c9ca2..5156097f736a30a4116620d0b8fcd8eccac17a4e 100644 (file)
--- a/src/util/LongLivedLockFileManager.hpp
+++ b/src/ccache/util/LongLivedLockFileManager.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2022-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2022-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <util/NonCopyable.hpp>
+#include <ccache/util/NonCopyable.hpp>
 
 #include <condition_variable>
 #include <filesystem>

diff --git a/src/util/MemoryMap.cpp b/src/ccache/util/MemoryMap.cpp
similarity index 97%
rename from src/util/MemoryMap.cpp
rename to src/ccache/util/MemoryMap.cpp
index 7430c7d0ee9983fee1e66d0117aef26616f15606..35e29e1032c874b5e8395b117961a6208d2f2f36 100644 (file)
--- a/src/util/MemoryMap.cpp
+++ b/src/ccache/util/MemoryMap.cpp
@@ -18,8 +18,8 @@
 
 #include "MemoryMap.hpp"
 
-#include <util/format.hpp>
-#include <util/wincompat.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/wincompat.hpp>
 
 #include <cstring>
 

diff --git a/src/util/MemoryMap.hpp b/src/ccache/util/MemoryMap.hpp
similarity index 95%
rename from src/util/MemoryMap.hpp
rename to src/ccache/util/MemoryMap.hpp
index 538b2f12327a86040c59d401bcb6865faf157e34..f4d27d92e7626799e76294a6ec55913f4735cc90 100644 (file)
--- a/src/util/MemoryMap.hpp
+++ b/src/ccache/util/MemoryMap.hpp
@@ -18,9 +18,9 @@
 
 #pragma once
 
-#include <util/NonCopyable.hpp>
+#include <ccache/util/NonCopyable.hpp>
 
-#include <third_party/tl/expected.hpp>
+#include <tl/expected.hpp>
 
 #include <cstddef>
 #include <string>

diff --git a/src/util/NonCopyable.hpp b/src/ccache/util/NonCopyable.hpp
similarity index 100%
rename from src/util/NonCopyable.hpp
rename to src/ccache/util/NonCopyable.hpp

diff --git a/src/util/PathString.hpp b/src/ccache/util/PathString.hpp
similarity index 100%
rename from src/util/PathString.hpp
rename to src/ccache/util/PathString.hpp

diff --git a/src/util/TemporaryFile.cpp b/src/ccache/util/TemporaryFile.cpp
similarity index 92%
rename from src/util/TemporaryFile.cpp
rename to src/ccache/util/TemporaryFile.cpp
index a3dff93c86b998a4bb0336e5d09ede43138f0047..80d838f39ce80e8ee0ee503d969ecf0383a03182 100644 (file)
--- a/src/util/TemporaryFile.cpp
+++ b/src/ccache/util/TemporaryFile.cpp
@@ -18,11 +18,11 @@
 
 #include "TemporaryFile.hpp"
 
-#include <util/PathString.hpp>
-#include <util/file.hpp>
-#include <util/filesystem.hpp>
-#include <util/format.hpp>
-#include <util/process.hpp>
+#include <ccache/util/PathString.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/process.hpp>
 
 #include <cstdlib>
 
@@ -31,7 +31,7 @@
 #endif
 
 #ifdef _WIN32
-#  include <third_party/win32/mktemp.h>
+#  include <win32/mktemp.h>
 #endif
 
 namespace fs = util::filesystem;

diff --git a/src/util/TemporaryFile.hpp b/src/ccache/util/TemporaryFile.hpp
similarity index 93%
rename from src/util/TemporaryFile.hpp
rename to src/ccache/util/TemporaryFile.hpp
index 8e121c5cb8e329790153726e7ffc74cc37d05b34..e92a8e9dfc83dcb4537979edfa59daa6b132b2a0 100644 (file)
--- a/src/util/TemporaryFile.hpp
+++ b/src/ccache/util/TemporaryFile.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2020-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,9 +18,9 @@
 
 #pragma once
 
-#include <util/Fd.hpp>
+#include <ccache/util/Fd.hpp>
 
-#include <third_party/tl/expected.hpp>
+#include <tl/expected.hpp>
 
 #include <filesystem>
 #include <string>

diff --git a/src/util/TextTable.cpp b/src/ccache/util/TextTable.cpp
similarity index 97%
rename from src/util/TextTable.cpp
rename to src/ccache/util/TextTable.cpp
index 9880d1fcc185cd6ef9d0e29c40287ccce435242a..9afd324d73fa32387c418a5ad7acfebea940eff7 100644 (file)
--- a/src/util/TextTable.cpp
+++ b/src/ccache/util/TextTable.cpp
@@ -18,10 +18,10 @@
 
 #include "TextTable.hpp"
 
-#include <util/assertions.hpp>
-#include <util/format.hpp>
+#include <ccache/util/assertions.hpp>
+#include <ccache/util/format.hpp>
 
-#include <third_party/fmt/core.h>
+#include <fmt/core.h>
 
 #include <algorithm>
 

diff --git a/src/util/TextTable.hpp b/src/ccache/util/TextTable.hpp
similarity index 100%
rename from src/util/TextTable.hpp
rename to src/ccache/util/TextTable.hpp

diff --git a/src/util/ThreadPool.cpp b/src/ccache/util/ThreadPool.cpp
similarity index 100%
rename from src/util/ThreadPool.cpp
rename to src/ccache/util/ThreadPool.cpp

diff --git a/src/util/ThreadPool.hpp b/src/ccache/util/ThreadPool.hpp
similarity index 100%
rename from src/util/ThreadPool.hpp
rename to src/ccache/util/ThreadPool.hpp

diff --git a/src/util/TimePoint.cpp b/src/ccache/util/TimePoint.cpp
similarity index 100%
rename from src/util/TimePoint.cpp
rename to src/ccache/util/TimePoint.cpp

diff --git a/src/util/TimePoint.hpp b/src/ccache/util/TimePoint.hpp
similarity index 99%
rename from src/util/TimePoint.hpp
rename to src/ccache/util/TimePoint.hpp
index 530bd124bcf18f1e9041a476bda0daa30fa72e4b..a12aa19656818d78482ad23238d7347f2835834a 100644 (file)
--- a/src/util/TimePoint.hpp
+++ b/src/ccache/util/TimePoint.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <util/Duration.hpp>
+#include <ccache/util/Duration.hpp>
 
 #include <cstdint>
 #include <ctime>

diff --git a/src/util/Timer.hpp b/src/ccache/util/Timer.hpp
similarity index 100%
rename from src/util/Timer.hpp
rename to src/ccache/util/Timer.hpp

diff --git a/src/util/Tokenizer.cpp b/src/ccache/util/Tokenizer.cpp
similarity index 100%
rename from src/util/Tokenizer.cpp
rename to src/ccache/util/Tokenizer.cpp

diff --git a/src/util/Tokenizer.hpp b/src/ccache/util/Tokenizer.hpp
similarity index 98%
rename from src/util/Tokenizer.hpp
rename to src/ccache/util/Tokenizer.hpp
index ba69e18fe2c812fd7814cd12132505b15793cc18..143be82b464723559c4e93a9f73971e1cbe58f45 100644 (file)
--- a/src/util/Tokenizer.hpp
+++ b/src/ccache/util/Tokenizer.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <util/assertions.hpp>
+#include <ccache/util/assertions.hpp>
 
 #include <cstddef>
 #include <string_view>

diff --git a/src/util/UmaskScope.cpp b/src/ccache/util/UmaskScope.cpp
similarity index 93%
rename from src/util/UmaskScope.cpp
rename to src/ccache/util/UmaskScope.cpp
index 103d6598ccfdbf9a714260ab71d4b67ebe3045d8..049167482a83585dedcc752c107f4f260dd3a253 100644 (file)
--- a/src/util/UmaskScope.cpp
+++ b/src/ccache/util/UmaskScope.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 Joel Rosdahl and other contributors
+// Copyright (C) 2023-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,7 +18,7 @@
 
 #include "UmaskScope.hpp"
 
-#include <util/process.hpp>
+#include <ccache/util/process.hpp>
 
 #include <sys/stat.h>
 

diff --git a/src/util/UmaskScope.hpp b/src/ccache/util/UmaskScope.hpp
similarity index 100%
rename from src/util/UmaskScope.hpp
rename to src/ccache/util/UmaskScope.hpp

diff --git a/src/util/XXH3_128.hpp b/src/ccache/util/XXH3_128.hpp
similarity index 87%
rename from src/util/XXH3_128.hpp
rename to src/ccache/util/XXH3_128.hpp
index ddc52ba14d3ef8c48547a7ab3b67cde483e5da88..02ea1080c54cade05a7b6ce6828f57605ccada6b 100644 (file)
--- a/src/util/XXH3_128.hpp
+++ b/src/ccache/util/XXH3_128.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2021-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,14 +18,14 @@
 
 #pragma once
 
-#include <util/Bytes.hpp>
-#include <util/conversion.hpp>
+#include <ccache/util/Bytes.hpp>
+#include <ccache/util/conversion.hpp>
 
-#include <third_party/nonstd/span.hpp>
+#include <nonstd/span.hpp>
 #ifdef USE_XXH_DISPATCH
-#  include <third_party/xxh_x86dispatch.h>
+#  include <xxh_x86dispatch.h>
 #else
-#  include <third_party/xxhash.h>
+#  include <xxhash.h>
 #endif
 
 #include <cstdint>

diff --git a/src/util/XXH3_64.hpp b/src/ccache/util/XXH3_64.hpp
similarity index 95%
rename from src/util/XXH3_64.hpp
rename to src/ccache/util/XXH3_64.hpp
index 61f0fabebe3c8fb99da5142ee9bfcb2a1be8e785..1895759de32f075dd1918c8840b917028b6e05ca 100644 (file)
--- a/src/util/XXH3_64.hpp
+++ b/src/ccache/util/XXH3_64.hpp
@@ -19,9 +19,9 @@
 #pragma once
 
 #ifdef USE_XXH_DISPATCH
-#  include "third_party/xxh_x86dispatch.h"
+#  include <xxh_x86dispatch.h>
 #else
-#  include "third_party/xxhash.h"
+#  include <xxhash.h>
 #endif
 
 #include <cstdint>

diff --git a/src/util/assertions.cpp b/src/ccache/util/assertions.cpp
similarity index 85%
rename from src/util/assertions.cpp
rename to src/ccache/util/assertions.cpp
index e4b03efbecbebd944f4af5999d1beb5696017c23..c0609eaecee7c563ec598e5f9f9dcb74ac830aa6 100644 (file)
--- a/src/util/assertions.cpp
+++ b/src/ccache/util/assertions.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2020-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,11 +16,10 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "Util.hpp"
-
-#include <util/assertions.hpp>
-#include <util/filesystem.hpp>
-#include <util/format.hpp>
+#include <ccache/Util.hpp>
+#include <ccache/util/assertions.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/format.hpp>
 
 namespace fs = util::filesystem;
 

diff --git a/src/util/assertions.hpp b/src/ccache/util/assertions.hpp
similarity index 100%
rename from src/util/assertions.hpp
rename to src/ccache/util/assertions.hpp

diff --git a/src/util/conversion.hpp b/src/ccache/util/conversion.hpp
similarity index 96%
rename from src/util/conversion.hpp
rename to src/ccache/util/conversion.hpp
index 9f9eb255328dab88c27a41bca556e7b11c6c4f6d..e755cc466d36ec453fa87a6d51d5977422abb115 100644 (file)
--- a/src/util/conversion.hpp
+++ b/src/ccache/util/conversion.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 Joel Rosdahl and other contributors
+// Copyright (C) 2023-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,9 +18,9 @@
 
 #pragma once
 
-#include <util/Bytes.hpp>
+#include <ccache/util/Bytes.hpp>
 
-#include <third_party/nonstd/span.hpp>
+#include <nonstd/span.hpp>
 
 #include <cstdint>
 #include <string>

diff --git a/src/util/environment.cpp b/src/ccache/util/environment.cpp
similarity index 95%
rename from src/util/environment.cpp
rename to src/ccache/util/environment.cpp
index 58d6c017dac2b514202e23bc6bc42f92ef784367..5b1862aabd6ee778d90a2e6e2e154fdbf8638509 100644 (file)
--- a/src/util/environment.cpp
+++ b/src/ccache/util/environment.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 Joel Rosdahl and other contributors
+// Copyright (C) 2023-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,8 +18,8 @@
 
 #include "environment.hpp"
 
-#include <util/format.hpp>
-#include <util/wincompat.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/wincompat.hpp>
 
 namespace util {
 

diff --git a/src/util/environment.hpp b/src/ccache/util/environment.hpp
similarity index 97%
rename from src/util/environment.hpp
rename to src/ccache/util/environment.hpp
index c874b22333507c4faee50c58791eb347f9a2ebcd..771c213800a1d12c7ba2bdd0299264459177df86 100644 (file)
--- a/src/util/environment.hpp
+++ b/src/ccache/util/environment.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <third_party/tl/expected.hpp>
+#include <tl/expected.hpp>
 
 #include <string>
 

diff --git a/src/util/error.cpp b/src/ccache/util/error.cpp
similarity index 93%
rename from src/util/error.cpp
rename to src/ccache/util/error.cpp
index 5cc9c346b3fc44b32417eb7abdf97756060a55e8..488039b35fb21d47ca384bf3948087e778257d53 100644 (file)
--- a/src/util/error.cpp
+++ b/src/ccache/util/error.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2020-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,7 +18,7 @@
 
 #include "error.hpp"
 
-#include <util/wincompat.hpp>
+#include <ccache/util/wincompat.hpp>
 
 namespace util {
 

diff --git a/src/util/error.hpp b/src/ccache/util/error.hpp
similarity index 100%
rename from src/util/error.hpp
rename to src/ccache/util/error.hpp

diff --git a/src/util/expected.hpp b/src/ccache/util/expected.hpp
similarity index 97%
rename from src/util/expected.hpp
rename to src/ccache/util/expected.hpp
index 95a943d8d95d0aa50811599cf304d79a4fe0d02b..b093e1b0b4f6368af0d245b7ce5460e17ee21222 100644 (file)
--- a/src/util/expected.hpp
+++ b/src/ccache/util/expected.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2022 Joel Rosdahl and other contributors
+// Copyright (C) 2021-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <util/format.hpp>
+#include <ccache/util/format.hpp>
 
 #include <string_view>
 #include <utility>

diff --git a/src/util/file.cpp b/src/ccache/util/file.cpp
similarity index 97%
rename from src/util/file.cpp
rename to src/ccache/util/file.cpp
index 51dca6cda562906b1595e8ef4404c4098a2395a6..13daa53784f3d36a9405cfd582b26f478ebb644b 100644 (file)
--- a/src/util/file.cpp
+++ b/src/ccache/util/file.cpp
@@ -18,18 +18,18 @@
 
 #include "file.hpp"
 
-#include <util/Bytes.hpp>
-#include <util/DirEntry.hpp>
-#include <util/Fd.hpp>
-#include <util/Finalizer.hpp>
-#include <util/PathString.hpp>
-#include <util/TemporaryFile.hpp>
-#include <util/error.hpp>
-#include <util/expected.hpp>
-#include <util/file.hpp>
-#include <util/filesystem.hpp>
-#include <util/format.hpp>
-#include <util/logging.hpp>
+#include <ccache/util/Bytes.hpp>
+#include <ccache/util/DirEntry.hpp>
+#include <ccache/util/Fd.hpp>
+#include <ccache/util/Finalizer.hpp>
+#include <ccache/util/PathString.hpp>
+#include <ccache/util/TemporaryFile.hpp>
+#include <ccache/util/error.hpp>
+#include <ccache/util/expected.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/logging.hpp>
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>

diff --git a/src/util/file.hpp b/src/ccache/util/file.hpp
similarity index 96%
rename from src/util/file.hpp
rename to src/ccache/util/file.hpp
index 463813c5ccdc2ed282fc068ad254e444074cfff9..d72f40995be5df9aa38c9a9e2609a0ef04734a80 100644 (file)
--- a/src/util/file.hpp
+++ b/src/ccache/util/file.hpp
@@ -18,13 +18,13 @@
 
 #pragma once
 
-#include <util/Bytes.hpp>
-#include <util/DirEntry.hpp>
-#include <util/TimePoint.hpp>
-#include <util/types.hpp>
+#include <ccache/util/Bytes.hpp>
+#include <ccache/util/DirEntry.hpp>
+#include <ccache/util/TimePoint.hpp>
+#include <ccache/util/types.hpp>
 
-#include <third_party/nonstd/span.hpp>
-#include <third_party/tl/expected.hpp>
+#include <nonstd/span.hpp>
+#include <tl/expected.hpp>
 
 #include <cstddef>
 #include <cstdint>

diff --git a/src/util/filesystem.cpp b/src/ccache/util/filesystem.cpp
similarity index 91%
rename from src/util/filesystem.cpp
rename to src/ccache/util/filesystem.cpp
index 755dc318f51f3a568d264b90fd6cf3c166bb5cfe..22ad2cff172ae847439a2ca1e11abfe0d5eb637b 100644 (file)
--- a/src/util/filesystem.cpp
+++ b/src/ccache/util/filesystem.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 Joel Rosdahl and other contributors
+// Copyright (C) 2023-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,10 +18,10 @@
 
 #include "filesystem.hpp"
 
-#include <util/wincompat.hpp>
+#include <ccache/util/wincompat.hpp>
 
 #ifdef _WIN32
-#  include <third_party/win32/winerror_to_errno.h>
+#  include <win32/winerror_to_errno.h>
 #endif
 
 namespace util::filesystem {

diff --git a/src/util/filesystem.hpp b/src/ccache/util/filesystem.hpp
similarity index 99%
rename from src/util/filesystem.hpp
rename to src/ccache/util/filesystem.hpp
index 6cd0476db6bd0eaaf7368f91ec90a55e04f02655..420e5af6888c3f79eb60c314191da178fc27f20b 100644 (file)
--- a/src/util/filesystem.hpp
+++ b/src/ccache/util/filesystem.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <third_party/tl/expected.hpp>
+#include <tl/expected.hpp>
 
 #include <cstdint>
 #include <filesystem>

diff --git a/src/util/format.hpp b/src/ccache/util/format.hpp
similarity index 93%
rename from src/util/format.hpp
rename to src/ccache/util/format.hpp
index 78ded2b9f0b8beb3fd4fbd2c1774fdb4832ae085..f2ee81d91cfecb5a260c4ae10937f974de0cb7bf 100644 (file)
--- a/src/util/format.hpp
+++ b/src/ccache/util/format.hpp
@@ -18,9 +18,9 @@
 
 #pragma once
 
-#include <third_party/fmt/core.h>
-#include <third_party/fmt/format.h>
-#include <third_party/fmt/std.h>
+#include <fmt/core.h>
+#include <fmt/format.h>
+#include <fmt/std.h>
 
 // Convenience macro for calling `fmt::format` with `FMT_STRING` around the
 // format string literal.

diff --git a/src/util/logging.cpp b/src/ccache/util/logging.cpp
similarity index 94%
rename from src/util/logging.cpp
rename to src/ccache/util/logging.cpp
index f0fbecd63cce02cd5f7cba94386d1ed62553e154..75f2d57477dfe8f3095290fd3a20b45cf24a4a73 100644 (file)
--- a/src/util/logging.cpp
+++ b/src/ccache/util/logging.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2002 Andrew Tridgell
-// Copyright (C) 2009-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2009-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -17,13 +17,12 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "Config.hpp"
-
-#include <util/FileStream.hpp>
-#include <util/file.hpp>
-#include <util/format.hpp>
-#include <util/logging.hpp>
-#include <util/time.hpp>
+#include <ccache/Config.hpp>
+#include <ccache/util/FileStream.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/logging.hpp>
+#include <ccache/util/time.hpp>
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>

diff --git a/src/util/logging.hpp b/src/ccache/util/logging.hpp
similarity index 97%
rename from src/util/logging.hpp
rename to src/ccache/util/logging.hpp
index 2e4300fa16da01b6d7f1b8ef8f2d6ae7553b9868..19f115459cb12d03ccd5b933399ba1a2afc37014 100644 (file)
--- a/src/util/logging.hpp
+++ b/src/ccache/util/logging.hpp
@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include <third_party/fmt/core.h>
-#include <third_party/fmt/format.h>
+#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include <string>
 #include <string_view>

diff --git a/src/util/path.cpp b/src/ccache/util/path.cpp
similarity index 94%
rename from src/util/path.cpp
rename to src/ccache/util/path.cpp
index 41b36fe337d11eb4e40c85b920ab6fd3e9b482bf..b32056f5a5530da6f67363cc2ed274f2a75e2ba4 100644 (file)
--- a/src/util/path.cpp
+++ b/src/ccache/util/path.cpp
@@ -18,11 +18,11 @@
 
 #include "path.hpp"
 
-#include <Util.hpp>
-#include <util/DirEntry.hpp>
-#include <util/filesystem.hpp>
-#include <util/format.hpp>
-#include <util/string.hpp>
+#include <ccache/Util.hpp>
+#include <ccache/util/DirEntry.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/string.hpp>
 
 #ifdef _WIN32
 const char k_dev_null_path[] = "nul:";

diff --git a/src/util/path.hpp b/src/ccache/util/path.hpp
similarity index 98%
rename from src/util/path.hpp
rename to src/ccache/util/path.hpp
index 31dbcbc59d234263f42c1d5fc1014a38971a0650..c445d37d417e9277a352b4bad2c21339e0631102 100644 (file)
--- a/src/util/path.hpp
+++ b/src/ccache/util/path.hpp
@@ -22,7 +22,7 @@
 #include <string>
 #include <string_view>
 #ifdef _WIN32
-#  include <util/string.hpp>
+#  include <ccache/util/string.hpp>
 #endif
 
 namespace util {

diff --git a/src/util/process.cpp b/src/ccache/util/process.cpp
similarity index 93%
rename from src/util/process.cpp
rename to src/ccache/util/process.cpp
index 2c97fb561e0e2359465b60a18319a42db3fe3e97..6a97e80ad5e9108234e619b24b21e375c53bc5ae 100644 (file)
--- a/src/util/process.cpp
+++ b/src/ccache/util/process.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 Joel Rosdahl and other contributors
+// Copyright (C) 2023-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,7 +18,7 @@
 
 #include "process.hpp"
 
-#include <util/wincompat.hpp>
+#include <ccache/util/wincompat.hpp>
 
 #include <cstring>
 

diff --git a/src/util/process.hpp b/src/ccache/util/process.hpp
similarity index 100%
rename from src/util/process.hpp
rename to src/ccache/util/process.hpp

diff --git a/src/util/string.cpp b/src/ccache/util/string.cpp
similarity index 99%
rename from src/util/string.cpp
rename to src/ccache/util/string.cpp
index dba3e9aed0d3676b2716dd6114b1aded9cadc835..e45b32890822dfaedf7806218e0cb19bd674afb1 100644 (file)
--- a/src/util/string.cpp
+++ b/src/ccache/util/string.cpp
@@ -18,8 +18,8 @@
 
 #include "string.hpp"
 
-#include <util/assertions.hpp>
-#include <util/format.hpp>
+#include <ccache/util/assertions.hpp>
+#include <ccache/util/format.hpp>
 
 #include <algorithm>
 #include <cctype>

diff --git a/src/util/string.hpp b/src/ccache/util/string.hpp
similarity index 98%
rename from src/util/string.hpp
rename to src/ccache/util/string.hpp
index c61514d936105cde8fff881d061187714d62edf2..ca8029fad0c15dbbf3b9027a2f62151ad1b57cc6 100644 (file)
--- a/src/util/string.hpp
+++ b/src/ccache/util/string.hpp
@@ -18,13 +18,12 @@
 
 #pragma once
 
-#include <util/Tokenizer.hpp>
-#include <util/conversion.hpp>
-
-#include <third_party/nonstd/span.hpp>
-#include <third_party/tl/expected.hpp>
+#include <ccache/util/Tokenizer.hpp>
+#include <ccache/util/conversion.hpp>
 
+#include <nonstd/span.hpp>
 #include <sys/stat.h> // for mode_t
+#include <tl/expected.hpp>
 
 #include <cstdint>
 #include <cstring>

diff --git a/src/util/time.cpp b/src/ccache/util/time.cpp
similarity index 100%
rename from src/util/time.cpp
rename to src/ccache/util/time.cpp

diff --git a/src/util/time.hpp b/src/ccache/util/time.hpp
similarity index 91%
rename from src/util/time.hpp
rename to src/ccache/util/time.hpp
index 9ccfda781e8f89659a5f72f4d08ab9cd79dbe9fd..df7928d82749b1d9d114873b299c67832146d372 100644 (file)
--- a/src/util/time.hpp
+++ b/src/ccache/util/time.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 Joel Rosdahl and other contributors
+// Copyright (C) 2023-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <util/TimePoint.hpp>
+#include <ccache/util/TimePoint.hpp>
 
 #include <ctime>
 #include <optional>

diff --git a/src/util/types.hpp b/src/ccache/util/types.hpp
similarity index 96%
rename from src/util/types.hpp
rename to src/ccache/util/types.hpp
index 3cdc7febb56ebd4af621153f9d42558b8849f851..cf293c0054406cecdc39c709fde646c20933391e 100644 (file)
--- a/src/util/types.hpp
+++ b/src/ccache/util/types.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <third_party/nonstd/span.hpp>
+#include <nonstd/span.hpp>
 
 #include <cstdint>
 #include <functional>

diff --git a/src/util/wincompat.hpp b/src/ccache/util/wincompat.hpp
similarity index 100%
rename from src/util/wincompat.hpp
rename to src/ccache/util/wincompat.hpp

diff --git a/src/util/zstd.cpp b/src/ccache/util/zstd.cpp
similarity index 100%
rename from src/util/zstd.cpp
rename to src/ccache/util/zstd.cpp

diff --git a/src/util/zstd.hpp b/src/ccache/util/zstd.hpp
similarity index 93%
rename from src/util/zstd.hpp
rename to src/ccache/util/zstd.hpp
index 5c47a530745ea6314380cee7a56b38dd2d152837..557d9cbc6fbea01406b45b3efeeba2cc87431041 100644 (file)
--- a/src/util/zstd.hpp
+++ b/src/ccache/util/zstd.hpp
@@ -18,10 +18,10 @@
 
 #pragma once
 
-#include <util/Bytes.hpp>
+#include <ccache/util/Bytes.hpp>
 
-#include <third_party/nonstd/span.hpp>
-#include <third_party/tl/expected.hpp>
+#include <nonstd/span.hpp>
+#include <tl/expected.hpp>
 
 #include <cstddef>
 #include <cstdint>

diff --git a/src/third_party/CMakeLists.txt b/src/third_party/CMakeLists.txt
index a615dcf6b6d918a15662e6db5e322ead085845c2..4f6c3f9300909127df5b80781bdb24dd866c2e53 100644 (file)
--- a/src/third_party/CMakeLists.txt
+++ b/src/third_party/CMakeLists.txt
@@ -1,4 +1,6 @@
 add_library(third_party STATIC format.cpp httplib.cpp url.cpp xxhash.c)
+target_include_directories(third_party INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+
 if(NOT MSVC)
   target_sources(third_party PRIVATE getopt_long.c)
 else()

diff --git a/unittest/TestUtil.cpp b/unittest/TestUtil.cpp
index 3b502181ca106eccdd7b6819b77527b799c4a939..95e9ed1dbe6ef84d5e8f8c10a3b10a80925e7ca4 100644 (file)
--- a/unittest/TestUtil.cpp
+++ b/unittest/TestUtil.cpp
@@ -18,10 +18,10 @@
 
 #include "TestUtil.hpp"
 
-#include <core/exceptions.hpp>
-#include <util/expected.hpp>
-#include <util/filesystem.hpp>
-#include <util/format.hpp>
+#include <ccache/core/exceptions.hpp>
+#include <ccache/util/expected.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/format.hpp>
 
 namespace fs = util::filesystem;
 

diff --git a/unittest/main.cpp b/unittest/main.cpp
index a415602df22aa0cd8342c5231c75f56cba55aa93..2407eb0646f38a3b37af65445966a5bd1031da1a 100644 (file)
--- a/unittest/main.cpp
+++ b/unittest/main.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2010-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2010-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,14 +16,14 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include <util/environment.hpp>
-#include <util/filesystem.hpp>
-#include <util/format.hpp>
-#include <util/path.hpp>
+#include <ccache/util/environment.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/path.hpp>
 
 #define DOCTEST_THREAD_LOCAL // Avoid MinGW thread_local bug
 #define DOCTEST_CONFIG_IMPLEMENT
-#include "third_party/doctest.h"
+#include <doctest.h>
 
 namespace fs = util::filesystem;
 

diff --git a/unittest/test_Args.cpp b/unittest/test_Args.cpp
index 82b51ec1520f57839c38db643fabde1b60f95390..8db30f0c9489105c1223fcba3260cf70d813c1fc 100644 (file)
--- a/unittest/test_Args.cpp
+++ b/unittest/test_Args.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2020-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,12 +16,12 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "../src/Args.hpp"
 #include "TestUtil.hpp"
 
-#include <util/file.hpp>
+#include <ccache/Args.hpp>
+#include <ccache/util/file.hpp>
 
-#include "third_party/doctest.h"
+#include <doctest.h>
 
 TEST_SUITE_BEGIN("Args");
 

diff --git a/unittest/test_Config.cpp b/unittest/test_Config.cpp
index 4de2ec9bb933837e20937e4acad77fd8cedee7ca..32fb6bf26aed13e1b1b8311ea16b3ccc511a2a7e 100644 (file)
--- a/unittest/test_Config.cpp
+++ b/unittest/test_Config.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2011-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,16 +16,16 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "../src/Config.hpp"
-#include "../src/Util.hpp"
 #include "TestUtil.hpp"
 
-#include <core/exceptions.hpp>
-#include <util/environment.hpp>
-#include <util/file.hpp>
-#include <util/format.hpp>
+#include <ccache/Config.hpp>
+#include <ccache/Util.hpp>
+#include <ccache/core/exceptions.hpp>
+#include <ccache/util/environment.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/format.hpp>
 
-#include "third_party/doctest.h"
+#include <doctest.h>
 
 #include <limits>
 #include <string>

diff --git a/unittest/test_Depfile.cpp b/unittest/test_Depfile.cpp
index 768f69ad045a15eab8b5c2216551337d4b6e5345..aac62e37a334116c2b67572a6ba6b52ca11d0bcb 100644 (file)
--- a/unittest/test_Depfile.cpp
+++ b/unittest/test_Depfile.cpp
@@ -16,14 +16,14 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "../src/Context.hpp"
-#include "../src/Depfile.hpp"
 #include "TestUtil.hpp"
 
-#include <util/filesystem.hpp>
-#include <util/format.hpp>
+#include <ccache/Context.hpp>
+#include <ccache/Depfile.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/format.hpp>
 
-#include "third_party/doctest.h"
+#include <doctest.h>
 
 #include <string>
 #include <vector>

diff --git a/unittest/test_Hash.cpp b/unittest/test_Hash.cpp
index 24a57f66e4df8e8c4c1f53a1e6d07a72bd9718da..a66e3532182943f4a15f0c4f1a38b3dd010fead5 100644 (file)
--- a/unittest/test_Hash.cpp
+++ b/unittest/test_Hash.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2010-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2010-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,11 +16,10 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "../src/Hash.hpp"
+#include <ccache/Hash.hpp>
+#include <ccache/util/string.hpp>
 
-#include <util/string.hpp>
-
-#include "third_party/doctest.h"
+#include <doctest.h>
 
 TEST_SUITE_BEGIN("Hash");
 

diff --git a/unittest/test_InodeCache.cpp b/unittest/test_InodeCache.cpp
index 2bad0f653cde963c335dddd3b6028752d5b3253e..5e9cd8068a237c0df8fd4a18e47df9646e1408ca 100644 (file)
--- a/unittest/test_InodeCache.cpp
+++ b/unittest/test_InodeCache.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2020-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,19 +16,18 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "../src/Config.hpp"
-#include "../src/Context.hpp"
-#include "../src/Hash.hpp"
-#include "../src/InodeCache.hpp"
 #include "TestUtil.hpp"
 
-#include <util/Fd.hpp>
-#include <util/TemporaryFile.hpp>
-#include <util/file.hpp>
-#include <util/path.hpp>
-
-#include "third_party/doctest.h"
+#include <ccache/Config.hpp>
+#include <ccache/Context.hpp>
+#include <ccache/Hash.hpp>
+#include <ccache/InodeCache.hpp>
+#include <ccache/util/Fd.hpp>
+#include <ccache/util/TemporaryFile.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/path.hpp>
 
+#include <doctest.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>

diff --git a/unittest/test_Util.cpp b/unittest/test_Util.cpp
index 53ebbc21451c8b37f2f301052ab9da94524e7269..e670464b09c2f693366040554b069492bfd4021e 100644 (file)
--- a/unittest/test_Util.cpp
+++ b/unittest/test_Util.cpp
@@ -16,20 +16,19 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "../src/Config.hpp"
-#include "../src/Util.hpp"
 #include "TestUtil.hpp"
 
-#include <core/exceptions.hpp>
-#include <util/environment.hpp>
-#include <util/file.hpp>
-#include <util/filesystem.hpp>
-#include <util/format.hpp>
-#include <util/path.hpp>
-#include <util/wincompat.hpp>
-
-#include "third_party/doctest.h"
-
+#include <ccache/Config.hpp>
+#include <ccache/Util.hpp>
+#include <ccache/core/exceptions.hpp>
+#include <ccache/util/environment.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/path.hpp>
+#include <ccache/util/wincompat.hpp>
+
+#include <doctest.h>
 #include <fcntl.h>
 
 #include <optional>

diff --git a/unittest/test_argprocessing.cpp b/unittest/test_argprocessing.cpp
index 03579277508cb19148d8992030abe29ef77dd8a7..96ee86204d55e7b4fefa362557d5041d2a844fd8 100644 (file)
--- a/unittest/test_argprocessing.cpp
+++ b/unittest/test_argprocessing.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2010-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2010-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,21 +16,21 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "../src/Args.hpp"
-#include "../src/Config.hpp"
-#include "../src/Context.hpp"
 #include "TestUtil.hpp"
-#include "argprocessing.hpp"
 
-#include <Util.hpp>
-#include <core/Statistic.hpp>
-#include <util/file.hpp>
-#include <util/format.hpp>
-#include <util/path.hpp>
-#include <util/string.hpp>
-#include <util/wincompat.hpp>
-
-#include "third_party/doctest.h"
+#include <ccache/Args.hpp>
+#include <ccache/Config.hpp>
+#include <ccache/Context.hpp>
+#include <ccache/Util.hpp>
+#include <ccache/argprocessing.hpp>
+#include <ccache/core/Statistic.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/path.hpp>
+#include <ccache/util/string.hpp>
+#include <ccache/util/wincompat.hpp>
+
+#include <doctest.h>
 
 #include <algorithm>
 

diff --git a/unittest/test_bsdmkstemp.cpp b/unittest/test_bsdmkstemp.cpp
index f0cdb4192099d7b0dbb827ef8a8b23196b180221..ead061d262631a7e4219c44b1cdb341f88f018ce 100644 (file)
--- a/unittest/test_bsdmkstemp.cpp
+++ b/unittest/test_bsdmkstemp.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2020-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,14 +18,13 @@
 
 #include "TestUtil.hpp"
 
-#include <util/Fd.hpp>
-#include <util/Finalizer.hpp>
-#include <util/wincompat.hpp>
-
-#include "third_party/doctest.h"
-#include "third_party/win32/mktemp.h"
+#include <ccache/util/Fd.hpp>
+#include <ccache/util/Finalizer.hpp>
+#include <ccache/util/wincompat.hpp>
 
+#include <doctest.h>
 #include <sddl.h>
+#include <win32/mktemp.h>
 
 #include <algorithm>
 #include <memory>

diff --git a/unittest/test_ccache.cpp b/unittest/test_ccache.cpp
index 416c4463dd309b0cf5b586d3b30bbf48b71764fc..ca469bc95df2d5f9bf3fee6df406a11e15a672de 100644 (file)
--- a/unittest/test_ccache.cpp
+++ b/unittest/test_ccache.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2020-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,17 +16,17 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "../src/Context.hpp"
-#include "../src/ccache.hpp"
 #include "TestUtil.hpp"
 
-#include <util/file.hpp>
-#include <util/filesystem.hpp>
-#include <util/format.hpp>
-#include <util/path.hpp>
-#include <util/wincompat.hpp>
+#include <ccache/Context.hpp>
+#include <ccache/ccache.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/path.hpp>
+#include <ccache/util/wincompat.hpp>
 
-#include "third_party/doctest.h"
+#include <doctest.h>
 
 #include <optional>
 #include <string>

diff --git a/unittest/test_compopt.cpp b/unittest/test_compopt.cpp
index 492095f114e9ac4b885cfae71fb3c9aba3512216..965d55970bacf2927f7975b10458186e37dbbf63 100644 (file)
--- a/unittest/test_compopt.cpp
+++ b/unittest/test_compopt.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2010-2020 Joel Rosdahl and other contributors
+// Copyright (C) 2010-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,9 +16,9 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "../src/compopt.hpp"
+#include <ccache/compopt.hpp>
 
-#include "third_party/doctest.h"
+#include <doctest.h>
 
 bool compopt_verify_sortedness_and_flags();
 

diff --git a/unittest/test_compression_types.cpp b/unittest/test_compression_types.cpp
index 639a81c8f4b4d06fe045838468d6c0a427716732..9bfca2a6feca9c30dbad9d8ff496214687c8597e 100644 (file)
--- a/unittest/test_compression_types.cpp
+++ b/unittest/test_compression_types.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2019-2022 Joel Rosdahl and other contributors
+// Copyright (C) 2019-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,11 +16,10 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "../src/Config.hpp"
+#include <ccache/Config.hpp>
+#include <ccache/core/types.hpp>
 
-#include <core/types.hpp>
-
-#include "third_party/doctest.h"
+#include <doctest.h>
 
 TEST_SUITE_BEGIN("compression");
 

diff --git a/unittest/test_core_AtomicFile.cpp b/unittest/test_core_AtomicFile.cpp
index fd3d9ede3deab895d72b4b68e09f69eae5e78cd6..ed36d9c25f8ccc987f9db2013acca3897f90833f 100644 (file)
--- a/unittest/test_core_AtomicFile.cpp
+++ b/unittest/test_core_AtomicFile.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2011-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,11 +18,11 @@
 
 #include "TestUtil.hpp"
 
-#include <core/AtomicFile.hpp>
-#include <util/DirEntry.hpp>
-#include <util/file.hpp>
+#include <ccache/core/AtomicFile.hpp>
+#include <ccache/util/DirEntry.hpp>
+#include <ccache/util/file.hpp>
 
-#include "third_party/doctest.h"
+#include <doctest.h>
 
 #include <string>
 #include <vector>

diff --git a/unittest/test_core_MsvcShowIncludesOutput.cpp b/unittest/test_core_MsvcShowIncludesOutput.cpp
index 0e0f71783222c79a3b2e9ecc437d667a0730f31e..ddcac5a6b6fdd428764f88bc4cefc3976fd6e262 100644 (file)
--- a/unittest/test_core_MsvcShowIncludesOutput.cpp
+++ b/unittest/test_core_MsvcShowIncludesOutput.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Joel Rosdahl and other contributors
+// Copyright (C) 2020-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,12 +16,13 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "../src/Context.hpp"
-#include "../src/core/MsvcShowIncludesOutput.hpp"
-#include "../src/util/string.hpp"
 #include "TestUtil.hpp"
 
-#include "third_party/doctest.h"
+#include <ccache/Context.hpp>
+#include <ccache/core/MsvcShowIncludesOutput.hpp>
+#include <ccache/util/string.hpp>
+
+#include <doctest.h>
 
 static const std::string defaultPrefix = "Note: including file:";
 

diff --git a/unittest/test_core_Statistics.cpp b/unittest/test_core_Statistics.cpp
index 8fe6d6cfe01d0e99fa38f74e82200b95f297d60e..885f233180e009d61a1592e3b13ec47c47499551 100644 (file)
--- a/unittest/test_core_Statistics.cpp
+++ b/unittest/test_core_Statistics.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2011-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,10 +18,10 @@
 
 #include "TestUtil.hpp"
 
-#include <core/Statistic.hpp>
-#include <core/Statistics.hpp>
+#include <ccache/core/Statistic.hpp>
+#include <ccache/core/Statistics.hpp>
 
-#include <third_party/doctest.h>
+#include <doctest.h>
 
 #include <iostream> // macOS bug: https://github.com/onqtam/doctest/issues/126
 #include <string>

diff --git a/unittest/test_core_StatisticsCounters.cpp b/unittest/test_core_StatisticsCounters.cpp
index 01db9897290d2a8f5df46dc97b31891533a18a39..6e73943edfce96af2848e4e1906de3afe5381616 100644 (file)
--- a/unittest/test_core_StatisticsCounters.cpp
+++ b/unittest/test_core_StatisticsCounters.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2021 Joel Rosdahl and other contributors
+// Copyright (C) 2020-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,10 +18,10 @@
 
 #include "TestUtil.hpp"
 
-#include <core/Statistic.hpp>
-#include <core/StatisticsCounters.hpp>
+#include <ccache/core/Statistic.hpp>
+#include <ccache/core/StatisticsCounters.hpp>
 
-#include "third_party/doctest.h"
+#include <doctest.h>
 
 using core::Statistic;
 using core::StatisticsCounters;

diff --git a/unittest/test_core_StatsLog.cpp b/unittest/test_core_StatsLog.cpp
index d31c7502fe740f937e607b042e6c059b241e71cc..6336e41faf406350951778d13cb0f94f84c4deba 100644 (file)
--- a/unittest/test_core_StatsLog.cpp
+++ b/unittest/test_core_StatsLog.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2022 Joel Rosdahl and other contributors
+// Copyright (C) 2021-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,11 +18,11 @@
 
 #include "TestUtil.hpp"
 
-#include <Util.hpp>
-#include <core/StatsLog.hpp>
-#include <util/file.hpp>
+#include <ccache/Util.hpp>
+#include <ccache/core/StatsLog.hpp>
+#include <ccache/util/file.hpp>
 
-#include <third_party/doctest.h>
+#include <doctest.h>
 
 using core::Statistic;
 using core::StatsLog;

diff --git a/unittest/test_core_common.cpp b/unittest/test_core_common.cpp
index 6f0268ce172789bed4e495485d618b6071a51cd6..0cbce69bfe25bc955285c98c66d0f78defb11372 100644 (file)
--- a/unittest/test_core_common.cpp
+++ b/unittest/test_core_common.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2019-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2019-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,13 +18,13 @@
 
 #include "TestUtil.hpp"
 
-#include <core/common.hpp>
-#include <util/DirEntry.hpp>
-#include <util/file.hpp>
-#include <util/filesystem.hpp>
-#include <util/format.hpp>
+#include <ccache/core/common.hpp>
+#include <ccache/util/DirEntry.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/format.hpp>
 
-#include <third_party/doctest.h>
+#include <doctest.h>
 
 namespace fs = util::filesystem;
 

diff --git a/unittest/test_hashutil.cpp b/unittest/test_hashutil.cpp
index d8dc3b9cd65e0f314a843a2ffe8213b4e6973278..c908bca632bde6ab66ba8995674eb1114394eafd 100644 (file)
--- a/unittest/test_hashutil.cpp
+++ b/unittest/test_hashutil.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2010-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2010-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,14 +16,13 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "../src/Hash.hpp"
-#include "../src/hashutil.hpp"
 #include "TestUtil.hpp"
 
-#include <util/file.hpp>
-
-#include "third_party/doctest.h"
+#include <ccache/Hash.hpp>
+#include <ccache/hashutil.hpp>
+#include <ccache/util/file.hpp>
 
+#include <doctest.h>
 #include <sys/stat.h>
 
 using TestUtil::TestContext;

diff --git a/unittest/test_storage_local_StatsFile.cpp b/unittest/test_storage_local_StatsFile.cpp
index 34b9c2f2c35e538fec6cc1c8ec0d97b764dd1deb..153980f35fd5a0b8549c5cffebc48854190d01db 100644 (file)
--- a/unittest/test_storage_local_StatsFile.cpp
+++ b/unittest/test_storage_local_StatsFile.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2022 Joel Rosdahl and other contributors
+// Copyright (C) 2011-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,13 +18,13 @@
 
 #include "TestUtil.hpp"
 
-#include <Util.hpp>
-#include <core/Statistic.hpp>
-#include <storage/local/StatsFile.hpp>
-#include <util/file.hpp>
-#include <util/format.hpp>
+#include <ccache/Util.hpp>
+#include <ccache/core/Statistic.hpp>
+#include <ccache/storage/local/StatsFile.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/format.hpp>
 
-#include <third_party/doctest.h>
+#include <doctest.h>
 
 using core::Statistic;
 using storage::local::StatsFile;

diff --git a/unittest/test_storage_local_util.cpp b/unittest/test_storage_local_util.cpp
index 8ffbdff2511325d25511e813b524bce3cf0c8307..48021440ac2bca07704a397f92f16ab348b89b29 100644 (file)
--- a/unittest/test_storage_local_util.cpp
+++ b/unittest/test_storage_local_util.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2021-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,12 +18,12 @@
 
 #include "TestUtil.hpp"
 
-#include <storage/local/util.hpp>
-#include <util/file.hpp>
-#include <util/filesystem.hpp>
-#include <util/format.hpp>
+#include <ccache/storage/local/util.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/format.hpp>
 
-#include <third_party/doctest.h>
+#include <doctest.h>
 
 #include <algorithm>
 #include <string>

diff --git a/unittest/test_util_BitSet.cpp b/unittest/test_util_BitSet.cpp
index 3130794abf1d589e0a949abfe78c42a634b3eeee..3b7c65293b91bc7287366de09581a023d8115b31 100644 (file)
--- a/unittest/test_util_BitSet.cpp
+++ b/unittest/test_util_BitSet.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 Joel Rosdahl and other contributors
+// Copyright (C) 2023-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,10 +16,11 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "../src/util/BitSet.hpp"
 #include "TestUtil.hpp"
 
-#include <third_party/doctest.h>
+#include <ccache/util/BitSet.hpp>
+
+#include <doctest.h>
 
 TEST_SUITE_BEGIN("BitSet");
 

diff --git a/unittest/test_util_Bytes.cpp b/unittest/test_util_Bytes.cpp
index 7c130d526412839b9ecd7f21a1125d9db5f64ac7..3f444e59cedf16d8668e9d497a27d5472d61c0b4 100644 (file)
--- a/unittest/test_util_Bytes.cpp
+++ b/unittest/test_util_Bytes.cpp
@@ -16,10 +16,10 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include <util/Bytes.hpp>
+#include <ccache/util/Bytes.hpp>
 
-#include <third_party/doctest.h>
-#include <third_party/nonstd/span.hpp>
+#include <doctest.h>
+#include <nonstd/span.hpp>
 
 #include <vector>
 

diff --git a/unittest/test_util_DirEntry.cpp b/unittest/test_util_DirEntry.cpp
index 1c98263d09ea233357ac91112384a5ed4e5f201f..d3b16462c8cf05c81a67715a421eaaa6ceb996bb 100644 (file)
--- a/unittest/test_util_DirEntry.cpp
+++ b/unittest/test_util_DirEntry.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2019-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2019-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,14 +18,14 @@
 
 #include "TestUtil.hpp"
 
-#include <util/DirEntry.hpp>
-#include <util/Finalizer.hpp>
-#include <util/environment.hpp>
-#include <util/file.hpp>
-#include <util/filesystem.hpp>
-#include <util/wincompat.hpp>
+#include <ccache/util/DirEntry.hpp>
+#include <ccache/util/Finalizer.hpp>
+#include <ccache/util/environment.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/wincompat.hpp>
 
-#include <third_party/doctest.h>
+#include <doctest.h>
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>

diff --git a/unittest/test_util_Duration.cpp b/unittest/test_util_Duration.cpp
index b920281da2083bd3ffa189317f0b8dc05e8eb7a5..34a1eb0139503f43dbadcc3be947c9f7ec83c907 100644 (file)
--- a/unittest/test_util_Duration.cpp
+++ b/unittest/test_util_Duration.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 Joel Rosdahl and other contributors
+// Copyright (C) 2022-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,9 +16,9 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include <util/Duration.hpp>
+#include <ccache/util/Duration.hpp>
 
-#include <third_party/doctest.h>
+#include <doctest.h>
 
 TEST_SUITE_BEGIN("util::Duration");
 

diff --git a/unittest/test_util_LockFile.cpp b/unittest/test_util_LockFile.cpp
index d93fc5d87c9d8e8ba7df899f088ca46a6f0a77db..8888725734cfe02b4ad330cf134e23ab2515e00d 100644 (file)
--- a/unittest/test_util_LockFile.cpp
+++ b/unittest/test_util_LockFile.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2020-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,13 +18,13 @@
 
 #include "TestUtil.hpp"
 
-#include <Util.hpp>
-#include <util/DirEntry.hpp>
-#include <util/LockFile.hpp>
-#include <util/file.hpp>
-#include <util/wincompat.hpp>
+#include <ccache/Util.hpp>
+#include <ccache/util/DirEntry.hpp>
+#include <ccache/util/LockFile.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/wincompat.hpp>
 
-#include "third_party/doctest.h"
+#include <doctest.h>
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>

diff --git a/unittest/test_util_TextTable.cpp b/unittest/test_util_TextTable.cpp
index 1a996c0428f3bcf44819d3f8c0f794b5abbb8c52..9f2efd689ce34aed13572fed8e852cb1e888aaed 100644 (file)
--- a/unittest/test_util_TextTable.cpp
+++ b/unittest/test_util_TextTable.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Joel Rosdahl and other contributors
+// Copyright (C) 2021-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,9 +16,9 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include <util/TextTable.hpp>
+#include <ccache/util/TextTable.hpp>
 
-#include <third_party/doctest.h>
+#include <doctest.h>
 
 #include <iostream> // macOS bug: https://github.com/onqtam/doctest/issues/126
 

diff --git a/unittest/test_util_TimePoint.cpp b/unittest/test_util_TimePoint.cpp
index a86ba9b50dcd3f965f7a26af3934d5fb012e43cb..43dbf85456b7e3a0aadc713b54fc2fb0819ee53c 100644 (file)
--- a/unittest/test_util_TimePoint.cpp
+++ b/unittest/test_util_TimePoint.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 Joel Rosdahl and other contributors
+// Copyright (C) 2022-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,9 +16,9 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include <util/TimePoint.hpp>
+#include <ccache/util/TimePoint.hpp>
 
-#include <third_party/doctest.h>
+#include <doctest.h>
 
 TEST_SUITE_BEGIN("util::TimePoint");
 

diff --git a/unittest/test_util_Tokenizer.cpp b/unittest/test_util_Tokenizer.cpp
index 25621779704e73ee8343d971e3a8e5a859320967..a06710d655d2e082cee5263354a0740ea88a441e 100644 (file)
--- a/unittest/test_util_Tokenizer.cpp
+++ b/unittest/test_util_Tokenizer.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2021-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,11 +16,10 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include "../src/Util.hpp"
+#include <ccache/Util.hpp>
+#include <ccache/util/string.hpp>
 
-#include <util/string.hpp>
-
-#include "third_party/doctest.h"
+#include <doctest.h>
 
 #include <ostream> // https://github.com/doctest/doctest/issues/618
 #include <string>

diff --git a/unittest/test_util_XXH3_128.cpp b/unittest/test_util_XXH3_128.cpp
index a940069d7eabcf5c6576784c5d01b3c1d35ed58a..c7fd9da5cb99fb1ae2738b92a8552c9909e6e6eb 100644 (file)
--- a/unittest/test_util_XXH3_128.cpp
+++ b/unittest/test_util_XXH3_128.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2011-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,10 +16,10 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include <util/XXH3_128.hpp>
-#include <util/string.hpp>
+#include <ccache/util/XXH3_128.hpp>
+#include <ccache/util/string.hpp>
 
-#include <third_party/doctest.h>
+#include <doctest.h>
 
 TEST_SUITE_BEGIN("util::XXH3_128");
 

diff --git a/unittest/test_util_XXH3_64.cpp b/unittest/test_util_XXH3_64.cpp
index 744029cccdd063260af550d25058fe185d4747a6..2a01348bc7c7f600d510d531706d41742854784b 100644 (file)
--- a/unittest/test_util_XXH3_64.cpp
+++ b/unittest/test_util_XXH3_64.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2021 Joel Rosdahl and other contributors
+// Copyright (C) 2011-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,9 +16,9 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include <util/XXH3_64.hpp>
+#include <ccache/util/XXH3_64.hpp>
 
-#include <third_party/doctest.h>
+#include <doctest.h>
 
 TEST_SUITE_BEGIN("util::XXH3_64");
 

diff --git a/unittest/test_util_conversion.cpp b/unittest/test_util_conversion.cpp
index 7eeca9e0ce7d275d9cf134c32cd6a75aab9cc5f6..ff30924b150a53e8c4a9fcc11729c6ea60cb19f6 100644 (file)
--- a/unittest/test_util_conversion.cpp
+++ b/unittest/test_util_conversion.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2021-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,9 +16,9 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include <util/conversion.hpp>
+#include <ccache/util/conversion.hpp>
 
-#include <third_party/doctest.h>
+#include <doctest.h>
 
 #include <ostream> // https://github.com/doctest/doctest/issues/618
 #include <vector>

diff --git a/unittest/test_util_environment.cpp b/unittest/test_util_environment.cpp
index 1819ab86b3d3fa754a6be1bcab85259ee99880bb..48fc71b0c65ca10ff9a5d930a05c02cf66b50404 100644 (file)
--- a/unittest/test_util_environment.cpp
+++ b/unittest/test_util_environment.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 Joel Rosdahl and other contributors
+// Copyright (C) 2023-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,9 +16,9 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include <util/environment.hpp>
+#include <ccache/util/environment.hpp>
 
-#include <third_party/doctest.h>
+#include <doctest.h>
 
 TEST_SUITE_BEGIN("util");
 

diff --git a/unittest/test_util_expected.cpp b/unittest/test_util_expected.cpp
index 26eac63bb598a914268e8e2ad761abb7afa671ac..db1b86bbca3f60abbb91c1c3df6556be01256860 100644 (file)
--- a/unittest/test_util_expected.cpp
+++ b/unittest/test_util_expected.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2022 Joel Rosdahl and other contributors
+// Copyright (C) 2021-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,10 +16,10 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include <util/expected.hpp>
+#include <ccache/util/expected.hpp>
 
-#include <third_party/doctest.h>
-#include <third_party/tl/expected.hpp>
+#include <doctest.h>
+#include <tl/expected.hpp>
 
 #include <iostream> // macOS bug: https://github.com/onqtam/doctest/issues/126
 #include <memory>

diff --git a/unittest/test_util_file.cpp b/unittest/test_util_file.cpp
index e9a8073e29950f3b8e74cec38f536088a706c9c4..1a28997b5ab8ed6375319a12342137c118af69aa 100644 (file)
--- a/unittest/test_util_file.cpp
+++ b/unittest/test_util_file.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2022-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2022-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -18,16 +18,15 @@
 
 #include "TestUtil.hpp"
 
-#include <util/Bytes.hpp>
-#include <util/DirEntry.hpp>
-#include <util/Fd.hpp>
-#include <util/file.hpp>
-#include <util/filesystem.hpp>
-#include <util/format.hpp>
-#include <util/string.hpp>
-
-#include <third_party/doctest.h>
+#include <ccache/util/Bytes.hpp>
+#include <ccache/util/DirEntry.hpp>
+#include <ccache/util/Fd.hpp>
+#include <ccache/util/file.hpp>
+#include <ccache/util/filesystem.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/string.hpp>
 
+#include <doctest.h>
 #include <fcntl.h>
 
 #include <cstring>

diff --git a/unittest/test_util_path.cpp b/unittest/test_util_path.cpp
index 59bb6abdbccb5355470594405154e147c1c0f311..c7f0ee4ece96b816cd335cc2a83947957c756cfe 100644 (file)
--- a/unittest/test_util_path.cpp
+++ b/unittest/test_util_path.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2023 Joel Rosdahl and other contributors
+// Copyright (C) 2021-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,11 +16,11 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include <Util.hpp>
-#include <util/format.hpp>
-#include <util/path.hpp>
+#include <ccache/Util.hpp>
+#include <ccache/util/format.hpp>
+#include <ccache/util/path.hpp>
 
-#include <third_party/doctest.h>
+#include <doctest.h>
 
 #include <ostream> // https://github.com/doctest/doctest/issues/618
 

diff --git a/unittest/test_util_string.cpp b/unittest/test_util_string.cpp
index 41ac550766e87dcc3620775c06d80bbb1171e538..fcb7abfdb2498959141e229ab5598aba89f7dbd6 100644 (file)
--- a/unittest/test_util_string.cpp
+++ b/unittest/test_util_string.cpp
@@ -16,9 +16,9 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include <util/string.hpp>
+#include <ccache/util/string.hpp>
 
-#include <third_party/doctest.h>
+#include <doctest.h>
 
 #include <ostream> // https://github.com/doctest/doctest/issues/618
 #include <vector>

diff --git a/unittest/test_util_zstd.cpp b/unittest/test_util_zstd.cpp
index 962501757c8ca4462f124d82a943fd6d379bd0b2..562b4d344b11f1e35e1b6405fa00763bf332bca5 100644 (file)
--- a/unittest/test_util_zstd.cpp
+++ b/unittest/test_util_zstd.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2019-2022 Joel Rosdahl and other contributors
+// Copyright (C) 2019-2024 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -16,11 +16,12 @@
 // this program; if not, write to the Free Software Foundation, Inc., 51
 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-#include <TestUtil.hpp>
-#include <util/Bytes.hpp>
-#include <util/zstd.hpp>
+#include "TestUtil.hpp"
 
-#include <third_party/doctest.h>
+#include <ccache/util/Bytes.hpp>
+#include <ccache/util/zstd.hpp>
+
+#include <doctest.h>
 
 #include <string>