From 251f24409f80a711ca96ccd2288961cb4eb68aad Mon Sep 17 00:00:00 2001 From: Joel Rosdahl Date: Wed, 21 Feb 2024 22:03:43 +0100 Subject: [PATCH] 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 instead of #include . - Ccache headers are included with a ccache/ prefix, e.g. #include instead of #include . This keeps ccache and other headers separated but in another way than before. --- .clang-format | 20 ++--- ARCHITECTURE.md | 10 ++- CMakeLists.txt | 5 +- cmake/GenerateVersionFile.cmake | 2 +- src/{ => ccache}/.clang-tidy | 0 src/{ => ccache}/Args.cpp | 8 +- src/{ => ccache}/Args.hpp | 0 src/{ => ccache}/ArgsInfo.hpp | 4 +- src/{ => ccache}/CMakeLists.txt | 4 +- src/{ => ccache}/Config.cpp | 33 ++++---- src/{ => ccache}/Config.hpp | 6 +- src/{ => ccache}/Context.cpp | 21 +++-- src/{ => ccache}/Context.hpp | 24 +++--- src/{ => ccache}/Depfile.cpp | 25 +++--- src/{ => ccache}/Depfile.hpp | 0 src/{ => ccache}/Hash.cpp | 14 ++-- src/{ => ccache}/Hash.hpp | 6 +- src/{ => ccache}/InodeCache.cpp | 25 +++--- src/{ => ccache}/InodeCache.hpp | 12 +-- src/{ => ccache}/ProgressBar.cpp | 8 +- src/{ => ccache}/ProgressBar.hpp | 0 src/{ => ccache}/SignalHandler.cpp | 7 +- src/{ => ccache}/SignalHandler.hpp | 0 src/{ => ccache}/Util.cpp | 25 +++--- src/{ => ccache}/Util.hpp | 0 src/{ => ccache}/argprocessing.cpp | 27 +++--- src/{ => ccache}/argprocessing.hpp | 7 +- src/{ => ccache}/ccache.cpp | 83 +++++++++---------- src/{ => ccache}/ccache.hpp | 4 +- src/{ => ccache}/compopt.cpp | 2 +- src/{ => ccache}/compopt.hpp | 0 src/{ => ccache}/core/AtomicFile.cpp | 17 ++-- src/{ => ccache}/core/AtomicFile.hpp | 2 +- src/{ => ccache}/core/CMakeLists.txt | 0 src/{ => ccache}/core/CacheEntry.cpp | 28 +++---- src/{ => ccache}/core/CacheEntry.hpp | 8 +- .../core/CacheEntryDataReader.hpp | 12 +-- .../core/CacheEntryDataWriter.hpp | 10 +-- src/{ => ccache}/core/FileRecompressor.cpp | 14 ++-- src/{ => ccache}/core/FileRecompressor.hpp | 2 +- src/{ => ccache}/core/Manifest.cpp | 22 ++--- src/{ => ccache}/core/Manifest.hpp | 10 +-- .../core/MsvcShowIncludesOutput.cpp | 6 +- .../core/MsvcShowIncludesOutput.hpp | 4 +- src/{ => ccache}/core/Result.cpp | 37 ++++----- src/{ => ccache}/core/Result.hpp | 6 +- src/{ => ccache}/core/ResultExtractor.cpp | 19 ++--- src/{ => ccache}/core/ResultExtractor.hpp | 4 +- src/{ => ccache}/core/ResultInspector.cpp | 9 +- src/{ => ccache}/core/ResultInspector.hpp | 4 +- src/{ => ccache}/core/ResultRetriever.cpp | 31 ++++--- src/{ => ccache}/core/ResultRetriever.hpp | 8 +- src/{ => ccache}/core/Serializer.hpp | 6 +- src/{ => ccache}/core/Sloppiness.hpp | 4 +- src/{ => ccache}/core/Statistic.hpp | 0 src/{ => ccache}/core/Statistics.cpp | 14 ++-- src/{ => ccache}/core/Statistics.hpp | 6 +- src/{ => ccache}/core/StatisticsCounters.cpp | 4 +- src/{ => ccache}/core/StatisticsCounters.hpp | 0 src/{ => ccache}/core/StatsLog.cpp | 8 +- src/{ => ccache}/core/StatsLog.hpp | 0 src/{ => ccache}/core/common.cpp | 20 ++--- src/{ => ccache}/core/common.hpp | 0 src/{ => ccache}/core/exceptions.hpp | 2 +- src/{ => ccache}/core/mainoptions.cpp | 70 ++++++++-------- src/{ => ccache}/core/mainoptions.hpp | 0 src/{ => ccache}/core/types.cpp | 10 +-- src/{ => ccache}/core/types.hpp | 0 src/{ => ccache}/execute.cpp | 41 +++++---- src/{ => ccache}/execute.hpp | 2 +- src/{ => ccache}/hashutil.cpp | 31 ++++--- src/{ => ccache}/hashutil.hpp | 6 +- src/{ => ccache}/language.cpp | 2 +- src/{ => ccache}/language.hpp | 4 +- src/{ => ccache}/macroskip.hpp | 0 src/{ => ccache}/main.cpp | 0 src/{ => ccache}/storage/CMakeLists.txt | 0 src/{ => ccache}/storage/Storage.cpp | 40 ++++----- src/{ => ccache}/storage/Storage.hpp | 12 +-- src/{ => ccache}/storage/local/CMakeLists.txt | 0 .../storage/local/LocalStorage.cpp | 50 +++++------ .../storage/local/LocalStorage.hpp | 28 +++---- src/{ => ccache}/storage/local/StatsFile.cpp | 14 ++-- src/{ => ccache}/storage/local/StatsFile.hpp | 4 +- src/{ => ccache}/storage/local/util.cpp | 14 ++-- src/{ => ccache}/storage/local/util.hpp | 4 +- .../storage/remote/CMakeLists.txt | 0 .../storage/remote/FileStorage.cpp | 28 +++---- .../storage/remote/FileStorage.hpp | 4 +- .../storage/remote/HttpStorage.cpp | 28 +++---- .../storage/remote/HttpStorage.hpp | 4 +- .../storage/remote/RedisStorage.cpp | 20 ++--- .../storage/remote/RedisStorage.hpp | 4 +- .../storage/remote/RemoteStorage.cpp | 6 +- .../storage/remote/RemoteStorage.hpp | 10 +-- src/{ => ccache}/storage/types.hpp | 0 src/{ => ccache}/test_lockfile.cpp | 14 ++-- src/{ => ccache}/util/BitSet.hpp | 0 src/{ => ccache}/util/Bytes.cpp | 2 +- src/{ => ccache}/util/Bytes.hpp | 2 +- src/{ => ccache}/util/CMakeLists.txt | 0 src/{ => ccache}/util/DirEntry.cpp | 14 ++-- src/{ => ccache}/util/DirEntry.hpp | 4 +- src/{ => ccache}/util/Duration.hpp | 0 src/{ => ccache}/util/Fd.hpp | 8 +- src/{ => ccache}/util/FileStream.hpp | 4 +- src/{ => ccache}/util/Finalizer.hpp | 0 src/{ => ccache}/util/LockFile.cpp | 23 +++-- src/{ => ccache}/util/LockFile.hpp | 8 +- .../util/LongLivedLockFileManager.cpp | 10 +-- .../util/LongLivedLockFileManager.hpp | 4 +- src/{ => ccache}/util/MemoryMap.cpp | 4 +- src/{ => ccache}/util/MemoryMap.hpp | 4 +- src/{ => ccache}/util/NonCopyable.hpp | 0 src/{ => ccache}/util/PathString.hpp | 0 src/{ => ccache}/util/TemporaryFile.cpp | 12 +-- src/{ => ccache}/util/TemporaryFile.hpp | 6 +- src/{ => ccache}/util/TextTable.cpp | 6 +- src/{ => ccache}/util/TextTable.hpp | 0 src/{ => ccache}/util/ThreadPool.cpp | 0 src/{ => ccache}/util/ThreadPool.hpp | 0 src/{ => ccache}/util/TimePoint.cpp | 0 src/{ => ccache}/util/TimePoint.hpp | 2 +- src/{ => ccache}/util/Timer.hpp | 0 src/{ => ccache}/util/Tokenizer.cpp | 0 src/{ => ccache}/util/Tokenizer.hpp | 2 +- src/{ => ccache}/util/UmaskScope.cpp | 4 +- src/{ => ccache}/util/UmaskScope.hpp | 0 src/{ => ccache}/util/XXH3_128.hpp | 12 +-- src/{ => ccache}/util/XXH3_64.hpp | 4 +- src/{ => ccache}/util/assertions.cpp | 11 ++- src/{ => ccache}/util/assertions.hpp | 0 src/{ => ccache}/util/conversion.hpp | 6 +- src/{ => ccache}/util/environment.cpp | 6 +- src/{ => ccache}/util/environment.hpp | 2 +- src/{ => ccache}/util/error.cpp | 4 +- src/{ => ccache}/util/error.hpp | 0 src/{ => ccache}/util/expected.hpp | 4 +- src/{ => ccache}/util/file.cpp | 24 +++--- src/{ => ccache}/util/file.hpp | 12 +-- src/{ => ccache}/util/filesystem.cpp | 6 +- src/{ => ccache}/util/filesystem.hpp | 2 +- src/{ => ccache}/util/format.hpp | 6 +- src/{ => ccache}/util/logging.cpp | 15 ++-- src/{ => ccache}/util/logging.hpp | 4 +- src/{ => ccache}/util/path.cpp | 10 +-- src/{ => ccache}/util/path.hpp | 2 +- src/{ => ccache}/util/process.cpp | 4 +- src/{ => ccache}/util/process.hpp | 0 src/{ => ccache}/util/string.cpp | 4 +- src/{ => ccache}/util/string.hpp | 9 +- src/{ => ccache}/util/time.cpp | 0 src/{ => ccache}/util/time.hpp | 4 +- src/{ => ccache}/util/types.hpp | 2 +- src/{ => ccache}/util/wincompat.hpp | 0 src/{ => ccache}/util/zstd.cpp | 0 src/{ => ccache}/util/zstd.hpp | 6 +- src/third_party/CMakeLists.txt | 2 + unittest/TestUtil.cpp | 8 +- unittest/main.cpp | 12 +-- unittest/test_Args.cpp | 8 +- unittest/test_Config.cpp | 16 ++-- unittest/test_Depfile.cpp | 10 +-- unittest/test_Hash.cpp | 9 +- unittest/test_InodeCache.cpp | 21 +++-- unittest/test_Util.cpp | 23 +++-- unittest/test_argprocessing.cpp | 28 +++---- unittest/test_bsdmkstemp.cpp | 13 ++- unittest/test_ccache.cpp | 18 ++-- unittest/test_compopt.cpp | 6 +- unittest/test_compression_types.cpp | 9 +- unittest/test_core_AtomicFile.cpp | 10 +-- unittest/test_core_MsvcShowIncludesOutput.cpp | 11 +-- unittest/test_core_Statistics.cpp | 8 +- unittest/test_core_StatisticsCounters.cpp | 8 +- unittest/test_core_StatsLog.cpp | 10 +-- unittest/test_core_common.cpp | 14 ++-- unittest/test_hashutil.cpp | 11 ++- unittest/test_storage_local_StatsFile.cpp | 14 ++-- unittest/test_storage_local_util.cpp | 12 +-- unittest/test_util_BitSet.cpp | 7 +- unittest/test_util_Bytes.cpp | 6 +- unittest/test_util_DirEntry.cpp | 16 ++-- unittest/test_util_Duration.cpp | 6 +- unittest/test_util_LockFile.cpp | 14 ++-- unittest/test_util_TextTable.cpp | 6 +- unittest/test_util_TimePoint.cpp | 6 +- unittest/test_util_Tokenizer.cpp | 9 +- unittest/test_util_XXH3_128.cpp | 8 +- unittest/test_util_XXH3_64.cpp | 6 +- unittest/test_util_conversion.cpp | 6 +- unittest/test_util_environment.cpp | 6 +- unittest/test_util_expected.cpp | 8 +- unittest/test_util_file.cpp | 19 ++--- unittest/test_util_path.cpp | 10 +-- unittest/test_util_string.cpp | 4 +- unittest/test_util_zstd.cpp | 11 +-- 197 files changed, 918 insertions(+), 938 deletions(-) rename src/{ => ccache}/.clang-tidy (100%) rename src/{ => ccache}/Args.cpp (97%) rename src/{ => ccache}/Args.hpp (100%) rename src/{ => ccache}/ArgsInfo.hpp (98%) rename src/{ => ccache}/CMakeLists.txt (93%) rename src/{ => ccache}/Config.cpp (98%) rename src/{ => ccache}/Config.hpp (99%) rename src/{ => ccache}/Context.cpp (91%) rename src/{ => ccache}/Context.hpp (91%) rename src/{ => ccache}/Depfile.cpp (94%) rename src/{ => ccache}/Depfile.hpp (100%) rename src/{ => ccache}/Hash.cpp (92%) rename src/{ => ccache}/Hash.hpp (96%) rename src/{ => ccache}/InodeCache.cpp (97%) rename src/{ => ccache}/InodeCache.hpp (96%) rename src/{ => ccache}/ProgressBar.cpp (93%) rename src/{ => ccache}/ProgressBar.hpp (100%) rename src/{ => ccache}/SignalHandler.cpp (96%) rename src/{ => ccache}/SignalHandler.hpp (100%) rename src/{ => ccache}/Util.cpp (94%) rename src/{ => ccache}/Util.hpp (100%) rename src/{ => ccache}/argprocessing.cpp (99%) rename src/{ => ccache}/argprocessing.hpp (95%) rename src/{ => ccache}/ccache.cpp (98%) rename src/{ => ccache}/ccache.hpp (97%) rename src/{ => ccache}/compopt.cpp (99%) rename src/{ => ccache}/compopt.hpp (100%) rename src/{ => ccache}/core/AtomicFile.cpp (89%) rename src/{ => ccache}/core/AtomicFile.hpp (97%) rename src/{ => ccache}/core/CMakeLists.txt (100%) rename src/{ => ccache}/core/CacheEntry.cpp (95%) rename src/{ => ccache}/core/CacheEntry.hpp (96%) rename src/{ => ccache}/core/CacheEntryDataReader.hpp (91%) rename src/{ => ccache}/core/CacheEntryDataWriter.hpp (91%) rename src/{ => ccache}/core/FileRecompressor.cpp (92%) rename src/{ => ccache}/core/FileRecompressor.hpp (97%) rename src/{ => ccache}/core/Manifest.cpp (97%) rename src/{ => ccache}/core/Manifest.hpp (95%) rename src/{ => ccache}/core/MsvcShowIncludesOutput.cpp (95%) rename src/{ => ccache}/core/MsvcShowIncludesOutput.hpp (92%) rename src/{ => ccache}/core/Result.cpp (93%) rename src/{ => ccache}/core/Result.hpp (98%) rename src/{ => ccache}/core/ResultExtractor.cpp (89%) rename src/{ => ccache}/core/ResultExtractor.hpp (96%) rename src/{ => ccache}/core/ResultInspector.cpp (91%) rename src/{ => ccache}/core/ResultInspector.hpp (95%) rename src/{ => ccache}/core/ResultRetriever.cpp (92%) rename src/{ => ccache}/core/ResultRetriever.hpp (93%) rename src/{ => ccache}/core/Serializer.hpp (89%) rename src/{ => ccache}/core/Sloppiness.hpp (95%) rename src/{ => ccache}/core/Statistic.hpp (100%) rename src/{ => ccache}/core/Statistics.cpp (98%) rename src/{ => ccache}/core/Statistics.hpp (95%) rename src/{ => ccache}/core/StatisticsCounters.cpp (97%) rename src/{ => ccache}/core/StatisticsCounters.hpp (100%) rename src/{ => ccache}/core/StatsLog.cpp (92%) rename src/{ => ccache}/core/StatsLog.hpp (100%) rename src/{ => ccache}/core/common.cpp (93%) rename src/{ => ccache}/core/common.hpp (100%) rename src/{ => ccache}/core/exceptions.hpp (97%) rename src/{ => ccache}/core/mainoptions.cpp (95%) rename src/{ => ccache}/core/mainoptions.hpp (100%) rename src/{ => ccache}/core/types.cpp (90%) rename src/{ => ccache}/core/types.hpp (100%) rename src/{ => ccache}/execute.cpp (94%) rename src/{ => ccache}/execute.hpp (98%) rename src/{ => ccache}/hashutil.cpp (96%) rename src/{ => ccache}/hashutil.hpp (95%) rename src/{ => ccache}/language.cpp (99%) rename src/{ => ccache}/language.hpp (94%) rename src/{ => ccache}/macroskip.hpp (100%) rename src/{ => ccache}/main.cpp (100%) rename src/{ => ccache}/storage/CMakeLists.txt (100%) rename src/{ => ccache}/storage/Storage.cpp (95%) rename src/{ => ccache}/storage/Storage.hpp (92%) rename src/{ => ccache}/storage/local/CMakeLists.txt (100%) rename src/{ => ccache}/storage/local/LocalStorage.cpp (98%) rename src/{ => ccache}/storage/local/LocalStorage.hpp (93%) rename src/{ => ccache}/storage/local/StatsFile.cpp (89%) rename src/{ => ccache}/storage/local/StatsFile.hpp (93%) rename src/{ => ccache}/storage/local/util.cpp (90%) rename src/{ => ccache}/storage/local/util.hpp (95%) rename src/{ => ccache}/storage/remote/CMakeLists.txt (100%) rename src/{ => ccache}/storage/remote/FileStorage.cpp (91%) rename src/{ => ccache}/storage/remote/FileStorage.hpp (93%) rename src/{ => ccache}/storage/remote/HttpStorage.cpp (95%) rename src/{ => ccache}/storage/remote/HttpStorage.hpp (94%) rename src/{ => ccache}/storage/remote/RedisStorage.cpp (96%) rename src/{ => ccache}/storage/remote/RedisStorage.hpp (93%) rename src/{ => ccache}/storage/remote/RemoteStorage.cpp (90%) rename src/{ => ccache}/storage/remote/RemoteStorage.hpp (96%) rename src/{ => ccache}/storage/types.hpp (100%) rename src/{ => ccache}/test_lockfile.cpp (88%) rename src/{ => ccache}/util/BitSet.hpp (100%) rename src/{ => ccache}/util/Bytes.cpp (98%) rename src/{ => ccache}/util/Bytes.hpp (99%) rename src/{ => ccache}/util/CMakeLists.txt (100%) rename src/{ => ccache}/util/DirEntry.cpp (96%) rename src/{ => ccache}/util/DirEntry.hpp (98%) rename src/{ => ccache}/util/Duration.hpp (100%) rename src/{ => ccache}/util/Fd.hpp (91%) rename src/{ => ccache}/util/FileStream.hpp (95%) rename src/{ => ccache}/util/Finalizer.hpp (100%) rename src/{ => ccache}/util/LockFile.cpp (96%) rename src/{ => ccache}/util/LockFile.hpp (92%) rename src/{ => ccache}/util/LongLivedLockFileManager.cpp (92%) rename src/{ => ccache}/util/LongLivedLockFileManager.hpp (93%) rename src/{ => ccache}/util/MemoryMap.cpp (97%) rename src/{ => ccache}/util/MemoryMap.hpp (95%) rename src/{ => ccache}/util/NonCopyable.hpp (100%) rename src/{ => ccache}/util/PathString.hpp (100%) rename src/{ => ccache}/util/TemporaryFile.cpp (92%) rename src/{ => ccache}/util/TemporaryFile.hpp (93%) rename src/{ => ccache}/util/TextTable.cpp (97%) rename src/{ => ccache}/util/TextTable.hpp (100%) rename src/{ => ccache}/util/ThreadPool.cpp (100%) rename src/{ => ccache}/util/ThreadPool.hpp (100%) rename src/{ => ccache}/util/TimePoint.cpp (100%) rename src/{ => ccache}/util/TimePoint.hpp (99%) rename src/{ => ccache}/util/Timer.hpp (100%) rename src/{ => ccache}/util/Tokenizer.cpp (100%) rename src/{ => ccache}/util/Tokenizer.hpp (98%) rename src/{ => ccache}/util/UmaskScope.cpp (93%) rename src/{ => ccache}/util/UmaskScope.hpp (100%) rename src/{ => ccache}/util/XXH3_128.hpp (87%) rename src/{ => ccache}/util/XXH3_64.hpp (95%) rename src/{ => ccache}/util/assertions.cpp (85%) rename src/{ => ccache}/util/assertions.hpp (100%) rename src/{ => ccache}/util/conversion.hpp (96%) rename src/{ => ccache}/util/environment.cpp (95%) rename src/{ => ccache}/util/environment.hpp (97%) rename src/{ => ccache}/util/error.cpp (93%) rename src/{ => ccache}/util/error.hpp (100%) rename src/{ => ccache}/util/expected.hpp (97%) rename src/{ => ccache}/util/file.cpp (97%) rename src/{ => ccache}/util/file.hpp (96%) rename src/{ => ccache}/util/filesystem.cpp (91%) rename src/{ => ccache}/util/filesystem.hpp (99%) rename src/{ => ccache}/util/format.hpp (93%) rename src/{ => ccache}/util/logging.cpp (94%) rename src/{ => ccache}/util/logging.hpp (97%) rename src/{ => ccache}/util/path.cpp (94%) rename src/{ => ccache}/util/path.hpp (98%) rename src/{ => ccache}/util/process.cpp (93%) rename src/{ => ccache}/util/process.hpp (100%) rename src/{ => ccache}/util/string.cpp (99%) rename src/{ => ccache}/util/string.hpp (98%) rename src/{ => ccache}/util/time.cpp (100%) rename src/{ => ccache}/util/time.hpp (91%) rename src/{ => ccache}/util/types.hpp (96%) rename src/{ => ccache}/util/wincompat.hpp (100%) rename src/{ => ccache}/util/zstd.cpp (100%) rename src/{ => ccache}/util/zstd.hpp (93%) diff --git a/.clang-format b/.clang-format index 3d4ec9c4e..d18311d43 100644 --- 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: '^$' Priority: 3 + # C++ headers: + - Regex: '^<' + Priority: 4 IndentPPDirectives: AfterHash KeepEmptyLinesAtTheStartOfBlocks: false PointerAlignment: Left diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md index 26ecdd843..2dbc7c994 100644 --- 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 5f0dd388f..4add59421 100644 --- 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 7b2ad0cd4..55d5b88cb 100644 --- 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 44a09ddbf..795dd6898 100644 --- a/src/Args.cpp +++ b/src/ccache/Args.cpp @@ -18,10 +18,10 @@ #include "Args.hpp" -#include -#include -#include -#include +#include +#include +#include +#include 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 a6076e342..2a46a4fb0 100644 --- 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 #include #include 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 3b85874f3..bfd6ae330 100644 --- 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 1440dc865..5d99f8d90 100644 --- a/src/Config.cpp +++ b/src/ccache/Config.cpp @@ -18,23 +18,22 @@ #include "Config.hpp" -#include "Util.hpp" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef HAVE_PWD_H # include 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 b3c28a41c..2ac111854 100644 --- a/src/Config.hpp +++ b/src/ccache/Config.hpp @@ -18,9 +18,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include 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 47f9407e0..31e037456 100644 --- 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 -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef HAVE_UNISTD_H # include 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 98716ae3e..722616261 100644 --- 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 -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef INODE_CACHE_SUPPORTED -# include "InodeCache.hpp" +# include #endif -#include -#include -#include -#include -#include - #include #include 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 4da675871..441c0427d 100644 --- 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 -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include 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 f8780efd0..97db62f07 100644 --- 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 -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include 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 7fe8386e7..df95b66c2 100644 --- a/src/Hash.hpp +++ b/src/ccache/Hash.hpp @@ -18,9 +18,9 @@ #pragma once -#include "third_party/blake3/blake3.h" -#include -#include +#include +#include +#include #include #include 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 8a869b940..774633b52 100644 --- 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 -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include 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 48bedcbc5..589c35caa 100644 --- a/src/InodeCache.hpp +++ b/src/ccache/InodeCache.hpp @@ -18,12 +18,12 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include 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 3fa6f7e1d..428275cf8 100644 --- 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 -#include -#include +#include +#include +#include #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 50d3760a0..37c966777 100644 --- 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 +#include +#include #include // NOLINT: sigaddset et al are defined in signal.h #include 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 96deb698a..3d35aa684 100644 --- a/src/Util.cpp +++ b/src/ccache/Util.cpp @@ -18,19 +18,18 @@ #include "Util.hpp" -#include "Context.hpp" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef HAVE_UNISTD_H # include 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 0a156a683..ee9eb2d1e 100644 --- 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef HAVE_UNISTD_H # include 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 bb114c681..3c2a07a46 100644 --- 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 +#include +#include #include #include 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 10b38f1e7..6a91a209d 100644 --- 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include 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 d5ed96070..2377b381f 100644 --- a/src/ccache.hpp +++ b/src/ccache/ccache.hpp @@ -19,8 +19,8 @@ #pragma once -#include -#include +#include +#include #include #include 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 0554c6d7f..f3c3be0f9 100644 --- a/src/compopt.cpp +++ b/src/ccache/compopt.cpp @@ -18,7 +18,7 @@ #include "compopt.hpp" -#include +#include // 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 e508ec28e..5e22295bd 100644 --- 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 -#include -#include -#include -#include -#include -#include -#include +#include "AtomicFile.hpp" + +#include +#include +#include +#include +#include +#include +#include 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 666dda948..53563d469 100644 --- a/src/core/AtomicFile.hpp +++ b/src/ccache/core/AtomicFile.hpp @@ -18,7 +18,7 @@ #pragma once -#include +#include #include #include 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 926feca57..335e05317 100644 --- a/src/core/CacheEntry.cpp +++ b/src/ccache/core/CacheEntry.cpp @@ -18,20 +18,20 @@ #include "CacheEntry.hpp" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include 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 ce0ebf724..b57772966 100644 --- a/src/core/CacheEntry.hpp +++ b/src/ccache/core/CacheEntry.hpp @@ -18,11 +18,11 @@ #pragma once -#include -#include -#include +#include +#include +#include -#include +#include #include #include 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 465e9677e..2fc12c603 100644 --- 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 -#include -#include -#include +#include +#include +#include +#include -#include +#include #include #include 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 1022195a8..df44d9bc4 100644 --- a/src/core/CacheEntryDataWriter.hpp +++ b/src/ccache/core/CacheEntryDataWriter.hpp @@ -18,12 +18,12 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include #include #include 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 c2e6c0333..945d902cc 100644 --- a/src/core/FileRecompressor.cpp +++ b/src/ccache/core/FileRecompressor.cpp @@ -18,13 +18,13 @@ #include "FileRecompressor.hpp" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include 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 7b047f49b..bf2d6d115 100644 --- a/src/core/FileRecompressor.hpp +++ b/src/ccache/core/FileRecompressor.hpp @@ -18,7 +18,7 @@ #pragma once -#include +#include #include #include 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 2d60dfbe9..5c0bc34cb 100644 --- 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // 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 18f7ef403..a46982edd 100644 --- a/src/core/Manifest.hpp +++ b/src/ccache/core/Manifest.hpp @@ -18,12 +18,12 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include #include #include 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 dcc153985..7170935b3 100644 --- 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 -#include +#include +#include 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 97c59c061..ac1cc8a6f 100644 --- 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 +#include #include #include 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 94a6b0c7c..b22ae0e7d 100644 --- 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include 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 6ec343d5a..01ddfb6ff 100644 --- a/src/core/Result.hpp +++ b/src/ccache/core/Result.hpp @@ -18,10 +18,10 @@ #pragma once -#include -#include +#include +#include -#include +#include #include #include 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 77a96291f..f765da4b4 100644 --- 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 -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include 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 325ec4f0c..b840ba81e 100644 --- a/src/core/ResultExtractor.hpp +++ b/src/ccache/core/ResultExtractor.hpp @@ -18,9 +18,9 @@ #pragma once -#include +#include -#include +#include #include #include 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 f25102664..aaa816563 100644 --- 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 -#include +#include +#include +#include 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 374240d17..a1b132bcf 100644 --- a/src/core/ResultInspector.hpp +++ b/src/ccache/core/ResultInspector.hpp @@ -18,9 +18,9 @@ #pragma once -#include +#include -#include +#include #include #include 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 fceb2c738..9f0cbb86b 100644 --- a/src/core/ResultRetriever.cpp +++ b/src/ccache/core/ResultRetriever.cpp @@ -18,22 +18,21 @@ #include "ResultRetriever.hpp" -#include "Depfile.hpp" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include 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 74e5e102f..9582c47c1 100644 --- a/src/core/ResultRetriever.hpp +++ b/src/ccache/core/ResultRetriever.hpp @@ -18,11 +18,11 @@ #pragma once -#include -#include -#include +#include +#include +#include -#include +#include #include #include 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 bb5ddd034..01b3860d4 100644 --- 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 +#include -#include +#include #include 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 2466934be..9afc08a52 100644 --- 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 +#include #include #include 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 85063da75..1f012a428 100644 --- a/src/core/Statistics.cpp +++ b/src/ccache/core/Statistics.cpp @@ -18,13 +18,13 @@ #include "Statistics.hpp" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include 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 54f7641fa..27d4b3537 100644 --- a/src/core/Statistics.hpp +++ b/src/ccache/core/Statistics.hpp @@ -18,9 +18,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include #include 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 3c08a2714..147efade7 100644 --- 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 +#include #include 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 30acb0fcf..487a26ee6 100644 --- a/src/core/StatsLog.cpp +++ b/src/ccache/core/StatsLog.cpp @@ -18,10 +18,10 @@ #include "StatsLog.hpp" -#include -#include -#include -#include +#include +#include +#include +#include #include #include 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 cf5a8ed5b..401812344 100644 --- a/src/core/common.cpp +++ b/src/ccache/core/common.cpp @@ -18,16 +18,16 @@ #include "common.hpp" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include 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 7bdf50943..7017e930a 100644 --- a/src/core/exceptions.hpp +++ b/src/ccache/core/exceptions.hpp @@ -18,7 +18,7 @@ #pragma once -#include +#include #include #include 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 2eb20ad34..7695d7f73 100644 --- a/src/core/mainoptions.cpp +++ b/src/ccache/core/mainoptions.cpp @@ -18,39 +18,39 @@ #include "mainoptions.hpp" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include @@ -68,10 +68,10 @@ #ifdef HAVE_GETOPT_LONG # include #elif defined(_WIN32) -# include +# include #else extern "C" { -# include +# include } #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 d76942725..3a49b3f7c 100644 --- 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 -#include -#include -#include +#include +#include +#include +#include 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 2ea741fac..11c2750d3 100644 --- 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include 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 653b19181..7eaa33d12 100644 --- a/src/execute.hpp +++ b/src/ccache/execute.hpp @@ -18,7 +18,7 @@ #pragma once -#include +#include #include #include 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 c78f52885..e783921cb 100644 --- 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 -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef INODE_CACHE_SUPPORTED # include "InodeCache.hpp" #endif -#include "third_party/blake3/blake3_cpu_supports_avx2.h" +#include #ifdef HAVE_UNISTD_H # include 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 c036b429a..37746b07d 100644 --- 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 -#include +#include +#include #include #include 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 f58de52df..66522de00 100644 --- a/src/language.cpp +++ b/src/ccache/language.cpp @@ -18,7 +18,7 @@ #include "language.hpp" -#include +#include 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 3e79bdf51..1ab0f977c 100644 --- 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 #include 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 ddb21b7a0..7155f705a 100644 --- a/src/storage/Storage.cpp +++ b/src/ccache/storage/Storage.cpp @@ -18,28 +18,28 @@ #include "Storage.hpp" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #ifdef HAVE_REDIS_STORAGE_BACKEND -# include +# include #endif -#include -#include -#include -#include -#include -#include -#include - -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include #include #include 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 d709065c2..3d46486d0 100644 --- a/src/storage/Storage.hpp +++ b/src/ccache/storage/Storage.hpp @@ -18,13 +18,13 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include +#include #include #include 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 1a38afedc..fc3310422 100644 --- a/src/storage/local/LocalStorage.cpp +++ b/src/ccache/storage/local/LocalStorage.cpp @@ -18,33 +18,33 @@ #include "LocalStorage.hpp" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef INODE_CACHE_SUPPORTED -# include +# include #endif #include 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 64036864c..313f8acd0 100644 --- a/src/storage/local/LocalStorage.hpp +++ b/src/ccache/storage/local/LocalStorage.hpp @@ -18,20 +18,20 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include #include #include 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 a02160662..9b5f54e04 100644 --- 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 -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include 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 cab947c78..c9d392226 100644 --- 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 +#include #include #include 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 6de7729db..7e9b979c5 100644 --- a/src/storage/local/util.cpp +++ b/src/ccache/storage/local/util.cpp @@ -18,13 +18,13 @@ #include "util.hpp" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include 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 d48af32f8..71e432d3b 100644 --- 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 +#include #include #include 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 768505543..51d7f1d65 100644 --- 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include // 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 6dee11dd0..4fb61b1aa 100644 --- a/src/storage/remote/FileStorage.hpp +++ b/src/ccache/storage/remote/FileStorage.hpp @@ -18,9 +18,9 @@ #pragma once -#include +#include -#include +#include #include #include 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 a64e15382..cf469f99e 100644 --- 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include #include 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 0e721ec41..fd3f4cfe1 100644 --- a/src/storage/remote/HttpStorage.hpp +++ b/src/ccache/storage/remote/HttpStorage.hpp @@ -18,9 +18,9 @@ #pragma once -#include +#include -#include +#include #include #include 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 6316b2321..11870277b 100644 --- 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 -#include -#include -#include -#include -#include -#include -#include -#include // for timeval +#include +#include +#include +#include +#include +#include +#include +#include +#include // for timeval #ifdef HAVE_SYS_UTIME_H # include // 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 6989782e9..be4ac2794 100644 --- a/src/storage/remote/RedisStorage.hpp +++ b/src/ccache/storage/remote/RedisStorage.hpp @@ -18,9 +18,9 @@ #pragma once -#include +#include -#include +#include #include #include 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 e31039018..ca0703fa8 100644 --- 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 -#include +#include +#include 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 5a393ff3f..5551bd1d2 100644 --- a/src/storage/remote/RemoteStorage.hpp +++ b/src/ccache/storage/remote/RemoteStorage.hpp @@ -18,12 +18,12 @@ #pragma once -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include #include #include 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 9c0db1086..ee7941939 100644 --- 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 -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include 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 32d181881..edd0a72c5 100644 --- a/src/util/Bytes.cpp +++ b/src/ccache/util/Bytes.cpp @@ -18,7 +18,7 @@ #include "Bytes.hpp" -#include +#include 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 33032d085..0bfa2284e 100644 --- a/src/util/Bytes.hpp +++ b/src/ccache/util/Bytes.hpp @@ -18,7 +18,7 @@ #pragma once -#include +#include #include #include 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 53bfdee8d..ec36098b1 100644 --- a/src/util/DirEntry.cpp +++ b/src/ccache/util/DirEntry.cpp @@ -18,15 +18,15 @@ #include "DirEntry.hpp" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #ifdef _WIN32 -# include +# include #endif #include 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 138263b40..90e02123f 100644 --- a/src/util/DirEntry.hpp +++ b/src/ccache/util/DirEntry.hpp @@ -18,8 +18,8 @@ #pragma once -#include -#include +#include +#include #include 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 03067b2f4..9859f243d 100644 --- 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 -#include -#include +#include +#include +#include #ifdef HAVE_UNISTD_H # include 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 e50e47a08..d91e9c76d 100644 --- 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 +#include #include #include 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 cbc36311a..43b62cd10 100644 --- a/src/util/LockFile.cpp +++ b/src/ccache/util/LockFile.cpp @@ -18,18 +18,17 @@ #include "LockFile.hpp" -#include "Util.hpp" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef HAVE_UNISTD_H # include 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 a04511d90..95b984054 100644 --- 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 -#include -#include +#include +#include +#include #include #include 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 7fa7c841e..bf6e22791 100644 --- 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 -#include -#include -#include +#include +#include +#include +#include #include 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 b65cf62c5..5156097f7 100644 --- 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 +#include #include #include 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 7430c7d0e..35e29e103 100644 --- a/src/util/MemoryMap.cpp +++ b/src/ccache/util/MemoryMap.cpp @@ -18,8 +18,8 @@ #include "MemoryMap.hpp" -#include -#include +#include +#include #include 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 538b2f123..f4d27d92e 100644 --- a/src/util/MemoryMap.hpp +++ b/src/ccache/util/MemoryMap.hpp @@ -18,9 +18,9 @@ #pragma once -#include +#include -#include +#include #include #include 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 a3dff93c8..80d838f39 100644 --- a/src/util/TemporaryFile.cpp +++ b/src/ccache/util/TemporaryFile.cpp @@ -18,11 +18,11 @@ #include "TemporaryFile.hpp" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include @@ -31,7 +31,7 @@ #endif #ifdef _WIN32 -# include +# include #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 8e121c5cb..e92a8e9df 100644 --- 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 +#include -#include +#include #include #include 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 9880d1fcc..9afd324d7 100644 --- a/src/util/TextTable.cpp +++ b/src/ccache/util/TextTable.cpp @@ -18,10 +18,10 @@ #include "TextTable.hpp" -#include -#include +#include +#include -#include +#include #include 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 530bd124b..a12aa1965 100644 --- a/src/util/TimePoint.hpp +++ b/src/ccache/util/TimePoint.hpp @@ -18,7 +18,7 @@ #pragma once -#include +#include #include #include 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 ba69e18fe..143be82b4 100644 --- a/src/util/Tokenizer.hpp +++ b/src/ccache/util/Tokenizer.hpp @@ -18,7 +18,7 @@ #pragma once -#include +#include #include #include 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 103d6598c..049167482 100644 --- 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 +#include #include 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 ddc52ba14..02ea1080c 100644 --- 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 -#include +#include +#include -#include +#include #ifdef USE_XXH_DISPATCH -# include +# include #else -# include +# include #endif #include 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 61f0fabeb..1895759de 100644 --- 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 #else -# include "third_party/xxhash.h" +# include #endif #include 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 e4b03efbe..c0609eaec 100644 --- 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 -#include -#include +#include +#include +#include +#include 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 9f9eb2553..e755cc466 100644 --- 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 +#include -#include +#include #include #include 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 58d6c017d..5b1862aab 100644 --- 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 -#include +#include +#include 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 c874b2233..771c21380 100644 --- a/src/util/environment.hpp +++ b/src/ccache/util/environment.hpp @@ -18,7 +18,7 @@ #pragma once -#include +#include #include 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 5cc9c346b..488039b35 100644 --- 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 +#include 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 95a943d8d..b093e1b0b 100644 --- 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 +#include #include #include 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 51dca6cda..13daa5378 100644 --- a/src/util/file.cpp +++ b/src/ccache/util/file.cpp @@ -18,18 +18,18 @@ #include "file.hpp" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef HAVE_UNISTD_H # include 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 463813c5c..d72f40995 100644 --- a/src/util/file.hpp +++ b/src/ccache/util/file.hpp @@ -18,13 +18,13 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include +#include +#include #include #include 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 755dc318f..22ad2cff1 100644 --- 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 +#include #ifdef _WIN32 -# include +# include #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 6cd0476db..420e5af68 100644 --- a/src/util/filesystem.hpp +++ b/src/ccache/util/filesystem.hpp @@ -18,7 +18,7 @@ #pragma once -#include +#include #include #include 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 78ded2b9f..f2ee81d91 100644 --- a/src/util/format.hpp +++ b/src/ccache/util/format.hpp @@ -18,9 +18,9 @@ #pragma once -#include -#include -#include +#include +#include +#include // 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 f0fbecd63..75f2d5747 100644 --- 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 -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #ifdef HAVE_UNISTD_H # include 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 2e4300fa1..19f115459 100644 --- a/src/util/logging.hpp +++ b/src/ccache/util/logging.hpp @@ -18,8 +18,8 @@ #pragma once -#include -#include +#include +#include #include #include 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 41b36fe33..b32056f5a 100644 --- a/src/util/path.cpp +++ b/src/ccache/util/path.cpp @@ -18,11 +18,11 @@ #include "path.hpp" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #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 31dbcbc59..c445d37d4 100644 --- a/src/util/path.hpp +++ b/src/ccache/util/path.hpp @@ -22,7 +22,7 @@ #include #include #ifdef _WIN32 -# include +# include #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 2c97fb561..6a97e80ad 100644 --- 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 +#include #include 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 dba3e9aed..e45b32890 100644 --- a/src/util/string.cpp +++ b/src/ccache/util/string.cpp @@ -18,8 +18,8 @@ #include "string.hpp" -#include -#include +#include +#include #include #include 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 c61514d93..ca8029fad 100644 --- a/src/util/string.hpp +++ b/src/ccache/util/string.hpp @@ -18,13 +18,12 @@ #pragma once -#include -#include - -#include -#include +#include +#include +#include #include // for mode_t +#include #include #include 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 9ccfda781..df7928d82 100644 --- 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 +#include #include #include 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 3cdc7febb..cf293c005 100644 --- a/src/util/types.hpp +++ b/src/ccache/util/types.hpp @@ -18,7 +18,7 @@ #pragma once -#include +#include #include #include 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 5c47a5307..557d9cbc6 100644 --- a/src/util/zstd.hpp +++ b/src/ccache/util/zstd.hpp @@ -18,10 +18,10 @@ #pragma once -#include +#include -#include -#include +#include +#include #include #include diff --git a/src/third_party/CMakeLists.txt b/src/third_party/CMakeLists.txt index a615dcf6b..4f6c3f930 100644 --- 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 3b502181c..95e9ed1db 100644 --- a/unittest/TestUtil.cpp +++ b/unittest/TestUtil.cpp @@ -18,10 +18,10 @@ #include "TestUtil.hpp" -#include -#include -#include -#include +#include +#include +#include +#include namespace fs = util::filesystem; diff --git a/unittest/main.cpp b/unittest/main.cpp index a415602df..2407eb064 100644 --- 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 -#include -#include -#include +#include +#include +#include +#include #define DOCTEST_THREAD_LOCAL // Avoid MinGW thread_local bug #define DOCTEST_CONFIG_IMPLEMENT -#include "third_party/doctest.h" +#include namespace fs = util::filesystem; diff --git a/unittest/test_Args.cpp b/unittest/test_Args.cpp index 82b51ec15..8db30f0c9 100644 --- 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 +#include +#include -#include "third_party/doctest.h" +#include TEST_SUITE_BEGIN("Args"); diff --git a/unittest/test_Config.cpp b/unittest/test_Config.cpp index 4de2ec9bb..32fb6bf26 100644 --- 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 -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include "third_party/doctest.h" +#include #include #include diff --git a/unittest/test_Depfile.cpp b/unittest/test_Depfile.cpp index 768f69ad0..aac62e37a 100644 --- 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 -#include +#include +#include +#include +#include -#include "third_party/doctest.h" +#include #include #include diff --git a/unittest/test_Hash.cpp b/unittest/test_Hash.cpp index 24a57f66e..a66e35321 100644 --- 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 +#include -#include - -#include "third_party/doctest.h" +#include TEST_SUITE_BEGIN("Hash"); diff --git a/unittest/test_InodeCache.cpp b/unittest/test_InodeCache.cpp index 2bad0f653..5e9cd8068 100644 --- 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 -#include -#include -#include - -#include "third_party/doctest.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/unittest/test_Util.cpp b/unittest/test_Util.cpp index 53ebbc214..e670464b0 100644 --- 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 -#include -#include -#include -#include -#include -#include - -#include "third_party/doctest.h" - +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include #include #include diff --git a/unittest/test_argprocessing.cpp b/unittest/test_argprocessing.cpp index 035792775..96ee86204 100644 --- 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 -#include -#include -#include -#include -#include -#include - -#include "third_party/doctest.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include #include diff --git a/unittest/test_bsdmkstemp.cpp b/unittest/test_bsdmkstemp.cpp index f0cdb4192..ead061d26 100644 --- 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 -#include -#include - -#include "third_party/doctest.h" -#include "third_party/win32/mktemp.h" +#include +#include +#include +#include #include +#include #include #include diff --git a/unittest/test_ccache.cpp b/unittest/test_ccache.cpp index 416c4463d..ca469bc95 100644 --- 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 -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include -#include "third_party/doctest.h" +#include #include #include diff --git a/unittest/test_compopt.cpp b/unittest/test_compopt.cpp index 492095f11..965d55970 100644 --- 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 -#include "third_party/doctest.h" +#include bool compopt_verify_sortedness_and_flags(); diff --git a/unittest/test_compression_types.cpp b/unittest/test_compression_types.cpp index 639a81c8f..9bfca2a6f 100644 --- 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 +#include -#include - -#include "third_party/doctest.h" +#include TEST_SUITE_BEGIN("compression"); diff --git a/unittest/test_core_AtomicFile.cpp b/unittest/test_core_AtomicFile.cpp index fd3d9ede3..ed36d9c25 100644 --- 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 -#include -#include +#include +#include +#include -#include "third_party/doctest.h" +#include #include #include diff --git a/unittest/test_core_MsvcShowIncludesOutput.cpp b/unittest/test_core_MsvcShowIncludesOutput.cpp index 0e0f71783..ddcac5a6b 100644 --- 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 +#include +#include + +#include static const std::string defaultPrefix = "Note: including file:"; diff --git a/unittest/test_core_Statistics.cpp b/unittest/test_core_Statistics.cpp index 8fe6d6cfe..885f23318 100644 --- 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 -#include +#include +#include -#include +#include #include // macOS bug: https://github.com/onqtam/doctest/issues/126 #include diff --git a/unittest/test_core_StatisticsCounters.cpp b/unittest/test_core_StatisticsCounters.cpp index 01db98972..6e73943ed 100644 --- 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 -#include +#include +#include -#include "third_party/doctest.h" +#include using core::Statistic; using core::StatisticsCounters; diff --git a/unittest/test_core_StatsLog.cpp b/unittest/test_core_StatsLog.cpp index d31c7502f..6336e41fa 100644 --- 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 -#include -#include +#include +#include +#include -#include +#include using core::Statistic; using core::StatsLog; diff --git a/unittest/test_core_common.cpp b/unittest/test_core_common.cpp index 6f0268ce1..0cbce69bf 100644 --- 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 -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include +#include namespace fs = util::filesystem; diff --git a/unittest/test_hashutil.cpp b/unittest/test_hashutil.cpp index d8dc3b9cd..c908bca63 100644 --- 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 - -#include "third_party/doctest.h" +#include +#include +#include +#include #include using TestUtil::TestContext; diff --git a/unittest/test_storage_local_StatsFile.cpp b/unittest/test_storage_local_StatsFile.cpp index 34b9c2f2c..153980f35 100644 --- 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 -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include +#include using core::Statistic; using storage::local::StatsFile; diff --git a/unittest/test_storage_local_util.cpp b/unittest/test_storage_local_util.cpp index 8ffbdff25..48021440a 100644 --- 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 -#include -#include -#include +#include +#include +#include +#include -#include +#include #include #include diff --git a/unittest/test_util_BitSet.cpp b/unittest/test_util_BitSet.cpp index 3130794ab..3b7c65293 100644 --- 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 +#include + +#include TEST_SUITE_BEGIN("BitSet"); diff --git a/unittest/test_util_Bytes.cpp b/unittest/test_util_Bytes.cpp index 7c130d526..3f444e59c 100644 --- 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 +#include -#include -#include +#include +#include #include diff --git a/unittest/test_util_DirEntry.cpp b/unittest/test_util_DirEntry.cpp index 1c98263d0..d3b16462c 100644 --- 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 -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include +#include #ifdef HAVE_UNISTD_H # include diff --git a/unittest/test_util_Duration.cpp b/unittest/test_util_Duration.cpp index b920281da..34a1eb013 100644 --- 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 +#include -#include +#include TEST_SUITE_BEGIN("util::Duration"); diff --git a/unittest/test_util_LockFile.cpp b/unittest/test_util_LockFile.cpp index d93fc5d87..888872573 100644 --- 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 -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include "third_party/doctest.h" +#include #ifdef HAVE_UNISTD_H # include diff --git a/unittest/test_util_TextTable.cpp b/unittest/test_util_TextTable.cpp index 1a996c042..9f2efd689 100644 --- 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 +#include -#include +#include #include // macOS bug: https://github.com/onqtam/doctest/issues/126 diff --git a/unittest/test_util_TimePoint.cpp b/unittest/test_util_TimePoint.cpp index a86ba9b50..43dbf8545 100644 --- 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 +#include -#include +#include TEST_SUITE_BEGIN("util::TimePoint"); diff --git a/unittest/test_util_Tokenizer.cpp b/unittest/test_util_Tokenizer.cpp index 256217797..a06710d65 100644 --- 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 +#include -#include - -#include "third_party/doctest.h" +#include #include // https://github.com/doctest/doctest/issues/618 #include diff --git a/unittest/test_util_XXH3_128.cpp b/unittest/test_util_XXH3_128.cpp index a940069d7..c7fd9da5c 100644 --- 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 -#include +#include +#include -#include +#include TEST_SUITE_BEGIN("util::XXH3_128"); diff --git a/unittest/test_util_XXH3_64.cpp b/unittest/test_util_XXH3_64.cpp index 744029ccc..2a01348bc 100644 --- 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 +#include -#include +#include TEST_SUITE_BEGIN("util::XXH3_64"); diff --git a/unittest/test_util_conversion.cpp b/unittest/test_util_conversion.cpp index 7eeca9e0c..ff30924b1 100644 --- 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 +#include -#include +#include #include // https://github.com/doctest/doctest/issues/618 #include diff --git a/unittest/test_util_environment.cpp b/unittest/test_util_environment.cpp index 1819ab86b..48fc71b0c 100644 --- 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 +#include -#include +#include TEST_SUITE_BEGIN("util"); diff --git a/unittest/test_util_expected.cpp b/unittest/test_util_expected.cpp index 26eac63bb..db1b86bbc 100644 --- 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 +#include -#include -#include +#include +#include #include // macOS bug: https://github.com/onqtam/doctest/issues/126 #include diff --git a/unittest/test_util_file.cpp b/unittest/test_util_file.cpp index e9a8073e2..1a28997b5 100644 --- 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 -#include -#include -#include -#include -#include -#include - -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/unittest/test_util_path.cpp b/unittest/test_util_path.cpp index 59bb6abdb..c7f0ee4ec 100644 --- 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 -#include -#include +#include +#include +#include -#include +#include #include // https://github.com/doctest/doctest/issues/618 diff --git a/unittest/test_util_string.cpp b/unittest/test_util_string.cpp index 41ac55076..fcb7abfdb 100644 --- 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 +#include -#include +#include #include // https://github.com/doctest/doctest/issues/618 #include diff --git a/unittest/test_util_zstd.cpp b/unittest/test_util_zstd.cpp index 962501757..562b4d344 100644 --- 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 -#include -#include +#include "TestUtil.hpp" -#include +#include +#include + +#include #include -- 2.47.2