Change folder struture in boost support lib

Iandiehard · Jan 21, 2024 · c13d5f6 · c13d5f6
1 parent 39d365f
commit c13d5f6
Show file tree

Hide file tree

Showing 23 changed files with 25 additions and 26 deletions.
diff --git a/diag-client-lib/lib/boost-support/CMakeLists.txt b/diag-client-lib/lib/boost-support/CMakeLists.txt
@@ -14,13 +14,13 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 find_package(Boost 1.78.0)
 find_package(OpenSSL)
 
-file(GLOB LIBBOOST_COMMON_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/common/*.cpp")
-file(GLOB LIBBOOST_CLIENT_TCP_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/client/tcp/*.cpp")
-file(GLOB LIBBOOST_SOCKET_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/socket/*.cpp")
-file(GLOB LIBBOOST_SOCKET_TCP_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/socket/tcp/*.cpp")
-file(GLOB LIBBOOST_SOCKET_TLS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/socket/tls/*.cpp")
-file(GLOB LIBBOOST_SOCKET_UDP_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/socket/udp/*.cpp")
-file(GLOB LIBBOOST_JSON_PARSER_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/parser/*.cpp")
+file(GLOB LIBBOOST_COMMON_SRCS "src/boost-support/common/*.cpp")
+file(GLOB LIBBOOST_CLIENT_TCP_SRCS "include/boost-support/client/tcp/*.cpp")
+file(GLOB LIBBOOST_SOCKET_SRCS "src/boost-support/socket/*.cpp")
+file(GLOB LIBBOOST_SOCKET_TCP_SRCS "src/boost-support/socket/tcp/*.cpp")
+file(GLOB LIBBOOST_SOCKET_TLS_SRCS "src/boost-support/socket/tls/*.cpp")
+file(GLOB LIBBOOST_SOCKET_UDP_SRCS "src/boost-support/socket/udp/*.cpp")
+file(GLOB LIBBOOST_JSON_PARSER_SRCS "include/boost-support/parser/*.cpp")
 
 set(LIBBOOST_SOCKET_SRCS
         ${LIBBOOST_SOCKET_SRCS}
@@ -38,7 +38,7 @@ add_library(${PROJECT_NAME}
 
 #Link include directory
 target_include_directories(${PROJECT_NAME} PUBLIC
-        "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
+        "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
         "$<BUILD_INTERFACE:${Boost_INCLUDE_DIRS}>"
 )
 

diff --git a/...lib/boost-support/client/tcp/tcp_client.h → ...ude/boost-support/client/tcp/tcp_client.h b/...lib/boost-support/client/tcp/tcp_client.h → ...ude/boost-support/client/tcp/tcp_client.h
diff --git a/...ib/lib/boost-support/parser/json_parser.h → ...nclude/boost-support/parser/json_parser.h b/...ib/lib/boost-support/parser/json_parser.h → ...nclude/boost-support/parser/json_parser.h
diff --git a/...lib/boost-support/socket/tcp/tcp_server.h → ...ude/boost-support/server/tcp/tcp_server.h b/...lib/boost-support/socket/tcp/tcp_server.h → ...ude/boost-support/server/tcp/tcp_server.h
@@ -13,7 +13,7 @@
 #include <string_view>
 #include <vector>
 
-#include "tcp_message.h"
+#include "src/boost-support/socket/tcp/tcp_message.h"
 
 namespace boost_support {
 namespace socket {

diff --git a/...lib/boost-support/socket/tcp/tcp_socket.h → ...ude/boost-support/socket/tcp/tcp_socket.h b/...lib/boost-support/socket/tcp/tcp_socket.h → ...ude/boost-support/socket/tcp/tcp_socket.h
@@ -11,7 +11,7 @@
 #include <boost/asio.hpp>
 
 #include "core/include/result.h"
-#include "socket/tcp/tcp_message.h"
+#include "src/boost-support/socket/tcp/tcp_message.h"
 
 namespace boost_support {
 namespace socket {

diff --git a/...ib/boost-support/socket/tls/tls_context.h → ...de/boost-support/socket/tls/tls_context.h b/...ib/boost-support/socket/tls/tls_context.h → ...de/boost-support/socket/tls/tls_context.h
@@ -11,7 +11,7 @@
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>
 
-#include "socket/tls/tls_version.h"
+#include "tls_version.h"
 
 namespace boost_support {
 namespace socket {

diff --git a/...lib/boost-support/socket/tls/tls_socket.h → ...ude/boost-support/socket/tls/tls_socket.h b/...lib/boost-support/socket/tls/tls_socket.h → ...ude/boost-support/socket/tls/tls_socket.h
@@ -11,8 +11,8 @@
 #include <boost/asio.hpp>
 
 #include "core/include/result.h"
-#include "socket/tcp/tcp_message.h"
-#include "socket/tls/tls_context.h"
+#include "src/boost-support/socket/tcp/tcp_message.h"
+#include "tls_context.h"
 
 namespace boost_support {
 namespace socket {

diff --git a/...ib/boost-support/socket/tls/tls_version.h → ...de/boost-support/socket/tls/tls_version.h b/...ib/boost-support/socket/tls/tls_version.h → ...de/boost-support/socket/tls/tls_version.h
diff --git a/...lib/boost-support/socket/udp/udp_client.h → ...ude/boost-support/socket/udp/udp_client.h b/...lib/boost-support/socket/udp/udp_client.h → ...ude/boost-support/socket/udp/udp_client.h
@@ -15,7 +15,7 @@
 #include <vector>
 
 #include "core/include/result.h"
-#include "socket/udp/udp_message.h"
+#include "udp_message.h"
 
 namespace boost_support {
 namespace socket {

diff --git a/...ib/boost-support/socket/udp/udp_message.h → ...de/boost-support/socket/udp/udp_message.h b/...ib/boost-support/socket/udp/udp_message.h → ...de/boost-support/socket/udp/udp_message.h
diff --git a/...ent-lib/lib/boost-support/common/logger.h → ...support/src/boost-support/common/logger.h b/...ent-lib/lib/boost-support/common/logger.h → ...support/src/boost-support/common/logger.h
diff --git a/.../lib/boost-support/parser/json_parser.cpp → .../src/boost-support/parser/json_parser.cpp b/.../lib/boost-support/parser/json_parser.cpp → .../src/boost-support/parser/json_parser.cpp
@@ -6,9 +6,9 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 
-#include "parser/json_parser.h"
+#include "include/boost-support/parser/json_parser.h"
 
-#include "common/logger.h"
+#include "src/boost-support/common/logger.h"
 
 namespace boost_support {
 namespace parser {

diff --git a/...b/boost-support/socket/tcp/tcp_server.cpp → ...c/boost-support/server/tcp/tcp_server.cpp b/...b/boost-support/socket/tcp/tcp_server.cpp → ...c/boost-support/server/tcp/tcp_server.cpp
@@ -5,8 +5,7 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
-#include "socket/tcp/tcp_server.h"
-
+#include "server/tcp/tcp_server.h"
 #include "common/logger.h"
 
 namespace boost_support {

diff --git a/...b/lib/boost-support/socket/io_context.cpp → ...t/src/boost-support/socket/io_context.cpp b/...b/lib/boost-support/socket/io_context.cpp → ...t/src/boost-support/socket/io_context.cpp
@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "socket/io_context.h"
+#include "io_context.h"
 
 namespace boost_support {
 namespace socket {

diff --git a/...lib/lib/boost-support/socket/io_context.h → ...ort/src/boost-support/socket/io_context.h b/...lib/lib/boost-support/socket/io_context.h → ...ort/src/boost-support/socket/io_context.h
diff --git a/...ib/boost-support/socket/tcp/tcp_message.h → ...rc/boost-support/socket/tcp/tcp_message.h b/...ib/boost-support/socket/tcp/tcp_message.h → ...rc/boost-support/socket/tcp/tcp_message.h
diff --git a/...b/boost-support/socket/tcp/tcp_socket.cpp → ...c/boost-support/socket/tcp/tcp_socket.cpp b/...b/boost-support/socket/tcp/tcp_socket.cpp → ...c/boost-support/socket/tcp/tcp_socket.cpp
@@ -6,7 +6,7 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 
-#include "socket/tcp/tcp_socket.h"
+#include "include/boost-support/socket/tcp/tcp_socket.h"
 
 #include <utility>
 

diff --git a/...b/boost-support/socket/tcp/tls_client.cpp → ...c/boost-support/socket/tcp/tls_client.cpp b/...b/boost-support/socket/tcp/tls_client.cpp → ...c/boost-support/socket/tcp/tls_client.cpp
@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "socket/tcp/tls_client.h"
+#include "tls_client.h"
 
 #include <utility>
 

diff --git a/...lib/boost-support/socket/tcp/tls_client.h → ...src/boost-support/socket/tcp/tls_client.h b/...lib/boost-support/socket/tcp/tls_client.h → ...src/boost-support/socket/tcp/tls_client.h
@@ -15,7 +15,7 @@
 #include <thread>
 
 #include "core/include/result.h"
-#include "socket/tcp/tcp_message.h"
+#include "tcp_message.h"
 
 namespace boost_support {
 namespace socket {

diff --git a/...b/boost-support/socket/tcp/tls_server.cpp → ...c/boost-support/socket/tcp/tls_server.cpp b/...b/boost-support/socket/tcp/tls_server.cpp → ...c/boost-support/socket/tcp/tls_server.cpp
@@ -5,7 +5,7 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
-#include "socket/tcp/tls_server.h"
+#include "tls_server.h"
 
 #include <utility>
 

diff --git a/...lib/boost-support/socket/tcp/tls_server.h → ...src/boost-support/socket/tcp/tls_server.h b/...lib/boost-support/socket/tcp/tls_server.h → ...src/boost-support/socket/tcp/tls_server.h
@@ -16,7 +16,7 @@
 #include <vector>
 
 #include "core/include/result.h"
-#include "socket/tcp/tcp_message.h"
+#include "tcp_message.h"
 
 namespace boost_support {
 namespace socket {

diff --git a/...b/boost-support/socket/tls/tls_socket.cpp → ...c/boost-support/socket/tls/tls_socket.cpp b/...b/boost-support/socket/tls/tls_socket.cpp → ...c/boost-support/socket/tls/tls_socket.cpp
@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "socket/tls/tls_socket.h"
+#include "include/boost-support/socket/tls/tls_socket.h"
 
 #include <utility>
 

diff --git a/...b/boost-support/socket/udp/udp_client.cpp → ...c/boost-support/socket/udp/udp_client.cpp b/...b/boost-support/socket/udp/udp_client.cpp → ...c/boost-support/socket/udp/udp_client.cpp
@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "socket/udp/udp_client.h"
+#include "include/boost-support/socket/udp/udp_client.h"
 
 #include "common/logger.h"