From 70c3447b1cb4fb1b8398081284be8428c2ac28fc Mon Sep 17 00:00:00 2001
From: Alberto Miranda <alberto.miranda@bsc.es>
Date: Tue, 14 Feb 2023 15:46:47 +0100
Subject: [PATCH] Rename admire.hpp to scord/scord.hpp

---
 examples/cxx/ADM_cancel_transfer.cpp                 | 2 +-
 examples/cxx/ADM_connect_data_operation.cpp          | 2 +-
 examples/cxx/ADM_define_data_operation.cpp           | 2 +-
 examples/cxx/ADM_deploy_adhoc_storage.cpp            | 2 +-
 examples/cxx/ADM_finalize_data_operation.cpp         | 2 +-
 examples/cxx/ADM_get_pending_transfers.cpp           | 2 +-
 examples/cxx/ADM_get_qos_constraints.cpp             | 2 +-
 examples/cxx/ADM_get_statistics.cpp                  | 2 +-
 examples/cxx/ADM_get_transfer_priority.cpp           | 2 +-
 examples/cxx/ADM_link_transfer_to_data_operation.cpp | 2 +-
 examples/cxx/ADM_ping.cpp                            | 2 +-
 examples/cxx/ADM_register_adhoc_storage.cpp          | 2 +-
 examples/cxx/ADM_register_job.cpp                    | 2 +-
 examples/cxx/ADM_register_pfs_storage.cpp            | 2 +-
 examples/cxx/ADM_remove_adhoc_storage.cpp            | 2 +-
 examples/cxx/ADM_remove_job.cpp                      | 2 +-
 examples/cxx/ADM_remove_pfs_storage.cpp              | 4 ++--
 examples/cxx/ADM_set_dataset_information.cpp         | 2 +-
 examples/cxx/ADM_set_io_resources.cpp                | 2 +-
 examples/cxx/ADM_set_qos_constraints.cpp             | 2 +-
 examples/cxx/ADM_set_transfer_priority.cpp           | 2 +-
 examples/cxx/ADM_transfer_datasets.cpp               | 2 +-
 examples/cxx/ADM_update_adhoc_storage.cpp            | 2 +-
 examples/cxx/ADM_update_job.cpp                      | 2 +-
 examples/cxx/ADM_update_pfs_storage.cpp              | 2 +-
 src/lib/CMakeLists.txt                               | 4 ++--
 src/lib/admire.cpp                                   | 2 +-
 src/lib/c_wrapper.cpp                                | 2 +-
 src/lib/detail/impl.hpp                              | 2 +-
 src/lib/{admire.hpp => scord/scord.hpp}              | 6 +++---
 30 files changed, 34 insertions(+), 34 deletions(-)
 rename src/lib/{admire.hpp => scord/scord.hpp} (98%)

diff --git a/examples/cxx/ADM_cancel_transfer.cpp b/examples/cxx/ADM_cancel_transfer.cpp
index 4543974f..3f4dada0 100644
--- a/examples/cxx/ADM_cancel_transfer.cpp
+++ b/examples/cxx/ADM_cancel_transfer.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 
 int
