Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[config] Changing folder structure for SAttributes and Attributebuilder #1749

Merged
merged 1 commit into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ecal/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ endif()
# common
######################################
set(ecal_cmn_src
src/builder/monitoring_attribute_builder.cpp
src/config/builder/monitoring_attribute_builder.cpp
src/ecal.cpp
src/ecal_def.h
src/ecal_def_ini.h
Expand All @@ -452,13 +452,13 @@ endif()
# builder
######################################
set (ecal_builder_src
src/builder/logging_attribute_builder.cpp
src/builder/monitoring_attribute_builder.cpp
src/builder/registration_attribute_builder.cpp
src/logging/builder/udp_attribute_builder.cpp
src/registration/builder/udp_shm_attribute_builder.cpp
src/registration/builder/sample_applier_attribute_builder.cpp
src/registration/udp/builder/udp_attribute_builder.cpp
src/config/builder/logging_attribute_builder.cpp
src/config/builder/monitoring_attribute_builder.cpp
src/config/builder/registration_attribute_builder.cpp
src/logging/config/builder/udp_attribute_builder.cpp
src/registration/config/builder/udp_shm_attribute_builder.cpp
src/registration/config/builder/sample_applier_attribute_builder.cpp
src/registration/udp/config/builder/udp_attribute_builder.cpp
)


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#pragma once

#include "logging/attributes/logging_attributes.h"
#include "logging/config/attributes/logging_attributes.h"
#include "ecal/config/logging.h"
#include "ecal/config/registration.h"
#include "ecal/config/transport_layer.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#pragma once

#include "monitoring/attributes/monitoring_attributes.h"
#include "monitoring/config/attributes/monitoring_attributes.h"

#include <ecal/config/monitoring.h>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#pragma once

#include "registration/attributes/registration_attributes.h"
#include "registration/config/attributes/registration_attributes.h"

#include <ecal/ecal_config.h>

Expand Down
6 changes: 3 additions & 3 deletions ecal/core/src/ecal_globals.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
#include "service/ecal_service_singleton_manager.h"
#endif

#include "builder/registration_attribute_builder.h"
#include "builder/monitoring_attribute_builder.h"
#include "builder/logging_attribute_builder.h"
#include "config/builder/registration_attribute_builder.h"
#include "config/builder/monitoring_attribute_builder.h"
#include "config/builder/logging_attribute_builder.h"

namespace eCAL
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "io/udp/ecal_udp_receiver_attr.h"
#include "io/udp/ecal_udp_sender_attr.h"

#include "logging/attributes/logging_attributes.h"
#include "logging/config/attributes/logging_attributes.h"

namespace eCAL
{
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/logging/ecal_log_impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#include "ecal_log_impl.h"
#include "serialization/ecal_serialize_logging.h"
#include "builder/udp_attribute_builder.h"
#include "config/builder/udp_attribute_builder.h"
#include <mutex>
#include <cstdio>

Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/logging/ecal_log_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include <ecal/ecal_log_level.h>
#include <ecal/types/logging.h>

#include "attributes/logging_attributes.h"
#include "config/attributes/logging_attributes.h"
#include "ecal_global_accessors.h"

#include <atomic>
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/monitoring/ecal_monitoring_def.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

#include <ecal/types/monitoring.h>

#include "attributes/monitoring_attributes.h"
#include "config/attributes/monitoring_attributes.h"

#include <memory>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/monitoring/ecal_monitoring_filter.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <string>
#include <vector>

#include "monitoring/attributes/monitoring_attributes.h"
#include "monitoring/config/attributes/monitoring_attributes.h"

namespace eCAL
{
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/monitoring/ecal_monitoring_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <ecal/types/monitoring.h>

#include "ecal_def.h"
#include "monitoring/attributes/monitoring_attributes.h"
#include "monitoring/config/attributes/monitoring_attributes.h"
#include "monitoring/ecal_monitoring_filter.h"

#include "serialization/ecal_serialize_sample_registration.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

#pragma once

#include "registration/attributes/registration_attributes.h"
#include "registration/attributes/sample_applier_attributes.h"
#include "registration/config/attributes/registration_attributes.h"
#include "registration/config/attributes/sample_applier_attributes.h"

namespace eCAL
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@

#pragma once

#include "registration/udp/attributes/registration_sender_udp_attributes.h"
#include "registration/udp/attributes/registration_receiver_udp_attributes.h"
#include "registration/shm/attributes/registration_shm_attributes.h"
#include "registration/attributes/registration_attributes.h"
#include "registration/udp/config/attributes/registration_sender_udp_attributes.h"
#include "registration/udp/config/attributes/registration_receiver_udp_attributes.h"
#include "registration/shm/config/attributes/registration_shm_attributes.h"
#include "registration/config/attributes/registration_attributes.h"


namespace eCAL
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/registration/ecal_registration_provider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
#include <registration/shm/ecal_registration_sender_shm.h>
#endif

#include "builder/udp_shm_attribute_builder.h"
#include "config/builder/udp_shm_attribute_builder.h"


namespace eCAL
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/registration/ecal_registration_provider.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#include "registration/ecal_registration_sender.h"
#include "util/ecal_thread.h"
#include "attributes/registration_attributes.h"
#include "config/attributes/registration_attributes.h"

#include <atomic>
#include <memory>
Expand Down
4 changes: 2 additions & 2 deletions ecal/core/src/registration/ecal_registration_receiver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
#include <mutex>
#include <string>

#include "builder/udp_shm_attribute_builder.h"
#include "builder/sample_applier_attribute_builder.h"
#include "config/builder/udp_shm_attribute_builder.h"
#include "config/builder/sample_applier_attribute_builder.h"

namespace eCAL
{
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/registration/ecal_registration_receiver.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "registration/ecal_registration_sample_applier.h"
#include "registration/ecal_registration_sample_applier_gates.h"
#include "registration/ecal_registration_sample_applier_user.h"
#include "attributes/registration_attributes.h"
#include "config/attributes/registration_attributes.h"

#include <atomic>
#include <functional>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <ecal/ecal.h>

#include "serialization/ecal_struct_sample_registration.h"
#include "attributes/sample_applier_attributes.h"
#include "config/attributes/sample_applier_attributes.h"

#include <functional>
#include <map>
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/registration/shm/ecal_memfile_broadcast.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#include "relocatable_circular_queue.h"
#include "io/shm/ecal_memfile.h"
#include "attributes/registration_shm_attributes.h"
#include "config/attributes/registration_shm_attributes.h"

#include <ecal/ecal.h>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

#include <memory>
#include <registration/ecal_registration_types.h>
#include "attributes/registration_shm_attributes.h"
#include "config/attributes/registration_shm_attributes.h"

namespace eCAL
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include "registration/shm/ecal_memfile_broadcast.h"
#include "registration/shm/ecal_memfile_broadcast_writer.h"

#include "attributes/registration_shm_attributes.h"
#include "config/attributes/registration_shm_attributes.h"

#include <vector>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#include "io/udp/ecal_udp_receiver_attr.h"
#include "io/udp/ecal_udp_sender_attr.h"

#include "registration/udp/attributes/registration_sender_udp_attributes.h"
#include "registration/udp/attributes/registration_receiver_udp_attributes.h"
#include "registration/udp/config/attributes/registration_sender_udp_attributes.h"
#include "registration/udp/config/attributes/registration_receiver_udp_attributes.h"

namespace eCAL
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "serialization/ecal_serialize_sample_registration.h"
#include <ecal/ecal_config.h>

#include "registration/udp/builder/udp_attribute_builder.h"
#include "registration/udp/config/builder/udp_attribute_builder.h"

using namespace eCAL;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#include <memory>
#include <registration/ecal_registration_types.h>
#include "registration/udp/attributes/registration_receiver_udp_attributes.h"
#include "registration/udp/config/attributes/registration_receiver_udp_attributes.h"

namespace eCAL
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include "io/udp/ecal_udp_configurations.h"
#include <ecal/ecal_config.h>

#include "registration/udp/builder/udp_attribute_builder.h"
#include "registration/udp/config/builder/udp_attribute_builder.h"

namespace eCAL
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "registration/ecal_registration_sender.h"

#include "io/udp/ecal_udp_sample_sender.h"
#include "registration/udp/attributes/registration_sender_udp_attributes.h"
#include "registration/udp/config/attributes/registration_sender_udp_attributes.h"

namespace eCAL
{
Expand Down
Loading