Bug fix/remove base directory from include path (#9885)

CMakeLists.txt

@@ -648,9 +648,7 @@ endif ()
 include_directories(${PROJECT_BINARY_DIR})
 include_directories(${PROJECT_BINARY_DIR}/lib)
 
-include_directories(${PROJECT_SOURCE_DIR})
 include_directories(${PROJECT_SOURCE_DIR}/arangod)
-include_directories(${PROJECT_SOURCE_DIR}/arangosh)
 include_directories(${PROJECT_SOURCE_DIR}/lib)
 
 if (CUSTOM_INCLUDES)

arangod/Aql/CountCollectExecutor.cpp

@@ -30,8 +30,7 @@
 #include "Aql/InputAqlItemRow.h"
 #include "Aql/SingleRowFetcher.h"
 #include "Basics/Common.h"
-
-#include <lib/Logger/LogMacros.h>
+#include "Logger/LogMacros.h"
 
 #include <utility>
 

arangod/Aql/DistinctCollectExecutor.cpp

@@ -30,8 +30,7 @@
 #include "Aql/InputAqlItemRow.h"
 #include "Aql/SingleRowFetcher.h"
 #include "Basics/Common.h"
-
-#include <lib/Logger/LogMacros.h>
+#include "Logger/LogMacros.h"
 
 #include <utility>
 

arangod/Aql/EnumerateCollectionExecutor.cpp

@@ -34,11 +34,10 @@
 #include "Aql/Query.h"
 #include "Aql/SingleRowFetcher.h"
 #include "Basics/Common.h"
+#include "Logger/LogMacros.h"
 #include "Transaction/Methods.h"
 #include "Utils/OperationCursor.h"
 
-#include <lib/Logger/LogMacros.h>
-
 #include <utility>
 
 using namespace arangodb;

arangod/Aql/EnumerateListExecutor.cpp

@@ -32,8 +32,7 @@
 #include "Aql/SingleRowFetcher.h"
 #include "Basics/Common.h"
 #include "Basics/Exceptions.h"
-
-#include <lib/Logger/LogMacros.h>
+#include "Logger/LogMacros.h"
 
 using namespace arangodb;
 using namespace arangodb::aql;

arangod/Aql/FilterExecutor.cpp

@@ -30,8 +30,7 @@
 #include "Aql/InputAqlItemRow.h"
 #include "Aql/SingleRowFetcher.h"
 #include "Basics/Common.h"
-
-#include <lib/Logger/LogMacros.h>
+#include "Logger/LogMacros.h"
 
 #include <utility>
 

arangod/Aql/HashedCollectExecutor.cpp

@@ -30,8 +30,7 @@
 #include "Aql/InputAqlItemRow.h"
 #include "Aql/SingleRowFetcher.h"
 #include "Basics/Common.h"
-
-#include <lib/Logger/LogMacros.h>
+#include "Logger/LogMacros.h"
 
 #include <utility>
 

arangod/Aql/IndexExecutor.cpp

@@ -38,12 +38,11 @@
 #include "Basics/ScopeGuard.h"
 #include "Cluster/ServerState.h"
 #include "ExecutorExpressionContext.h"
+#include "Logger/LogMacros.h"
 #include "Transaction/Methods.h"
 #include "Utils/OperationCursor.h"
 #include "V8/v8-globals.h"
 
-#include <lib/Logger/LogMacros.h>
-
 #include <memory>
 #include <utility>
 

arangod/Aql/IndexNode.cpp

@@ -33,12 +33,12 @@
 #include "Basics/AttributeNameParser.h"
 #include "Basics/StringUtils.h"
 #include "Basics/VelocyPackHelper.h"
+#include "Cluster/ServerState.h"
 #include "Indexes/Index.h"
 #include "StorageEngine/EngineSelectorFeature.h"
 #include "StorageEngine/StorageEngine.h"
 #include "Transaction/Methods.h"
 
-#include <arangod/Cluster/ServerState.h>
 #include <velocypack/Iterator.h>
 #include <velocypack/velocypack-aliases.h>
 

arangod/Aql/LimitExecutor.cpp

@@ -30,8 +30,7 @@
 #include "Aql/InputAqlItemRow.h"
 #include "Aql/SingleRowFetcher.h"
 #include "Basics/Common.h"
-
-#include <lib/Logger/LogMacros.h>
+#include "Logger/LogMacros.h"
 
 #include <utility>
 

arangod/Aql/RemoteExecutor.cpp

@@ -31,8 +31,8 @@
 #include "Basics/VelocyPackHelper.h"
 #include "Cluster/ClusterComm.h"
 #include "Cluster/ServerState.h"
+#include "Rest/CommonDefines.h"
 
-#include <lib/Rest/CommonDefines.h>
 #include <velocypack/Iterator.h>
 #include <velocypack/velocypack-aliases.h>
 

arangod/Aql/RemoteExecutor.h

@@ -27,9 +27,8 @@
 #include "Aql/ExecutionBlockImpl.h"
 #include "Basics/Mutex.h"
 #include "Cluster/ClusterComm.h"
-
-#include <lib/Rest/CommonDefines.h>
-#include <lib/SimpleHttpClient/SimpleHttpResult.h>
+#include "Rest/CommonDefines.h"
+#include "SimpleHttpClient/SimpleHttpResult.h"
 
 namespace arangodb {
 namespace aql {

arangod/Aql/SortedCollectExecutor.cpp

@@ -30,8 +30,7 @@
 #include "Aql/InputAqlItemRow.h"
 #include "Aql/SingleRowFetcher.h"
 #include "Basics/Common.h"
-
-#include <lib/Logger/LogMacros.h>
+#include "Logger/LogMacros.h"
 
 #include <utility>
 

arangod/Cluster/Action.h

@@ -27,8 +27,7 @@
 
 #include "ActionBase.h"
 #include "ActionDescription.h"
-
-#include "lib/Basics/Result.h"
+#include "Basics/Result.h"
 
 #include <chrono>
 

arangod/Cluster/RebootTracker.cpp

@@ -22,12 +22,12 @@
 
 #include "RebootTracker.h"
 
+#include "Basics/Exceptions.h"
+#include "Basics/MutexLocker.h"
+#include "Basics/ScopeGuard.h"
+#include "Logger/LogMacros.h"
+#include "Logger/Logger.h"
 #include "Scheduler/SchedulerFeature.h"
-#include "lib/Basics/Exceptions.h"
-#include "lib/Basics/MutexLocker.h"
-#include "lib/Basics/ScopeGuard.h"
-#include "lib/Logger/LogMacros.h"
-#include "lib/Logger/Logger.h"
 
 #include <algorithm>
 

arangod/Cluster/RebootTracker.h

@@ -24,11 +24,10 @@
 #define ARANGOD_CLUSTER_REBOOTTRACKER_H
 
 #include "Cluster/ClusterTypes.h"
+#include "Basics/Mutex.h"
 #include "Scheduler/Scheduler.h"
 #include "Scheduler/SchedulerFeature.h"
 
-#include "lib/Basics/Mutex.h"
-
 #include <map>
 #include <type_traits>
 #include <unordered_map>

arangod/GeneralServer/VstCommTask.h

@@ -26,10 +26,9 @@
 #define ARANGOD_GENERAL_SERVER_VST_COMM_TASK_H 1
 
 #include "Basics/Common.h"
-
 #include "GeneralServer/GeneralCommTask.h"
-#include "lib/Rest/VstRequest.h"
-#include "lib/Rest/VstResponse.h"
+#include "Rest/VstRequest.h"
+#include "Rest/VstResponse.h"
 
 #include <boost/lockfree/queue.hpp>
 #include <fuerte/detail/vst.h>

arangod/Graph/GraphOperations.cpp

@@ -22,7 +22,6 @@
 
 #include "GraphOperations.h"
 
-#include <arangod/Transaction/V8Context.h>
 #include <velocypack/Buffer.h>
 #include <velocypack/Collection.h>
 #include <velocypack/Iterator.h>
@@ -44,6 +43,7 @@
 #include "Transaction/Methods.h"
 #include "Transaction/SmartContext.h"
 #include "Transaction/StandaloneContext.h"
+#include "Transaction/V8Context.h"
 #include "Utils/CollectionNameResolver.h"
 #include "Utils/ExecContext.h"
 #include "Utils/OperationOptions.h"

arangod/Replication/SyncerId.cpp

@@ -22,9 +22,9 @@
 
 #include "SyncerId.h"
 
-#include <lib/Basics/Exceptions.h>
-#include <lib/Basics/StringUtils.h>
-#include <lib/Rest/GeneralRequest.h>
+#include "Basics/Exceptions.h"
+#include "Basics/StringUtils.h"
+#include "Rest/GeneralRequest.h"
 
 #include <algorithm>
 #include <cctype>

arangod/RestHandler/RestRepairHandler.h

@@ -25,9 +25,9 @@
 
 #include "Agency/AgencyComm.h"
 #include "Cluster/ClusterRepairs.h"
+#include "Cluster/ResultT.h"
 #include "GeneralServer/AsyncJobManager.h"
 #include "RestHandler/RestBaseHandler.h"
-#include "arangod/Cluster/ResultT.h"
 
 namespace arangodb {
 namespace rest {

arangosh/CMakeLists.txt

@@ -27,6 +27,7 @@ add_executable(${BIN_ARANGOBENCH}
   Shell/ClientFeature.cpp
   Shell/ConsoleFeature.cpp
 )
+target_include_directories(${BIN_ARANGOBENCH} PRIVATE ${PROJECT_SOURCE_DIR}/arangosh)
 
 target_link_libraries(${BIN_ARANGOBENCH}
   ${LIB_ARANGO}
@@ -85,6 +86,7 @@ add_executable(${BIN_ARANGOBACKUP}
   Utils/ClientManager.cpp
   ${ADDITIONAL_BIN_ARANGOBACKUP_SOURCES}
 )
+target_include_directories(${BIN_ARANGOBACKUP} PRIVATE ${PROJECT_SOURCE_DIR}/arangosh)
 
 target_link_libraries(${BIN_ARANGOBACKUP}
   ${LIB_ARANGO}
@@ -144,6 +146,7 @@ add_executable(${BIN_ARANGODUMP}
   Utils/ManagedDirectory.cpp
   ${ADDITIONAL_BIN_ARANGODUMP_SOURCES}
 )
+target_include_directories(${BIN_ARANGODUMP} PRIVATE ${PROJECT_SOURCE_DIR}/arangosh)
 
 target_link_libraries(${BIN_ARANGODUMP}
   ${LIB_ARANGO}
@@ -202,6 +205,7 @@ add_executable(${BIN_ARANGOEXPORT}
   Utils/ManagedDirectory.cpp
   V8Client/ArangoClientHelper.cpp
 )
+target_include_directories(${BIN_ARANGOEXPORT} PRIVATE ${PROJECT_SOURCE_DIR}/arangosh)
 
 target_link_libraries(${BIN_ARANGOEXPORT}
   ${LIB_ARANGO}
@@ -263,6 +267,7 @@ add_executable(arangoimport
   Utils/ManagedDirectory.cpp
   V8Client/ArangoClientHelper.cpp
 )
+target_include_directories(${BIN_ARANGOIMPORT} PRIVATE ${PROJECT_SOURCE_DIR}/arangosh)
 
 target_link_libraries(${BIN_ARANGOIMPORT}
   ${LIB_ARANGO}
@@ -331,6 +336,7 @@ add_executable(${BIN_ARANGORESTORE}
   Utils/ManagedDirectory.cpp
   ${ADDITIONAL_BIN_ARANGORESTORE_SOURCES}
 )
+target_include_directories(${BIN_ARANGORESTORE} PRIVATE ${PROJECT_SOURCE_DIR}/arangosh)
 
 target_link_libraries(${BIN_ARANGORESTORE}
   ${LIB_ARANGO}
@@ -394,6 +400,7 @@ add_executable(${BIN_ARANGOSH}
   Utils/ManagedDirectory.cpp
   V8Client/ArangoClientHelper.cpp
 )
+target_include_directories(${BIN_ARANGOSH} PRIVATE ${PROJECT_SOURCE_DIR}/arangosh)
 
 target_link_libraries(${BIN_ARANGOSH}
   ${LIB_ARANGO_V8}
@@ -454,6 +461,7 @@ add_executable(${BIN_ARANGOVPACK}
   VPack/VPackFeature.cpp
   VPack/arangovpack.cpp
 )
+target_include_directories(${BIN_ARANGOVPACK} PRIVATE ${PROJECT_SOURCE_DIR}/arangosh)
 
 target_link_libraries(${BIN_ARANGOVPACK}
   ${LIB_ARANGO}

tests/Agency/ActiveFailoverTest.cpp

@@ -28,16 +28,17 @@
 
 #include "fakeit.hpp"
 
+#include "Agency/ActiveFailoverJob.h"
+#include "Agency/AgentInterface.h"
+#include "Agency/Node.h"
+#include "Basics/StringUtils.h"
+#include "Random/RandomGenerator.h"
+
 #include <velocypack/Collection.h>
 #include <velocypack/Parser.h>
 #include <velocypack/Slice.h>
 #include <velocypack/velocypack-aliases.h>
 #include <iostream>
-#include "Agency/ActiveFailoverJob.h"
-#include "Agency/AgentInterface.h"
-#include "Agency/Node.h"
-#include "lib/Basics/StringUtils.h"
-#include "lib/Random/RandomGenerator.h"
 
 using namespace arangodb;
 using namespace arangodb::basics;

tests/Agency/AddFollowerTest.cpp

@@ -29,15 +29,16 @@
 
 #include "fakeit.hpp"
 
+#include "Agency/AddFollower.h"
+#include "Agency/AgentInterface.h"
+#include "Agency/Node.h"
+#include "Basics/StringUtils.h"
+#include "Random/RandomGenerator.h"
+
 #include <velocypack/Parser.h>
 #include <velocypack/Slice.h>
 #include <velocypack/velocypack-aliases.h>
 #include <iostream>
-#include "Agency/AddFollower.h"
-#include "Agency/AgentInterface.h"
-#include "Agency/Node.h"
-#include "lib/Basics/StringUtils.h"
-#include "lib/Random/RandomGenerator.h"
 
 using namespace arangodb;
 using namespace arangodb::basics;

tests/Agency/FailedFollowerTest.cpp

@@ -33,8 +33,8 @@
 #include "Agency/FailedFollower.h"
 #include "Agency/MoveShard.h"
 #include "Agency/Node.h"
-#include "lib/Basics/StringUtils.h"
-#include "lib/Random/RandomGenerator.h"
+#include "Basics/StringUtils.h"
+#include "Random/RandomGenerator.h"
 
 #include <velocypack/Parser.h>
 #include <velocypack/Slice.h>

tests/Agency/FailedLeaderTest.cpp

@@ -33,8 +33,8 @@
 #include "Agency/FailedLeader.h"
 #include "Agency/MoveShard.h"
 #include "Agency/Node.h"
-#include "lib/Basics/StringUtils.h"
-#include "lib/Random/RandomGenerator.h"
+#include "Basics/StringUtils.h"
+#include "Random/RandomGenerator.h"
 
 #include <velocypack/Parser.h>
 #include <velocypack/Slice.h>

tests/Agency/FailedServerTest.cpp

@@ -34,7 +34,7 @@
 #include "Agency/FailedServer.h"
 #include "Agency/MoveShard.h"
 #include "Agency/Node.h"
-#include "lib/Basics/StringUtils.h"
+#include "Basics/StringUtils.h"
 
 #include <velocypack/Parser.h>
 #include <velocypack/Slice.h>

tests/Agency/RemoveFollowerTest.cpp

@@ -29,17 +29,18 @@
 
 #include "fakeit.hpp"
 
-#include <velocypack/Parser.h>
-#include <velocypack/Slice.h>
-#include <velocypack/velocypack-aliases.h>
-#include <iostream>
 #include "Agency/AgentInterface.h"
 #include "Agency/FailedLeader.h"
 #include "Agency/MoveShard.h"
 #include "Agency/Node.h"
 #include "Agency/RemoveFollower.h"
-#include "lib/Basics/StringUtils.h"
-#include "lib/Random/RandomGenerator.h"
+#include "Basics/StringUtils.h"
+#include "Random/RandomGenerator.h"
+
+#include <velocypack/Parser.h>
+#include <velocypack/Slice.h>
+#include <velocypack/velocypack-aliases.h>
+#include <iostream>
 
 using namespace arangodb;
 using namespace arangodb::basics;

tests/Aql/DependencyProxyMock.cpp

@@ -21,8 +21,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "DependencyProxyMock.h"
-
-#include <lib/Basics/Common.h>
+#include "Basics/Common.h"
 
 #include "gtest/gtest.h"
 

tests/Aql/DistinctCollectExecutorTest.cpp

@@ -38,7 +38,7 @@
 #include "Aql/SingleRowFetcher.h"
 #include "Transaction/Context.h"
 #include "Transaction/Methods.h"
-#include "tests/Mocks/Servers.h"
+#include "Mocks/Servers.h"
 
 #include <velocypack/Builder.h>
 #include <velocypack/velocypack-aliases.h>

tests/Aql/HashedCollectExecutorTest.cpp

@@ -38,7 +38,7 @@
 #include "Aql/SingleRowFetcher.h"
 #include "Transaction/Context.h"
 #include "Transaction/Methods.h"
-#include "tests/Mocks/Servers.h"
+#include "Mocks/Servers.h"
 
 #include <velocypack/Builder.h>
 #include <velocypack/velocypack-aliases.h>

tests/Aql/IdExecutorTest.cpp

@@ -31,7 +31,7 @@
 #include "Aql/InputAqlItemRow.h"
 #include "Aql/ResourceUsage.h"
 
-#include "tests/Aql/RowFetcherHelper.h"
+#include "Aql/RowFetcherHelper.h"
 
 #include <velocypack/Builder.h>
 #include <velocypack/velocypack-aliases.h>

tests/Aql/ShortestPathExecutorTest.cpp

@@ -38,11 +38,12 @@
 #include "Graph/ShortestPathResult.h"
 #include "Graph/TraverserCache.h"
 
+#include "Mocks/Servers.h"
+
 #include <velocypack/Builder.h>
 #include <velocypack/Slice.h>
 #include <velocypack/StringRef.h>
 #include <velocypack/velocypack-aliases.h>
-#include "tests/Mocks/Servers.h"
 
 using namespace arangodb;
 using namespace arangodb::aql;

tests/Aql/SortedCollectExecutorTest.cpp

@@ -38,7 +38,8 @@
 #include "Aql/SortedCollectExecutor.h"
 #include "Transaction/Context.h"
 #include "Transaction/Methods.h"
-#include "tests/Mocks/Servers.h"
+
+#include "Mocks/Servers.h"
 
 #include <velocypack/Builder.h>
 #include <velocypack/velocypack-aliases.h>

tests/Aql/TestEmptyExecutorHelper.cpp

@@ -23,7 +23,6 @@
 /// @author Jan Christoph Uhde
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <lib/Logger/LogMacros.h>
 #include "TestEmptyExecutorHelper.h"
 
 #include "Basics/Common.h"
@@ -32,6 +31,7 @@
 #include "Aql/AqlValue.h"
 #include "Aql/ExecutorInfos.h"
 #include "Aql/SingleRowFetcher.h"
+#include "Logger/LogMacros.h"
 
 #include <utility>
 

tests/Aql/TestExecutorHelper.cpp

@@ -23,7 +23,6 @@
 /// @author Jan Christoph Uhde
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <lib/Logger/LogMacros.h>
 #include "TestExecutorHelper.h"
 
 #include "Basics/Common.h"
@@ -32,6 +31,7 @@
 #include "Aql/AqlValue.h"
 #include "Aql/ExecutorInfos.h"
 #include "Aql/SingleRowFetcher.h"
+#include "Logger/LogMacros.h"
 
 #include <utility>
 

tests/Aql/TraversalExecutorTest.cpp

@@ -34,7 +34,8 @@
 #include "Basics/VelocyPackHelper.h"
 #include "Graph/Traverser.h"
 #include "Graph/TraverserOptions.h"
-#include "tests/Mocks/Servers.h"
+
+#include "Mocks/Servers.h"
 
 #include <velocypack/Buffer.h>
 #include <velocypack/Builder.h>

tests/Aql/WaitingExecutionBlockMock.h

@@ -27,7 +27,6 @@
 #include "Aql/ExecutionState.h"
 #include "Aql/ResourceUsage.h"
 
-#include <arangod/Aql/ExecutionState.h>
 #include <velocypack/Builder.h>
 
 namespace arangodb {

tests/Cluster/ClusterRepairsTest.cpp

@@ -22,15 +22,14 @@
 
 #include "gtest/gtest.h"
 
-#include "Basics/ScopeGuard.h"
-#include "Cluster/ClusterRepairs.h"
-#include "Cluster/ServerState.h"
-
 #include "Agency/AddFollower.h"
 #include "Agency/FailedLeader.h"
 #include "Agency/MoveShard.h"
-#include "arangod/Cluster/ResultT.h"
-#include "lib/Random/RandomGenerator.h"
+#include "Basics/ScopeGuard.h"
+#include "Cluster/ClusterRepairs.h"
+#include "Cluster/ResultT.h"
+#include "Cluster/ServerState.h"
+#include "Random/RandomGenerator.h"
 
 #include <boost/core/demangle.hpp>
 #include <boost/date_time.hpp>

tests/Cluster/RebootTrackerTest.cpp

@@ -23,13 +23,12 @@
 #include "gtest/gtest.h"
 
 #include "Cluster/RebootTracker.h"
+#include "Logger/Logger.h"
 #include "Scheduler/SchedulerFeature.h"
 #include "Scheduler/SupervisedScheduler.h"
 
 #include "Mocks/Servers.h"
 
-#include "lib/Logger/Logger.h"
-
 #include <memory>
 #include <type_traits>
 

tests/Geo/GeoConstructorTest.cpp

@@ -36,8 +36,6 @@
 #include "Basics/SmallVector.h"
 #include "Transaction/Methods.h"
 
-#include "lib/Random/RandomGenerator.h"
-
 #include <velocypack/Builder.h>
 #include <velocypack/Iterator.h>
 #include <velocypack/Slice.h>

tests/Geo/GeoFunctionsTest.cpp

@@ -36,8 +36,6 @@
 #include "Basics/SmallVector.h"
 #include "Transaction/Methods.h"
 
-#include "lib/Random/RandomGenerator.h"
-
 #include <velocypack/Builder.h>
 #include <velocypack/Iterator.h>
 #include <velocypack/Slice.h>

tests/IResearch/common.cpp

@@ -23,7 +23,6 @@
 
 #include "utils/utf8_path.hpp"
 
-//#include "catch.hpp"
 #include "Agency/AgencyComm.h"
 #include "Aql/Ast.h"
 #include "Aql/ExecutionPlan.h"
@@ -50,7 +49,8 @@
 #include "common.h"
 #include "gtest/gtest.h"
 #include "search/scorers.hpp"
-#include "tests/Basics/icu-helper.h"
+
+#include "Basics/icu-helper.h"
 
 #include "search/boolean_filter.hpp"
 

tests/Replication/ReplicationClientsProgressTrackerTest.cpp

@@ -25,10 +25,10 @@
 
 #include "gtest/gtest.h"
 
+#include "Logger/LogMacros.h"
 #include "Replication/ReplicationClients.h"
 #include "Replication/SyncerId.h"
 
-#include <lib/Logger/LogMacros.h>
 #include <velocypack/Builder.h>
 #include <velocypack/velocypack-aliases.h>
 

tests/Sharding/ShardDistributionReporterTest.cpp

@@ -38,7 +38,8 @@
 #include "StorageEngine/EngineSelectorFeature.h"
 #include "VocBase/LogicalCollection.h"
 #include "VocBase/ticks.h"
-#include "tests/Mocks/StorageEngineMock.h"
+
+#include "Mocks/StorageEngineMock.h"
 
 #include <velocypack/Builder.h>
 #include <velocypack/Slice.h>

tests/main.cpp

@@ -9,7 +9,8 @@
 #include "Random/RandomGenerator.h"
 #include "RestServer/ServerIdFeature.h"
 #include "gtest/gtest.h"
-#include "tests/Basics/icu-helper.h"
+
+#include "Basics/icu-helper.h"
 
 #include <chrono>
 #include <thread>