diff --git a/examples/cxx/ADM_connect_data_operation.cpp b/examples/cxx/ADM_connect_data_operation.cpp
index 62614f92..0c48a4ad 100644
--- a/examples/cxx/ADM_connect_data_operation.cpp
+++ b/examples/cxx/ADM_connect_data_operation.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 int
 main(int argc, char* argv[]) {
diff --git a/examples/cxx/ADM_define_data_operation.cpp b/examples/cxx/ADM_define_data_operation.cpp
index 1d2a0297..fb75b042 100644
--- a/examples/cxx/ADM_define_data_operation.cpp
+++ b/examples/cxx/ADM_define_data_operation.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 
 int
diff --git a/examples/cxx/ADM_deploy_adhoc_storage.cpp b/examples/cxx/ADM_deploy_adhoc_storage.cpp
index ccfc76c1..ab8296f7 100644
--- a/examples/cxx/ADM_deploy_adhoc_storage.cpp
+++ b/examples/cxx/ADM_deploy_adhoc_storage.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 #include "common.hpp"
 
 #define NJOB_NODES   50
diff --git a/examples/cxx/ADM_finalize_data_operation.cpp b/examples/cxx/ADM_finalize_data_operation.cpp
index c3eab90c..9b422dd6 100644
--- a/examples/cxx/ADM_finalize_data_operation.cpp
+++ b/examples/cxx/ADM_finalize_data_operation.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 int
 main(int argc, char* argv[]) {
diff --git a/examples/cxx/ADM_get_pending_transfers.cpp b/examples/cxx/ADM_get_pending_transfers.cpp
index 4d3c69f5..9df1504c 100644
--- a/examples/cxx/ADM_get_pending_transfers.cpp
+++ b/examples/cxx/ADM_get_pending_transfers.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 
 int
diff --git a/examples/cxx/ADM_get_qos_constraints.cpp b/examples/cxx/ADM_get_qos_constraints.cpp
index c1828aa4..13d5955d 100644
--- a/examples/cxx/ADM_get_qos_constraints.cpp
+++ b/examples/cxx/ADM_get_qos_constraints.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 
 int
diff --git a/examples/cxx/ADM_get_statistics.cpp b/examples/cxx/ADM_get_statistics.cpp
index b3c78675..9fa1723e 100644
--- a/examples/cxx/ADM_get_statistics.cpp
+++ b/examples/cxx/ADM_get_statistics.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 int
 main(int argc, char* argv[]) {
diff --git a/examples/cxx/ADM_get_transfer_priority.cpp b/examples/cxx/ADM_get_transfer_priority.cpp
index 8fef9925..0436c0d0 100644
--- a/examples/cxx/ADM_get_transfer_priority.cpp
+++ b/examples/cxx/ADM_get_transfer_priority.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 
 int
diff --git a/examples/cxx/ADM_link_transfer_to_data_operation.cpp b/examples/cxx/ADM_link_transfer_to_data_operation.cpp
index 8ebb02c3..d7b6b6b8 100644
--- a/examples/cxx/ADM_link_transfer_to_data_operation.cpp
+++ b/examples/cxx/ADM_link_transfer_to_data_operation.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 int
 main(int argc, char* argv[]) {
diff --git a/examples/cxx/ADM_ping.cpp b/examples/cxx/ADM_ping.cpp
index d687e60f..a5916892 100644
--- a/examples/cxx/ADM_ping.cpp
+++ b/examples/cxx/ADM_ping.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 int
 main(int argc, char* argv[]) {
diff --git a/examples/cxx/ADM_register_adhoc_storage.cpp b/examples/cxx/ADM_register_adhoc_storage.cpp
index 4b00c3d4..a6708966 100644
--- a/examples/cxx/ADM_register_adhoc_storage.cpp
+++ b/examples/cxx/ADM_register_adhoc_storage.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 #include "common.hpp"
 
 #define NJOB_NODES   50
diff --git a/examples/cxx/ADM_register_job.cpp b/examples/cxx/ADM_register_job.cpp
index a016ea2f..e9409037 100644
--- a/examples/cxx/ADM_register_job.cpp
+++ b/examples/cxx/ADM_register_job.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 #include "common.hpp"
 
 #define NJOB_NODES   50
diff --git a/examples/cxx/ADM_register_pfs_storage.cpp b/examples/cxx/ADM_register_pfs_storage.cpp
index b3ad5e47..ad56507c 100644
--- a/examples/cxx/ADM_register_pfs_storage.cpp
+++ b/examples/cxx/ADM_register_pfs_storage.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 
 int
diff --git a/examples/cxx/ADM_remove_adhoc_storage.cpp b/examples/cxx/ADM_remove_adhoc_storage.cpp
index a9714cc3..5acbc039 100644
--- a/examples/cxx/ADM_remove_adhoc_storage.cpp
+++ b/examples/cxx/ADM_remove_adhoc_storage.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 #include "common.hpp"
 
 #define NJOB_NODES   50
diff --git a/examples/cxx/ADM_remove_job.cpp b/examples/cxx/ADM_remove_job.cpp
index 1320946f..45b190c2 100644
--- a/examples/cxx/ADM_remove_job.cpp
+++ b/examples/cxx/ADM_remove_job.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 #include "common.hpp"
 
 #define NJOB_NODES   50
diff --git a/examples/cxx/ADM_remove_pfs_storage.cpp b/examples/cxx/ADM_remove_pfs_storage.cpp
index d03833a4..903b5dca 100644
--- a/examples/cxx/ADM_remove_pfs_storage.cpp
+++ b/examples/cxx/ADM_remove_pfs_storage.cpp
@@ -22,8 +22,8 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *****************************************************************************/
 
-#include "fmt/format.h"
-#include "admire.hpp"
+#include <fmt/format.h>
+#include <scord/scord.hpp>
 
 
 int
diff --git a/examples/cxx/ADM_set_dataset_information.cpp b/examples/cxx/ADM_set_dataset_information.cpp
index 3d1ac5ba..863dd322 100644
--- a/examples/cxx/ADM_set_dataset_information.cpp
+++ b/examples/cxx/ADM_set_dataset_information.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 
 int
diff --git a/examples/cxx/ADM_set_io_resources.cpp b/examples/cxx/ADM_set_io_resources.cpp
index ab9108a4..342a0cb3 100644
--- a/examples/cxx/ADM_set_io_resources.cpp
+++ b/examples/cxx/ADM_set_io_resources.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 
 int
diff --git a/examples/cxx/ADM_set_qos_constraints.cpp b/examples/cxx/ADM_set_qos_constraints.cpp
index 3b3f84fe..2a46f110 100644
--- a/examples/cxx/ADM_set_qos_constraints.cpp
+++ b/examples/cxx/ADM_set_qos_constraints.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 
 int
diff --git a/examples/cxx/ADM_set_transfer_priority.cpp b/examples/cxx/ADM_set_transfer_priority.cpp
index f9fe2e69..1e2e9fa5 100644
--- a/examples/cxx/ADM_set_transfer_priority.cpp
+++ b/examples/cxx/ADM_set_transfer_priority.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 
 int
diff --git a/examples/cxx/ADM_transfer_datasets.cpp b/examples/cxx/ADM_transfer_datasets.cpp
index efd62144..0d3571a4 100644
--- a/examples/cxx/ADM_transfer_datasets.cpp
+++ b/examples/cxx/ADM_transfer_datasets.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 #include "common.hpp"
 
 #define NJOB_NODES   50
diff --git a/examples/cxx/ADM_update_adhoc_storage.cpp b/examples/cxx/ADM_update_adhoc_storage.cpp
index 54b6033b..7787aae0 100644
--- a/examples/cxx/ADM_update_adhoc_storage.cpp
+++ b/examples/cxx/ADM_update_adhoc_storage.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 #include "common.hpp"
 
 #define NADHOC_NODES 25
diff --git a/examples/cxx/ADM_update_job.cpp b/examples/cxx/ADM_update_job.cpp
index 1d8152f6..cf70a971 100644
--- a/examples/cxx/ADM_update_job.cpp
+++ b/examples/cxx/ADM_update_job.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 #include "common.hpp"
 
 #define NJOB_NODES   50
diff --git a/examples/cxx/ADM_update_pfs_storage.cpp b/examples/cxx/ADM_update_pfs_storage.cpp
index 6a090a6c..696af2e4 100644
--- a/examples/cxx/ADM_update_pfs_storage.cpp
+++ b/examples/cxx/ADM_update_pfs_storage.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <fmt/format.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 
 
 int
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 670171e9..5fd26b59 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -26,12 +26,12 @@ add_library(libscord SHARED)
 
 target_sources(
   libscord
-  PUBLIC scord/scord.h admire.hpp
+  PUBLIC scord/scord.h scord/scord.hpp
   PRIVATE admire.cpp c_wrapper.cpp detail/impl.hpp detail/impl.cpp env.hpp
 )
 
 list(APPEND public_headers "scord/scord.h"
-     "${CMAKE_SOURCE_DIR}/src/common/api/scord/types.h" "admire.hpp"
+     "${CMAKE_SOURCE_DIR}/src/common/api/scord/types.h" "scord/scord.hpp"
      "${CMAKE_SOURCE_DIR}/src/common/api/scord/types.hpp"
 )
 
diff --git a/src/lib/admire.cpp b/src/lib/admire.cpp
index 63a70415..ca1f2102 100644
--- a/src/lib/admire.cpp
+++ b/src/lib/admire.cpp
@@ -22,7 +22,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  *****************************************************************************/
 
-#include <admire.hpp>
+#include <scord/scord.hpp>
 #include <net/proto/rpc_types.h>
 #include <logger/logger.hpp>
 #include <utils/ctype_ptr.hpp>
diff --git a/src/lib/c_wrapper.cpp b/src/lib/c_wrapper.cpp
index 15b930e0..15e06703 100644
--- a/src/lib/c_wrapper.cpp
+++ b/src/lib/c_wrapper.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include <scord/scord.h>
-#include <admire.hpp>
+#include <scord/scord.hpp>
 #include <logger/logger.hpp>
 #include <net/proto/rpc_types.h>
 #include <stdarg.h>
diff --git a/src/lib/detail/impl.hpp b/src/lib/detail/impl.hpp
index bb24d14e..337f6e18 100644
--- a/src/lib/detail/impl.hpp
+++ b/src/lib/detail/impl.hpp
@@ -26,7 +26,7 @@
 #ifndef SCORD_ADMIRE_IMPL_HPP
 #define SCORD_ADMIRE_IMPL_HPP
 
-#include <admire.hpp>
+#include <scord/scord.hpp>
 #include <tl/expected.hpp>
 
 namespace admire::detail {
diff --git a/src/lib/admire.hpp b/src/lib/scord/scord.hpp
similarity index 98%
rename from src/lib/admire.hpp
rename to src/lib/scord/scord.hpp
index c2dfc0e3..4933f574 100644
--- a/src/lib/admire.hpp
+++ b/src/lib/scord/scord.hpp
@@ -28,8 +28,8 @@
 #include "scord/types.hpp"
 #include "net/proto/rpc_types.h"
 
-#ifndef SCORD_ADMIRE_HPP
-#define SCORD_ADMIRE_HPP
+#ifndef SCORD_HPP
+#define SCORD_HPP
 
 /******************************************************************************/
 /* Public type definitions and type-related functions                         */
@@ -146,4 +146,4 @@ get_statistics(const server& srv, ADM_job_t job, ADM_job_stats_t** stats);
 
 } // namespace admire
 
-#endif // SCORD_ADMIRE_HPP
+#endif // SCORD_HPP
-- 
GitLab