refactor: private includes refer to src

cppalliance · Jul 11, 2023 · bfba8fc · bfba8fc
1 parent ad3a911
commit bfba8fc
Show file tree

Hide file tree

Showing 43 changed files with 90 additions and 93 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -128,7 +128,7 @@ target_include_directories(mrdox-core
     "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/>"
     "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
     PRIVATE
-    "${PROJECT_SOURCE_DIR}/src/lib"
+    "${PROJECT_SOURCE_DIR}/src"
     "${PROJECT_SOURCE_DIR}/include")
 target_compile_definitions(
     mrdox-core
@@ -212,8 +212,7 @@ target_include_directories(mrdox
     "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
     PRIVATE
     "${PROJECT_SOURCE_DIR}/include"
-    "${PROJECT_SOURCE_DIR}/src/lib"
-    "${PROJECT_SOURCE_DIR}/src/tool"
+    "${PROJECT_SOURCE_DIR}/src"
 )
 
 target_compile_definitions(mrdox PRIVATE -DMRDOX_TOOL)
@@ -248,9 +247,7 @@ if (MRDOX_BUILD_TESTS)
     target_include_directories(mrdox-test
             PRIVATE
             "${PROJECT_SOURCE_DIR}/include"
-            "${PROJECT_SOURCE_DIR}/src/lib"
-            "${PROJECT_SOURCE_DIR}/src/tool"
-            "${PROJECT_SOURCE_DIR}/src/test/test_suite"
+            "${PROJECT_SOURCE_DIR}/src"
             )
     target_link_libraries(mrdox-test PUBLIC mrdox-core)
     if (MRDOX_CLANG)

diff --git a/src/lib/-XML/XMLGenerator.cpp b/src/lib/-XML/XMLGenerator.cpp
@@ -11,8 +11,8 @@
 
 #include "XMLGenerator.hpp"
 #include "XMLWriter.hpp"
-#include "Support/Radix.hpp"
-#include "Support/RawOstream.hpp"
+#include <lib/Support/Radix.hpp>
+#include <lib/Support/RawOstream.hpp>
 #include <mrdox/Support/Error.hpp>
 #include <mrdox/Metadata.hpp>
 

diff --git a/src/lib/-XML/XMLTags.cpp b/src/lib/-XML/XMLTags.cpp
@@ -10,7 +10,7 @@
 //
 
 #include "XMLTags.hpp"
-#include "Support/Radix.hpp"
+#include <lib/Support/Radix.hpp>
 #include <mrdox/Platform.hpp>
 
 namespace clang {

diff --git a/src/lib/-XML/XMLWriter.cpp b/src/lib/-XML/XMLWriter.cpp
@@ -12,10 +12,10 @@
 
 #include "CXXTags.hpp"
 #include "XMLWriter.hpp"
-#include "Lib/ConfigImpl.hpp"
-#include "Support/Yaml.hpp"
-#include "Support/Radix.hpp"
-#include "Support/SafeNames.hpp"
+#include <lib/Lib/ConfigImpl.hpp>
+#include <lib/Support/Yaml.hpp>
+#include <lib/Support/Radix.hpp>
+#include <lib/Support/SafeNames.hpp>
 #include <mrdox/Platform.hpp>
 #include <llvm/Support/YAMLParser.h>
 #include <llvm/Support/YAMLTraits.h>

diff --git a/src/lib/-XML/XMLWriter.hpp b/src/lib/-XML/XMLWriter.hpp
@@ -13,7 +13,7 @@
 #define MRDOX_LIB_XML_XMLWRITER_HPP
 
 #include "XMLTags.hpp"
-#include "Support/YamlFwd.hpp"
+#include <lib/Support/YamlFwd.hpp>
 #include <mrdox/Corpus.hpp>
 #include <mrdox/Metadata.hpp>
 #include <mrdox/Support/Error.hpp>

diff --git a/src/lib/-adoc/AdocGenerator.cpp b/src/lib/-adoc/AdocGenerator.cpp
@@ -14,7 +14,7 @@
 #include "Builder.hpp"
 #include "MultiPageVisitor.hpp"
 #include "SinglePageVisitor.hpp"
-#include "Support/SafeNames.hpp"
+#include <lib/Support/SafeNames.hpp>
 #include <mrdox/Metadata/DomMetadata.hpp>
 #include <mrdox/Support/Error.hpp>
 #include <mrdox/Support/Path.hpp>

diff --git a/src/lib/-adoc/Builder.cpp b/src/lib/-adoc/Builder.cpp
@@ -9,7 +9,7 @@
 //
 
 #include "Builder.hpp"
-#include "Support/Radix.hpp"
+#include <lib/Support/Radix.hpp>
 #include <mrdox/Metadata/DomMetadata.hpp>
 #include <mrdox/Support/Path.hpp>
 #include <llvm/Support/FileSystem.h>

diff --git a/src/lib/-adoc/Builder.hpp b/src/lib/-adoc/Builder.hpp
@@ -12,7 +12,7 @@
 #define MRDOX_LIB_ADOC_BUILDER_HPP
 
 #include "Options.hpp"
-#include "Support/Radix.hpp"
+#include <lib/Support/Radix.hpp>
 #include <mrdox/Metadata/DomMetadata.hpp>
 #include <mrdox/Support/Error.hpp>
 #include <mrdox/Support/JavaScript.hpp>

diff --git a/src/lib/-adoc/Options.cpp b/src/lib/-adoc/Options.cpp
@@ -10,8 +10,8 @@
 //
 
 #include "Options.hpp"
-#include "Support/Yaml.hpp"
-#include "Lib/ConfigImpl.hpp" // VFALCO This is a problem
+#include <lib/Support/Yaml.hpp>
+#include <lib/Lib/ConfigImpl.hpp> // VFALCO This is a problem
 #include <mrdox/Corpus.hpp>
 #include <mrdox/Support/Path.hpp>
 #include <llvm/Support/YAMLParser.h>

diff --git a/src/lib/-bitcode/BitcodeGenerator.cpp b/src/lib/-bitcode/BitcodeGenerator.cpp
@@ -10,9 +10,9 @@
 //
 
 #include "BitcodeGenerator.hpp"
-#include "Support/Error.hpp"
-#include "Support/SafeNames.hpp"
-#include "AST/Bitcode.hpp"
+#include <lib/Support/Error.hpp>
+#include <lib/Support/SafeNames.hpp>
+#include <lib/AST/Bitcode.hpp>
 #include <mrdox/Support/ThreadPool.hpp>
 #include <mrdox/Metadata.hpp>
 

diff --git a/src/lib/AST/ASTVisitor.cpp b/src/lib/AST/ASTVisitor.cpp
@@ -14,9 +14,9 @@
 #include "ASTVisitorHelpers.hpp"
 #include "Bitcode.hpp"
 #include "ParseJavadoc.hpp"
-#include "Support/Path.hpp"
-#include "Support/Debug.hpp"
-#include "Lib/Diagnostics.hpp"
+#include <lib/Support/Path.hpp>
+#include <lib/Support/Debug.hpp>
+#include <lib/Lib/Diagnostics.hpp>
 #include <mrdox/Metadata.hpp>
 #include <clang/AST/Attr.h>
 #include <clang/AST/Decl.h>

diff --git a/src/lib/AST/ASTVisitor.hpp b/src/lib/AST/ASTVisitor.hpp
@@ -13,8 +13,8 @@
 #ifndef MRDOX_LIB_AST_ASTVISITOR_HPP
 #define MRDOX_LIB_AST_ASTVISITOR_HPP
 
-#include "Lib/ConfigImpl.hpp"
-#include "Lib/ExecutionContext.hpp"
+#include <lib/Lib/ConfigImpl.hpp>
+#include <lib/Lib/ExecutionContext.hpp>
 #include <mrdox/Platform.hpp>
 #include <clang/Tooling/Execution.h>
 #include <clang/Tooling/Tooling.h>

diff --git a/src/lib/AST/AnyBlock.hpp b/src/lib/AST/AnyBlock.hpp
@@ -15,8 +15,8 @@
 
 #include "BitcodeReader.hpp"
 #include "DecodeRecord.hpp"
-#include "Support/Debug.hpp"
-#include "Support/Error.hpp"
+#include <lib/Support/Debug.hpp>
+#include <lib/Support/Error.hpp>
 
 namespace clang {
 namespace mrdox {

diff --git a/src/lib/AST/BitcodeReader.cpp b/src/lib/AST/BitcodeReader.cpp
@@ -12,8 +12,8 @@
 #include "BitcodeReader.hpp"
 #include "AnyBlock.hpp"
 #include "DecodeRecord.hpp"
-#include "Support/Debug.hpp"
-#include "Support/Error.hpp"
+#include <lib/Support/Debug.hpp>
+#include <lib/Support/Error.hpp>
 #include <mrdox/Support/Error.hpp>
 
 namespace clang {

diff --git a/src/lib/AST/BitcodeWriter.cpp b/src/lib/AST/BitcodeWriter.cpp
@@ -13,7 +13,7 @@
 #include "BitcodeWriter.hpp"
 #include "Bitcode.hpp"
 #include "ParseJavadoc.hpp"
-#include "Support/Debug.hpp"
+#include <lib/Support/Debug.hpp>
 #include <mrdox/Metadata.hpp>
 #include <llvm/ADT/IndexedMap.h>
 #include <initializer_list>

diff --git a/src/lib/AST/ParseJavadoc.hpp b/src/lib/AST/ParseJavadoc.hpp
@@ -12,7 +12,7 @@
 #ifndef MRDOX_LIB_AST_PARSEJAVADOC_HPP
 #define MRDOX_LIB_AST_PARSEJAVADOC_HPP
 
-#include "Lib/Diagnostics.hpp"
+#include <lib/Lib/Diagnostics.hpp>
 #include <mrdox/Platform.hpp>
 #include <mrdox/Config.hpp>
 #include <mrdox/Metadata/Javadoc.hpp>

diff --git a/src/lib/Lib/AbsoluteCompilationDatabase.cpp b/src/lib/Lib/AbsoluteCompilationDatabase.cpp
@@ -9,10 +9,10 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#include "Support/Debug.hpp"
-#include "Support/Path.hpp"
-#include "Lib/ConfigImpl.hpp"
-#include "Lib/AbsoluteCompilationDatabase.hpp"
+#include <lib/Support/Debug.hpp>
+#include <lib/Support/Path.hpp>
+#include <lib/Lib/ConfigImpl.hpp>
+#include <lib/Lib/AbsoluteCompilationDatabase.hpp>
 #include <fmt/format.h>
 #include <clang/Basic/LangStandard.h>
 #include <clang/Driver/Driver.h>

diff --git a/src/lib/Lib/Config.cpp b/src/lib/Lib/Config.cpp
@@ -9,8 +9,8 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#include "Lib/ConfigImpl.hpp"
-#include "Support/Path.hpp"
+#include <lib/Lib/ConfigImpl.hpp>
+#include <lib/Support/Path.hpp>
 #include <mrdox/Support/Error.hpp>
 #include <llvm/Config/llvm-config.h>
 #include <llvm/Support/FileSystem.h>

diff --git a/src/lib/Lib/ConfigImpl.cpp b/src/lib/Lib/ConfigImpl.cpp
@@ -9,11 +9,11 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#include "Lib/ConfigImpl.hpp"
-#include "Support/Debug.hpp"
-#include "Support/Error.hpp"
-#include "Support/Path.hpp"
-#include "Support/Yaml.hpp"
+#include <lib/Lib/ConfigImpl.hpp>
+#include <lib/Support/Debug.hpp>
+#include <lib/Support/Error.hpp>
+#include <lib/Support/Path.hpp>
+#include <lib/Support/Yaml.hpp>
 #include <mrdox/Support/Path.hpp>
 #include <clang/Tooling/AllTUsExecution.h>
 #include <llvm/Support/FileSystem.h>

diff --git a/src/lib/Lib/ConfigImpl.hpp b/src/lib/Lib/ConfigImpl.hpp
@@ -12,7 +12,7 @@
 #ifndef MRDOX_LIB_CONFIGIMPL_HPP
 #define MRDOX_LIB_CONFIGIMPL_HPP
 
-#include "Support/YamlFwd.hpp"
+#include <lib/Support/YamlFwd.hpp>
 #include <mrdox/Config.hpp>
 #include <mrdox/Support/Error.hpp>
 #include <mrdox/Support/ThreadPool.hpp>

diff --git a/src/lib/Lib/Corpus.cpp b/src/lib/Lib/Corpus.cpp
@@ -9,7 +9,7 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#include "Lib/ConfigImpl.hpp"
+#include <lib/Lib/ConfigImpl.hpp>
 #include <mrdox/Corpus.hpp>
 #include <mrdox/Metadata.hpp>
 #include <mrdox/Support/Error.hpp>

diff --git a/src/lib/Lib/CorpusImpl.cpp b/src/lib/Lib/CorpusImpl.cpp
@@ -9,11 +9,11 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#include "AST/Bitcode.hpp"
-#include "AST/ASTVisitor.hpp"
+#include <lib/AST/Bitcode.hpp>
+#include <lib/AST/ASTVisitor.hpp>
 #include "CorpusImpl.hpp"
-#include "Metadata/Reduce.hpp"
-#include "Support/Error.hpp"
+#include <lib/Metadata/Reduce.hpp>
+#include <lib/Support/Error.hpp>
 #include <mrdox/Metadata.hpp>
 #include <mrdox/Support/Error.hpp>
 #include <llvm/ADT/STLExtras.h>

diff --git a/src/lib/Lib/CorpusImpl.hpp b/src/lib/Lib/CorpusImpl.hpp
@@ -11,9 +11,9 @@
 #ifndef MRDOX_LIB_CORPUSIMPL_HPP
 #define MRDOX_LIB_CORPUSIMPL_HPP
 
-#include "Lib/ConfigImpl.hpp"
-#include "Lib/ToolExecutor.hpp"
-#include "Support/Debug.hpp"
+#include <lib/Lib/ConfigImpl.hpp>
+#include <lib/Lib/ToolExecutor.hpp>
+#include <lib/Support/Debug.hpp>
 #include <mrdox/Corpus.hpp>
 #include <mrdox/Metadata.hpp>
 #include <mrdox/Platform.hpp>

diff --git a/src/lib/Metadata/DomMetadata.cpp b/src/lib/Metadata/DomMetadata.cpp
@@ -9,7 +9,7 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#include "Support/Radix.hpp"
+#include <lib/Support/Radix.hpp>
 #include <mrdox/Metadata.hpp>
 #include <mrdox/Metadata/DomMetadata.hpp>
 #include <llvm/ADT/StringMap.h>

diff --git a/src/lib/Metadata/Info.cpp b/src/lib/Metadata/Info.cpp
@@ -9,7 +9,7 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#include "Support/Radix.hpp"
+#include <lib/Support/Radix.hpp>
 #include <mrdox/Metadata/Info.hpp>
 #include <mrdox/Metadata/Record.hpp>
 #include <clang/AST/Type.h>

diff --git a/src/lib/Metadata/Interface.cpp b/src/lib/Metadata/Interface.cpp
@@ -9,7 +9,7 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#include "Support/Debug.hpp"
+#include <lib/Support/Debug.hpp>
 #include <mrdox/Metadata/Interface.hpp>
 #include <mrdox/Support/TypeTraits.hpp>
 #include <mrdox/Config.hpp>

diff --git a/src/lib/Metadata/Javadoc.cpp b/src/lib/Metadata/Javadoc.cpp
@@ -10,7 +10,7 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#include "Support/Debug.hpp"
+#include <lib/Support/Debug.hpp>
 #include <mrdox/Metadata/Javadoc.hpp>
 #include <llvm/Support/Error.h>
 #include <llvm/Support/Path.h>

diff --git a/src/lib/Metadata/Namespace.cpp b/src/lib/Metadata/Namespace.cpp
@@ -10,7 +10,7 @@
 //
 
 #include "Reduce.hpp"
-#include "Support/Debug.hpp"
+#include <lib/Support/Debug.hpp>
 #include <mrdox/Metadata/Namespace.hpp>
 #include <mrdox/Config.hpp>
 #include <llvm/Support/Error.h>

diff --git a/src/lib/Support/Debug.cpp b/src/lib/Support/Debug.cpp
@@ -9,8 +9,8 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#include "Support/Debug.hpp"
-#include "Support/Radix.hpp"
+#include <lib/Support/Debug.hpp>
+#include <lib/Support/Radix.hpp>
 #include <mrdox/Metadata/Info.hpp>
 #include <mrdox/Metadata/Record.hpp>
 #include <mrdox/Metadata/Symbols.hpp>

diff --git a/src/lib/Support/Error.cpp b/src/lib/Support/Error.cpp
@@ -8,7 +8,7 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#include "Support/Error.hpp"
+#include <lib/Support/Error.hpp>
 #include <mrdox/Support/Path.hpp>
 #include <llvm/Support/Mutex.h>
 #include <llvm/Support/raw_ostream.h>

diff --git a/src/lib/Support/Generator.cpp b/src/lib/Support/Generator.cpp
@@ -9,7 +9,7 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#include "AST/ParseJavadoc.hpp"
+#include <lib/AST/ParseJavadoc.hpp>
 #include <mrdox/Support/Error.hpp>
 #include <mrdox/Generator.hpp>
 #include <llvm/ADT/SmallString.h>

diff --git a/src/lib/Support/Lua.cpp b/src/lib/Support/Lua.cpp
@@ -11,11 +11,11 @@
 #include <mrdox/Support/Lua.hpp>
 #include <mrdox/Support/Error.hpp>
 #include <mrdox/Support/Path.hpp>
-#include "../../lua/src/lua.hpp"
+#include "../../../lua/src/lua.hpp"
 #include <fmt/format.h>
 
 #include <llvm/Support/raw_ostream.h>
-#include "Support/LuaHandlebars.hpp"
+#include <lib/Support/LuaHandlebars.hpp>
 
 namespace clang {
 namespace mrdox {

diff --git a/src/lib/Support/Radix.cpp b/src/lib/Support/Radix.cpp
@@ -9,8 +9,8 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#include "Support/Radix.hpp"
-#include "Support/Debug.hpp"
+#include <lib/Support/Radix.hpp>
+#include <lib/Support/Debug.hpp>
 #include <mrdox/Platform.hpp>
 #include <llvm/ADT/StringExtras.h>
 #include <algorithm>

diff --git a/src/lib/Support/SafeNames.cpp b/src/lib/Support/SafeNames.cpp
@@ -8,9 +8,9 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#include "Support/Radix.hpp"
-#include "Support/SafeNames.hpp"
-#include "Support/Validate.hpp"
+#include <lib/Support/Radix.hpp>
+#include <lib/Support/SafeNames.hpp>
+#include <lib/Support/Validate.hpp>
 #include <mrdox/Corpus.hpp>
 #include <mrdox/Metadata.hpp>
 #include <mrdox/Platform.hpp>

diff --git a/src/lib/Support/ThreadPool.cpp b/src/lib/Support/ThreadPool.cpp
@@ -8,7 +8,7 @@
 // Official repository: https://github.com/cppalliance/mrdox
 //
 
-#include "Support/Debug.hpp"
+#include <lib/Support/Debug.hpp>
 #include <mrdox/Support/Error.hpp>
 #include <mrdox/Support/ThreadPool.hpp>
 #include <llvm/Support/Signals.h>