Reworked all #include directives

All the directives are now fixed instead of relative. We also moved the headers to a different directory. Signed-off-by: Vinícius Ferrão <[email protected]>
viniciusferrao · Jul 10, 2023 · 7dfe912 · 7dfe912
1 parent eb0025c
commit 7dfe912
Show file tree

Hide file tree

Showing 90 changed files with 158 additions and 186 deletions.
diff --git a/src/NFS.h → include/cloysterhpc/NFS.h b/src/NFS.h → include/cloysterhpc/NFS.h
@@ -6,8 +6,8 @@
 #ifndef CLOYSTERHPC_NFS_H_
 #define CLOYSTERHPC_NFS_H_
 
-#include "services/IService.h"
 #include <boost/asio.hpp>
+#include <cloysterhpc/services/IService.h>
 #include <string>
 
 class NFS : public IService {

diff --git a/include/cloysterhpc/cloyster.h b/include/cloysterhpc/cloyster.h
@@ -6,7 +6,7 @@
 #ifndef CLOYSTERHPC_CLOYSTER_H_
 #define CLOYSTERHPC_CLOYSTER_H_
 
-#include "../src/services/log.h"
+#include <cloysterhpc/services/log.h>
 #include <fmt/format.h>
 #include <magic_enum.hpp>
 #include <string>

diff --git a/src/cluster.h → include/cloysterhpc/cluster.h b/src/cluster.h → include/cloysterhpc/cluster.h
@@ -11,15 +11,15 @@
 #include <optional>
 #include <string>
 
-#include "diskImage.h"
-#include "headnode.h"
-#include "mailsystem/postfix.h"
-#include "network.h"
-#include "node.h"
-#include "ofed.h"
-#include "queuesystem/pbs.h"
-#include "queuesystem/slurm.h"
-#include "services/timezone.h"
+#include <cloysterhpc/diskImage.h>
+#include <cloysterhpc/headnode.h>
+#include <cloysterhpc/mailsystem/postfix.h>
+#include <cloysterhpc/network.h>
+#include <cloysterhpc/node.h>
+#include <cloysterhpc/ofed.h>
+#include <cloysterhpc/queuesystem/pbs.h>
+#include <cloysterhpc/queuesystem/slurm.h>
+#include <cloysterhpc/services/timezone.h>
 
 class Cluster {
 public:

diff --git a/src/connection.h → include/cloysterhpc/connection.h b/src/connection.h → include/cloysterhpc/connection.h
@@ -6,7 +6,7 @@
 #ifndef CLOYSTERHPC_CONNECTION_H_
 #define CLOYSTERHPC_CONNECTION_H_
 
-#include "network.h"
+#include <cloysterhpc/network.h>
 
 #include <arpa/inet.h>
 #include <boost/asio.hpp>

diff --git a/src/const.h → include/cloysterhpc/const.h b/src/const.h → include/cloysterhpc/const.h
diff --git a/src/cpu.h → include/cloysterhpc/cpu.h b/src/cpu.h → include/cloysterhpc/cpu.h
diff --git a/src/diskImage.h → include/cloysterhpc/diskImage.h b/src/diskImage.h → include/cloysterhpc/diskImage.h
diff --git a/src/functions.h → include/cloysterhpc/functions.h b/src/functions.h → include/cloysterhpc/functions.h
diff --git a/src/headnode.h → include/cloysterhpc/headnode.h b/src/headnode.h → include/cloysterhpc/headnode.h
@@ -10,10 +10,10 @@
 #include <memory>
 #include <string>
 
-#include "connection.h"
-#include "network.h"
-#include "os.h"
-#include "server.h"
+#include <cloysterhpc/connection.h>
+#include <cloysterhpc/network.h>
+#include <cloysterhpc/os.h>
+#include <cloysterhpc/server.h>
 
 class Headnode : public Server {
 public:

diff --git a/src/mailsystem/postfix.h → include/cloysterhpc/mailsystem/postfix.h b/src/mailsystem/postfix.h → include/cloysterhpc/mailsystem/postfix.h
diff --git a/src/network.h → include/cloysterhpc/network.h b/src/network.h → include/cloysterhpc/network.h
diff --git a/src/node.h → include/cloysterhpc/node.h b/src/node.h → include/cloysterhpc/node.h
@@ -9,10 +9,10 @@
 #include <list>
 #include <string>
 
-#include "connection.h"
-#include "network.h"
-#include "os.h"
-#include "server.h"
+#include <cloysterhpc/connection.h>
+#include <cloysterhpc/network.h>
+#include <cloysterhpc/os.h>
+#include <cloysterhpc/server.h>
 
 class Node : public Server {
 public:

diff --git a/src/ofed.h → include/cloysterhpc/ofed.h b/src/ofed.h → include/cloysterhpc/ofed.h
@@ -6,7 +6,7 @@
 #ifndef CLOYSTERHPC_OFED_H_
 #define CLOYSTERHPC_OFED_H_
 
-#include "functions.h"
+#include <cloysterhpc/functions.h>
 
 class OFED {
 public:

diff --git a/src/os.h → include/cloysterhpc/os.h b/src/os.h → include/cloysterhpc/os.h
@@ -6,7 +6,7 @@
 #ifndef CLOYSTERHPC_OS_H_
 #define CLOYSTERHPC_OS_H_
 
-#include "const.h"
+#include <cloysterhpc/const.h>
 #include <string>
 
 // Darwin added for development reasons, not really supported.

diff --git a/src/presenter/Presenter.h → include/cloysterhpc/presenter/Presenter.h b/src/presenter/Presenter.h → include/cloysterhpc/presenter/Presenter.h
@@ -6,10 +6,10 @@
 #ifndef CLOYSTERHPC_PRESENTER_H_
 #define CLOYSTERHPC_PRESENTER_H_
 
-#include "../cluster.h"
-#include "../services/log.h"
-#include "../view/newt.h"
 #include <array>
+#include <cloysterhpc/cluster.h>
+#include <cloysterhpc/services/log.h>
+#include <cloysterhpc/view/newt.h>
 #include <memory>
 #include <string>
 #include <vector>

diff --git a/src/presenter/PresenterGeneralSettings.h → ...rhpc/presenter/PresenterGeneralSettings.h b/src/presenter/PresenterGeneralSettings.h → ...rhpc/presenter/PresenterGeneralSettings.h
@@ -6,7 +6,7 @@
 #ifndef CLOYSTERHPC_PRESENTERGENERALSETTINGS_H_
 #define CLOYSTERHPC_PRESENTERGENERALSETTINGS_H_
 
-#include "Presenter.h"
+#include <cloysterhpc/presenter/Presenter.h>
 
 class PresenterGeneralSettings : public Presenter {
 private:

diff --git a/src/presenter/PresenterHostId.h → ...e/cloysterhpc/presenter/PresenterHostId.h b/src/presenter/PresenterHostId.h → ...e/cloysterhpc/presenter/PresenterHostId.h
@@ -6,7 +6,7 @@
 #ifndef CLOYSTERHPC_PRESENTERHOSTID_H_
 #define CLOYSTERHPC_PRESENTERHOSTID_H_
 
-#include "Presenter.h"
+#include <cloysterhpc/presenter/Presenter.h>
 
 class PresenterHostId : public Presenter {
 private:

diff --git a/src/presenter/PresenterInfiniband.h → ...oysterhpc/presenter/PresenterInfiniband.h b/src/presenter/PresenterInfiniband.h → ...oysterhpc/presenter/PresenterInfiniband.h
@@ -6,8 +6,8 @@
 #ifndef CLOYSTERHPC_PRESENTERINFINIBAND_H_
 #define CLOYSTERHPC_PRESENTERINFINIBAND_H_
 
-#include "Presenter.h"
-#include "PresenterNetwork.h"
+#include <cloysterhpc/presenter/Presenter.h>
+#include <cloysterhpc/presenter/PresenterNetwork.h>
 
 class PresenterInfiniband : public Presenter {
 private:

diff --git a/src/presenter/PresenterInstall.h → .../cloysterhpc/presenter/PresenterInstall.h b/src/presenter/PresenterInstall.h → .../cloysterhpc/presenter/PresenterInstall.h
@@ -6,7 +6,7 @@
 #ifndef CLOYSTERHPC_PRESENTERINSTALL_H_
 #define CLOYSTERHPC_PRESENTERINSTALL_H_
 
-#include "Presenter.h"
+#include <cloysterhpc/presenter/Presenter.h>
 
 #include <boost/lexical_cast.hpp>
 #include <magic_enum.hpp>

diff --git a/src/presenter/PresenterInstructions.h → ...sterhpc/presenter/PresenterInstructions.h b/src/presenter/PresenterInstructions.h → ...sterhpc/presenter/PresenterInstructions.h
@@ -6,7 +6,7 @@
 #ifndef CLOYSTERHPC_PRESENTERINSTRUCTIONS_H_
 #define CLOYSTERHPC_PRESENTERINSTRUCTIONS_H_
 
-#include "Presenter.h"
+#include <cloysterhpc/presenter/Presenter.h>
 
 class PresenterInstructions : public Presenter {
 private:

diff --git a/src/presenter/PresenterLocale.h → ...e/cloysterhpc/presenter/PresenterLocale.h b/src/presenter/PresenterLocale.h → ...e/cloysterhpc/presenter/PresenterLocale.h
@@ -6,7 +6,7 @@
 #ifndef CLOYSTERHPC_PRESENTERLOCALE_H_
 #define CLOYSTERHPC_PRESENTERLOCALE_H_
 
-#include "Presenter.h"
+#include <cloysterhpc/presenter/Presenter.h>
 
 class PresenterLocale : public Presenter {
 private:

diff --git a/src/presenter/PresenterMailSystem.h → ...oysterhpc/presenter/PresenterMailSystem.h b/src/presenter/PresenterMailSystem.h → ...oysterhpc/presenter/PresenterMailSystem.h
@@ -6,7 +6,7 @@
 #ifndef CLOYSTERHPC_PRESENTERMAILSYSTEM_H_
 #define CLOYSTERHPC_PRESENTERMAILSYSTEM_H_
 
-#include "Presenter.h"
+#include <cloysterhpc/presenter/Presenter.h>
 
 class PresenterMailSystem : public Presenter {
 private:

diff --git a/src/presenter/PresenterNetwork.h → .../cloysterhpc/presenter/PresenterNetwork.h b/src/presenter/PresenterNetwork.h → .../cloysterhpc/presenter/PresenterNetwork.h
@@ -6,12 +6,12 @@
 #ifndef CLOYSTERHPC_PRESENTERNETWORK_H_
 #define CLOYSTERHPC_PRESENTERNETWORK_H_
 
-#include "Presenter.h"
+#include <cloysterhpc/presenter/Presenter.h>
 
-#include "../cluster.h"
-#include "../network.h"
-#include "../services/log.h"
-#include "../view/newt.h"
+#include <cloysterhpc/cluster.h>
+#include <cloysterhpc/network.h>
+#include <cloysterhpc/services/log.h>
+#include <cloysterhpc/view/newt.h>
 
 #include <magic_enum.hpp>
 

diff --git a/src/presenter/PresenterNodes.h → ...de/cloysterhpc/presenter/PresenterNodes.h b/src/presenter/PresenterNodes.h → ...de/cloysterhpc/presenter/PresenterNodes.h
@@ -6,7 +6,7 @@
 #ifndef CLOYSTERHPC_PRESENTERNODES_H_
 #define CLOYSTERHPC_PRESENTERNODES_H_
 
-#include "Presenter.h"
+#include <cloysterhpc/presenter/Presenter.h>
 
 class PresenterNodes : public Presenter {
 private:

diff --git a/...esenter/PresenterNodesOperationalSystem.h → ...esenter/PresenterNodesOperationalSystem.h b/...esenter/PresenterNodesOperationalSystem.h → ...esenter/PresenterNodesOperationalSystem.h
@@ -5,7 +5,7 @@
 #ifndef CLOYSTERHPC_PRESENTERNODESOPERATIONALSYSTEM_H_
 #define CLOYSTERHPC_PRESENTERNODESOPERATIONALSYSTEM_H_
 
-#include "Presenter.h"
+#include <cloysterhpc/presenter/Presenter.h>
 
 class PresenterNodesOperationalSystem : public Presenter {
 private:

diff --git a/src/presenter/PresenterQueueSystem.h → ...ysterhpc/presenter/PresenterQueueSystem.h b/src/presenter/PresenterQueueSystem.h → ...ysterhpc/presenter/PresenterQueueSystem.h
@@ -6,7 +6,7 @@
 #ifndef CLOYSTERHPC_PRESENTERQUEUESYSTEM_H_
 #define CLOYSTERHPC_PRESENTERQUEUESYSTEM_H_
 
-#include "Presenter.h"
+#include <cloysterhpc/presenter/Presenter.h>
 
 class PresenterQueueSystem : public Presenter {
 private:

diff --git a/src/presenter/PresenterTime.h → ...ude/cloysterhpc/presenter/PresenterTime.h b/src/presenter/PresenterTime.h → ...ude/cloysterhpc/presenter/PresenterTime.h
@@ -6,7 +6,7 @@
 #ifndef CLOYSTERHPC_PRESENTERTIMEZONE_H_
 #define CLOYSTERHPC_PRESENTERTIMEZONE_H_
 
-#include "Presenter.h"
+#include <cloysterhpc/presenter/Presenter.h>
 
 class PresenterTime : public Presenter {
 private:

diff --git a/src/presenter/PresenterWelcome.h → .../cloysterhpc/presenter/PresenterWelcome.h b/src/presenter/PresenterWelcome.h → .../cloysterhpc/presenter/PresenterWelcome.h
@@ -6,8 +6,8 @@
 #ifndef CLOYSTERHPC_PRESENTERWELCOME_H_
 #define CLOYSTERHPC_PRESENTERWELCOME_H_
 
-#include "../const.h"
-#include "Presenter.h"
+#include <cloysterhpc/const.h>
+#include <cloysterhpc/presenter/Presenter.h>
 
 class PresenterWelcome : public Presenter {
 private:

diff --git a/src/queuesystem/pbs.h → include/cloysterhpc/queuesystem/pbs.h b/src/queuesystem/pbs.h → include/cloysterhpc/queuesystem/pbs.h
@@ -6,7 +6,7 @@
 #ifndef CLOYSTERHPC_PBS_H_
 #define CLOYSTERHPC_PBS_H_
 
-#include "queuesystem.h"
+#include <cloysterhpc/queuesystem/queuesystem.h>
 
 class PBS : public QueueSystem {
 public:

diff --git a/src/queuesystem/queuesystem.h → ...ude/cloysterhpc/queuesystem/queuesystem.h b/src/queuesystem/queuesystem.h → ...ude/cloysterhpc/queuesystem/queuesystem.h
@@ -9,7 +9,7 @@
 #include <fmt/format.h>
 #include <string>
 
-#include "../functions.h"
+#include <cloysterhpc/functions.h>
 
 // Forward declaration of Cluster
 class Cluster;

diff --git a/src/queuesystem/slurm.h → include/cloysterhpc/queuesystem/slurm.h b/src/queuesystem/slurm.h → include/cloysterhpc/queuesystem/slurm.h
@@ -6,7 +6,7 @@
 #ifndef CLOYSTERHPC_SLURM_H_
 #define CLOYSTERHPC_SLURM_H_
 
-#include "queuesystem.h"
+#include <cloysterhpc/queuesystem/queuesystem.h>
 
 class SLURM : public QueueSystem {
 private:

diff --git a/src/repos.h → include/cloysterhpc/repos.h b/src/repos.h → include/cloysterhpc/repos.h
@@ -6,7 +6,7 @@
 #ifndef CLOYSTERHPC_REPOS_H_
 #define CLOYSTERHPC_REPOS_H_
 
-#include "os.h"
+#include <cloysterhpc/os.h>
 #include <string>
 
 struct repofile {

diff --git a/src/server.h → include/cloysterhpc/server.h b/src/server.h → include/cloysterhpc/server.h
@@ -11,10 +11,10 @@
 #include <regex>
 #include <string>
 
-#include "connection.h"
-#include "cpu.h"
-#include "os.h"
-#include "services/bmc.h"
+#include <cloysterhpc/connection.h>
+#include <cloysterhpc/cpu.h>
+#include <cloysterhpc/os.h>
+#include <cloysterhpc/services/bmc.h>
 
 class Server {
 protected:

diff --git a/src/services/IService.h → include/cloysterhpc/services/IService.h b/src/services/IService.h → include/cloysterhpc/services/IService.h
diff --git a/src/services/bmc.h → include/cloysterhpc/services/bmc.h b/src/services/bmc.h → include/cloysterhpc/services/bmc.h
diff --git a/src/services/execution.h → include/cloysterhpc/services/execution.h b/src/services/execution.h → include/cloysterhpc/services/execution.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "../cluster.h"
+#include <cloysterhpc/cluster.h>
 
 class Execution {
 public:

diff --git a/src/services/log.h → include/cloysterhpc/services/log.h b/src/services/log.h → include/cloysterhpc/services/log.h
@@ -6,7 +6,7 @@
 #ifndef CLOYSTERHPC_LOG_H_
 #define CLOYSTERHPC_LOG_H_
 
-#include "../const.h"
+#include <cloysterhpc/const.h>
 #include <spdlog/spdlog.h>
 
 // Define breakpoints per OS in case of custom assertion failures

diff --git a/src/services/provisioner.h → include/cloysterhpc/services/provisioner.h b/src/services/provisioner.h → include/cloysterhpc/services/provisioner.h
diff --git a/src/services/shell.h → include/cloysterhpc/services/shell.h b/src/services/shell.h → include/cloysterhpc/services/shell.h
@@ -8,9 +8,9 @@
 
 #include <magic_enum.hpp>
 
-#include "../cluster.h"
-#include "execution.h"
-#include "provisioner.h"
+#include <cloysterhpc/cluster.h>
+#include <cloysterhpc/services/execution.h>
+#include <cloysterhpc/services/provisioner.h>
 
 class Shell : public Execution {
 private:

diff --git a/src/services/timezone.h → include/cloysterhpc/services/timezone.h b/src/services/timezone.h → include/cloysterhpc/services/timezone.h
diff --git a/src/services/xcat.h → include/cloysterhpc/services/xcat.h b/src/services/xcat.h → include/cloysterhpc/services/xcat.h
@@ -6,11 +6,11 @@
 #ifndef CLOYSTERHPC_XCAT_H_
 #define CLOYSTERHPC_XCAT_H_
 
-#include "../const.h"
-#include "../services/log.h"
-#include "execution.h"
-#include "provisioner.h"
-#include "shell.h"
+#include <cloysterhpc/const.h>
+#include <cloysterhpc/services/execution.h>
+#include <cloysterhpc/services/log.h>
+#include <cloysterhpc/services/provisioner.h>
+#include <cloysterhpc/services/shell.h>
 
 #include <magic_enum.hpp>
 

diff --git a/src/tmpl/slurm.conf.tmpl → include/cloysterhpc/tmpl/slurm.conf.tmpl b/src/tmpl/slurm.conf.tmpl → include/cloysterhpc/tmpl/slurm.conf.tmpl
diff --git a/src/verification.h → include/cloysterhpc/verification.h b/src/verification.h → include/cloysterhpc/verification.h
diff --git a/src/view/newt.h → include/cloysterhpc/view/newt.h b/src/view/newt.h → include/cloysterhpc/view/newt.h
@@ -6,10 +6,10 @@
 #ifndef CLOYSTERHPC_NEWT_H_
 #define CLOYSTERHPC_NEWT_H_
 
-#include "../functions.h"
-#include "../services/log.h"
-#include "view.h"
 #include <boost/lexical_cast.hpp>
+#include <cloysterhpc/functions.h>
+#include <cloysterhpc/services/log.h>
+#include <cloysterhpc/view/view.h>
 #include <fmt/format.h>
 #include <iostream>
 #include <newt.h>

diff --git a/src/view/view.h → include/cloysterhpc/view/view.h b/src/view/view.h → include/cloysterhpc/view/view.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -43,4 +43,3 @@ target_include_directories(main ${WARNING_GUARD} PRIVATE $<BUILD_INTERFACE:${PRO
 #    LIBRARY_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/lib"
 #    RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/bin"
 #)
-
diff --git a/src/NFS.cpp b/src/NFS.cpp
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "NFS.h"
-#include "const.h"
-#include "functions.h"
+#include <cloysterhpc/NFS.h>
+#include <cloysterhpc/const.h>
+#include <cloysterhpc/functions.h>
 #include <fmt/format.h>
 
 using cloyster::runCommand;