Skip to content

Commit

Permalink
new util subfolder
Browse files Browse the repository at this point in the history
  • Loading branch information
rex-schilasky committed Nov 22, 2023
1 parent 44003e2 commit 922df8a
Show file tree
Hide file tree
Showing 30 changed files with 40 additions and 39 deletions.
39 changes: 20 additions & 19 deletions ecal/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,6 @@ if(UNIX)
endif()
endif()


######################################
# custom_tclap
######################################
set(ecal_custom_tclap_src
src/custom_tclap/advanced_tclap_output.cpp
src/custom_tclap/advanced_tclap_output.h
)

######################################
# io/mtx
######################################
Expand Down Expand Up @@ -211,6 +202,7 @@ set(ecal_pubsub_src
# readwrite
######################################
set(ecal_readwrite_src
src/readwrite/ecal_buffer_payload_writer.h
src/readwrite/ecal_reader.cpp
src/readwrite/ecal_reader.h
src/readwrite/ecal_reader_layer.h
Expand Down Expand Up @@ -276,11 +268,26 @@ set(ecal_service_src
src/service/ecal_service_singleton_manager.h
)

######################################
# util
######################################
set(ecal_util_src
src/util/advanced_tclap_output.cpp
src/util/advanced_tclap_output.h
src/util/convert_utf.cpp
src/util/convert_utf.h
src/util/ecal_expmap.h
src/util/ecal_thread.cpp
src/util/ecal_thread.h
src/util/getenvvar.h
src/util/sys_usage.cpp
src/util/sys_usage.h
)

######################################
# common
######################################
set(ecal_cmn_src
src/convert_utf.cpp
src/ecal.cpp
src/ecal_clang.cpp
src/ecal_config.cpp
Expand All @@ -290,28 +297,20 @@ set(ecal_cmn_src
src/ecal_global_accessors.cpp
src/ecal_globals.cpp
src/ecal_process.cpp
src/ecal_thread.cpp
src/ecal_time.cpp
src/ecal_timegate.cpp
src/ecal_timer.cpp
src/ecal_util.cpp
src/ecalc.cpp
src/sys_usage.cpp
src/convert_utf.h
src/ecal_buffer_payload_writer.h
src/ecal_config_reader.h
src/ecal_config_reader_hlp.h
src/ecal_def.h
src/ecal_def_ini.h
src/ecal_descgate.h
src/ecal_expmap.h
src/ecal_global_accessors.h
src/ecal_globals.h
src/ecal_sample_to_topicinfo.h
src/ecal_thread.h
src/ecal_timegate.h
src/getenvvar.h
src/sys_usage.h
src/topic2mcast.h
)
if (WIN32)
Expand Down Expand Up @@ -450,13 +449,14 @@ ecal_add_ecal_shared_library(${PROJECT_NAME}
${ecal_readwrite_udp_src}
${ecal_registration_src}
${ecal_service_src}
${ecal_util_src}
${ecal_cmn_src}
${ecal_header_public}
${CMAKE_CURRENT_BINARY_DIR}/include/ecal/ecal_defs.h
)

if(UNIX)
set_source_files_properties(src/convert_utf.cpp PROPERTIES COMPILE_FLAGS -Wno-implicit-fallthrough)
set_source_files_properties(src/util/convert_utf.cpp PROPERTIES COMPILE_FLAGS -Wno-implicit-fallthrough)
endif()

ecal_add_ecal_shared_library(${PROJECT_NAME}_c ${ecal_c_src} ${ecal_c_win_src})
Expand Down Expand Up @@ -567,6 +567,7 @@ if(NOT ${CMAKE_VERSION} VERSION_LESS "3.8.0")
${ecal_readwrite_udp_src}
${ecal_registration_src}
${ecal_service_src}
${ecal_util_src}
${ecal_cmn_src}
${ecal_c_src}
${ecal_c_win_src}
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/ecal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "ecal_globals.h"

#include <tclap/CmdLine.h>
#include <custom_tclap/advanced_tclap_output.h>
#include "util/advanced_tclap_output.h"

namespace eCAL
{
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/ecal_config_reader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "ecal_def.h"
#include "ecal_config_reader.h"
#include "ecal_global_accessors.h"
#include "getenvvar.h"
#include "util/getenvvar.h"

#include <iostream>
#include <fstream>
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/ecal_descgate.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

#include "ecal_global_accessors.h"
#include "ecal_def.h"
#include "ecal_expmap.h"
#include "util/ecal_expmap.h"

#include <shared_mutex>
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/ecal_process.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#include <memory>
#include <fstream>

#include "sys_usage.h"
#include "util/sys_usage.h"

#include <cstdlib>
#include <cstdio>
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/ecal_timegate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include "ecal_def.h"
#include "ecal_process.h"
#include "ecal_timegate.h"
#include "getenvvar.h"
#include "util/getenvvar.h"

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

#include "ecal_def.h"
#include "udp_receiver.h"
#include "ecal_thread.h"
#include "util/ecal_thread.h"
#include "msg_type.h"

#include <memory>
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_monitoring_threads.h"
#include "ecal_expmap.h"
#include "util/ecal_expmap.h"
#include "io/udp/rcv_sample.h"

#include <memory>
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/monitoring/ecal_monitoring_threads.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <ecal/ecal.h>
#include <ecal/msg/protobuf/publisher.h>

#include "ecal_thread.h"
#include "util/ecal_thread.h"
#include "io/udp/udp_receiver.h"

#ifdef _MSC_VER
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/pubsub/ecal_publisher.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <ecal/ecal_config.h>

#include "ecal_config_reader_hlp.h"
#include "ecal_buffer_payload_writer.h"
#include "readwrite/ecal_buffer_payload_writer.h"
#include "ecal_globals.h"

#include "readwrite/ecal_writer.h"
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/pubsub/ecal_subgate.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#pragma once

#include "ecal_thread.h"
#include "util/ecal_thread.h"

#include "readwrite/ecal_reader.h"

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion ecal/core/src/readwrite/ecal_reader.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#pragma warning(pop)
#endif

#include "ecal_expmap.h"
#include "util/ecal_expmap.h"

#include <condition_variable>
#include <mutex>
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/readwrite/ecal_writer.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <ecal/ecal_types.h>

#include "ecal_def.h"
#include "ecal_expmap.h"
#include "util/ecal_expmap.h"

#include "udp/ecal_writer_udp_mc.h"
#include "shm/ecal_writer_shm.h"
Expand Down
4 changes: 2 additions & 2 deletions ecal/core/src/readwrite/tcp/ecal_writer_tcp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@

#include <ecal/ecal_config.h>

#include "readwrite/ecal_writer_tcp.h"
#include "readwrite/ecal_tcp_pubsub_logger.h"
#include "ecal_writer_tcp.h"
#include "ecal_tcp_pubsub_logger.h"

#include "ecal_utils/portable_endian.h"

Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/readwrite/udp/ecal_reader_udp_mc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* @brief udp multicast reader and layer
**/

#include "readwrite/ecal_reader_udp_mc.h"
#include "ecal_reader_udp_mc.h"

#include "ecal_global_accessors.h"
#include "pubsub/ecal_subgate.h"
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 @@ -28,7 +28,7 @@

#pragma once

#include "ecal_thread.h"
#include "util/ecal_thread.h"
#include "io/udp/snd_sample.h"
#include "io/udp/udp_sender.h"

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 @@ -30,7 +30,7 @@
#include <ecal/ecal.h>

#include "ecal_def.h"
#include "ecal_thread.h"
#include "util/ecal_thread.h"

#include "io/udp/rcv_sample.h"

Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/service/ecal_clientgate.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#pragma once

#include "ecal_def.h"
#include "ecal_expmap.h"
#include "util/ecal_expmap.h"

#include <ecal/ecal_callback.h>

Expand Down
2 changes: 1 addition & 1 deletion ecal/core/src/service/ecal_service_client_impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#include "ecal_global_accessors.h"

#include "ecal_registration_provider.h"
#include "registration/ecal_registration_provider.h"
#include "ecal_clientgate.h"
#include "ecal_service_client_impl.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* ========================= eCAL LICENSE =================================
*/

#include <custom_tclap/advanced_tclap_output.h>
#include "advanced_tclap_output.h"

#include <sstream>

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 922df8a

Please sign in to comment.