feat: refine include

shuai132 · Sep 18, 2023 · cf59345 · cf59345
1 parent 6380a60
commit cf59345
Show file tree

Hide file tree

Showing 47 changed files with 54 additions and 48 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "rpc/rpc_core"]
-	path = rpc/rpc_core
+[submodule "include/asio_net/rpc_core"]
+	path = include/asio_net/rpc_core
 	url = [email protected]:shuai132/rpc_core.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,15 +17,14 @@ set(CMAKE_CXX_STANDARD 14)
 add_compile_options(-Wall)
 
 add_library(${PROJECT_NAME} INTERFACE)
-target_include_directories(${PROJECT_NAME} INTERFACE .)
+target_include_directories(${PROJECT_NAME} INTERFACE include)
 if (ASIO_NET_ENABLE_SSL)
     target_compile_definitions(${PROJECT_NAME} INTERFACE -DASIO_NET_ENABLE_SSL)
 endif ()
 
 if (ASIO_NET_ENABLE_RPC)
     target_include_directories(${PROJECT_NAME} INTERFACE
-            rpc/rpc_core
-            rpc
+            include/asio_net/rpc_core/include
             )
 endif ()
 

diff --git a/include/asio_net.hpp b/include/asio_net.hpp
@@ -0,0 +1,7 @@
+#pragma once
+
+#include "asio_net/server_discovery.hpp"
+#include "asio_net/tcp_client.hpp"
+#include "asio_net/tcp_server.hpp"
+#include "asio_net/udp_client.hpp"
+#include "asio_net/udp_server.hpp"
diff --git a/config.h → include/asio_net/config.h b/config.h → include/asio_net/config.h
diff --git a/detail/log.h → include/asio_net/detail/log.h b/detail/log.h → include/asio_net/detail/log.h
diff --git a/detail/message.hpp → include/asio_net/detail/message.hpp b/detail/message.hpp → include/asio_net/detail/message.hpp
diff --git a/detail/noncopyable.hpp → include/asio_net/detail/noncopyable.hpp b/detail/noncopyable.hpp → include/asio_net/detail/noncopyable.hpp
diff --git a/rpc/detail/rpc_client_t.hpp → include/asio_net/detail/rpc_client_t.hpp b/rpc/detail/rpc_client_t.hpp → include/asio_net/detail/rpc_client_t.hpp
@@ -2,10 +2,10 @@
 
 #include <utility>
 
-#include "detail/noncopyable.hpp"
+#include "noncopyable.hpp"
 #include "rpc_core.hpp"
-#include "rpc_session.hpp"
-#include "tcp_client.hpp"
+#include "rpc_session_t.hpp"
+#include "tcp_client_t.hpp"
 
 namespace asio_net {
 namespace detail {

diff --git a/rpc/detail/rpc_server_t.hpp → include/asio_net/detail/rpc_server_t.hpp b/rpc/detail/rpc_server_t.hpp → include/asio_net/detail/rpc_server_t.hpp
@@ -3,8 +3,8 @@
 #include <utility>
 
 #include "asio.hpp"
-#include "rpc_session.hpp"
-#include "tcp_server.hpp"
+#include "rpc_session_t.hpp"
+#include "tcp_server_t.hpp"
 
 namespace asio_net {
 namespace detail {

diff --git a/rpc/detail/rpc_session_t.hpp → include/asio_net/detail/rpc_session_t.hpp b/rpc/detail/rpc_session_t.hpp → include/asio_net/detail/rpc_session_t.hpp
@@ -2,9 +2,9 @@
 
 #include <utility>
 
-#include "detail/noncopyable.hpp"
-#include "detail/tcp_channel_t.hpp"
+#include "noncopyable.hpp"
 #include "rpc_core.hpp"
+#include "tcp_channel_t.hpp"
 
 namespace asio_net {
 namespace detail {

diff --git a/detail/socket_type.hpp → include/asio_net/detail/socket_type.hpp b/detail/socket_type.hpp → include/asio_net/detail/socket_type.hpp
diff --git a/detail/tcp_channel_t.hpp → include/asio_net/detail/tcp_channel_t.hpp b/detail/tcp_channel_t.hpp → include/asio_net/detail/tcp_channel_t.hpp
@@ -3,8 +3,8 @@
 #include <deque>
 #include <utility>
 
+#include "../config.h"
 #include "asio.hpp"
-#include "config.h"
 #include "log.h"
 #include "message.hpp"
 #include "noncopyable.hpp"

diff --git a/detail/tcp_client_t.hpp → include/asio_net/detail/tcp_client_t.hpp b/detail/tcp_client_t.hpp → include/asio_net/detail/tcp_client_t.hpp
diff --git a/detail/tcp_server_t.hpp → include/asio_net/detail/tcp_server_t.hpp b/detail/tcp_server_t.hpp → include/asio_net/detail/tcp_server_t.hpp
@@ -2,8 +2,8 @@
 
 #include <utility>
 
+#include "../config.h"
 #include "asio.hpp"
-#include "config.h"
 #include "tcp_channel_t.hpp"
 
 namespace asio_net {

diff --git a/detail/udp_client_t.hpp → include/asio_net/detail/udp_client_t.hpp b/detail/udp_client_t.hpp → include/asio_net/detail/udp_client_t.hpp
diff --git a/detail/udp_server_t.hpp → include/asio_net/detail/udp_server_t.hpp b/detail/udp_server_t.hpp → include/asio_net/detail/udp_server_t.hpp
diff --git a/rpc/rpc_client.hpp → include/asio_net/rpc_client.hpp b/rpc/rpc_client.hpp → include/asio_net/rpc_client.hpp
diff --git a/include/asio_net/rpc_core b/include/asio_net/rpc_core
diff --git a/rpc/rpc_server.hpp → include/asio_net/rpc_server.hpp b/rpc/rpc_server.hpp → include/asio_net/rpc_server.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "detail/rpc_server_t.hpp"
+#include "rpc_session.hpp"
 
 namespace asio_net {
 

diff --git a/rpc/rpc_session.hpp → include/asio_net/rpc_session.hpp b/rpc/rpc_session.hpp → include/asio_net/rpc_session.hpp
diff --git a/server_discovery.hpp → include/asio_net/server_discovery.hpp b/server_discovery.hpp → include/asio_net/server_discovery.hpp
diff --git a/tcp_client.hpp → include/asio_net/tcp_client.hpp b/tcp_client.hpp → include/asio_net/tcp_client.hpp
diff --git a/tcp_server.hpp → include/asio_net/tcp_server.hpp b/tcp_server.hpp → include/asio_net/tcp_server.hpp
diff --git a/udp_client.hpp → include/asio_net/udp_client.hpp b/udp_client.hpp → include/asio_net/udp_client.hpp
diff --git a/udp_server.hpp → include/asio_net/udp_server.hpp b/udp_server.hpp → include/asio_net/udp_server.hpp
diff --git a/library.json b/library.json
@@ -14,9 +14,8 @@
   "build": {
     "srcDir": "_",
     "flags": [
-      "-I .",
-      "-I rpc",
-      "-I rpc/rpc_core"
+      "-I include",
+      "-I asio_net/rpc_core/include"
     ]
   }
 }
diff --git a/rpc/rpc_core b/rpc/rpc_core
diff --git a/test/domain_rpc.cpp b/test/domain_rpc.cpp
@@ -3,10 +3,10 @@
 #include <cstdlib>
 #include <thread>
 
+#include "asio_net/rpc_client.hpp"
+#include "asio_net/rpc_server.hpp"
 #include "assert_def.h"
 #include "log.h"
-#include "rpc_client.hpp"
-#include "rpc_server.hpp"
 
 using namespace asio_net;
 

diff --git a/test/domain_tcp.cpp b/test/domain_tcp.cpp
@@ -3,10 +3,10 @@
 #include <cstdlib>
 #include <thread>
 
+#include "asio_net/tcp_client.hpp"
+#include "asio_net/tcp_server.hpp"
 #include "assert_def.h"
 #include "log.h"
-#include "tcp_client.hpp"
-#include "tcp_server.hpp"
 
 using namespace asio_net;
 

diff --git a/test/domain_udp.cpp b/test/domain_udp.cpp
@@ -3,10 +3,10 @@
 #include <cstdlib>
 #include <thread>
 
+#include "asio_net/udp_client.hpp"
+#include "asio_net/udp_server.hpp"
 #include "assert_def.h"
 #include "log.h"
-#include "udp_client.hpp"
-#include "udp_server.hpp"
 
 using namespace asio_net;
 

diff --git a/test/rpc.cpp b/test/rpc.cpp
@@ -3,10 +3,10 @@
 #include <cstdlib>
 #include <thread>
 
+#include "asio_net/rpc_client.hpp"
+#include "asio_net/rpc_server.hpp"
 #include "assert_def.h"
 #include "log.h"
-#include "rpc_client.hpp"
-#include "rpc_server.hpp"
 
 using namespace asio_net;
 

diff --git a/test/rpc_c.cpp b/test/rpc_c.cpp
@@ -1,7 +1,7 @@
 #include <cstdio>
 
+#include "asio_net/rpc_client.hpp"
 #include "log.h"
-#include "rpc_client.hpp"
 
 using namespace asio_net;
 

diff --git a/test/rpc_c_open_close.cpp b/test/rpc_c_open_close.cpp
@@ -1,7 +1,7 @@
 #include <cstdio>
 
+#include "asio_net/rpc_client.hpp"
 #include "log.h"
-#include "rpc_client.hpp"
 
 using namespace asio_net;
 

diff --git a/test/rpc_reconnect.cpp b/test/rpc_reconnect.cpp
@@ -2,9 +2,9 @@
 #include <cstdlib>
 #include <thread>
 
+#include "asio_net/rpc_client.hpp"
+#include "asio_net/rpc_server.hpp"
 #include "log.h"
-#include "rpc_client.hpp"
-#include "rpc_server.hpp"
 
 using namespace asio_net;
 

diff --git a/test/rpc_s.cpp b/test/rpc_s.cpp
@@ -1,7 +1,7 @@
 #include <cstdio>
 
+#include "asio_net/rpc_server.hpp"
 #include "log.h"
-#include "rpc_server.hpp"
 
 using namespace asio_net;
 

diff --git a/test/rpc_ssl.cpp b/test/rpc_ssl.cpp
@@ -3,10 +3,10 @@
 #include <cstdlib>
 #include <thread>
 
+#include "asio_net/rpc_client.hpp"
+#include "asio_net/rpc_server.hpp"
 #include "assert_def.h"
 #include "log.h"
-#include "rpc_client.hpp"
-#include "rpc_server.hpp"
 
 using namespace asio_net;
 

diff --git a/test/server_discovery.cpp b/test/server_discovery.cpp
@@ -1,4 +1,4 @@
-#include "server_discovery.hpp"
+#include "asio_net/server_discovery.hpp"
 
 #include <cstdio>
 

diff --git a/test/tcp.cpp b/test/tcp.cpp
@@ -3,10 +3,10 @@
 #include <cstdlib>
 #include <thread>
 
+#include "asio_net/tcp_client.hpp"
+#include "asio_net/tcp_server.hpp"
 #include "assert_def.h"
 #include "log.h"
-#include "tcp_client.hpp"
-#include "tcp_server.hpp"
 
 using namespace asio_net;
 

diff --git a/test/tcp_bigdata.cpp b/test/tcp_bigdata.cpp
@@ -2,10 +2,10 @@
 #include <cstdlib>
 #include <thread>
 
+#include "asio_net/tcp_client.hpp"
+#include "asio_net/tcp_server.hpp"
 #include "assert_def.h"
 #include "log.h"
-#include "tcp_client.hpp"
-#include "tcp_server.hpp"
 
 using namespace asio_net;
 

diff --git a/test/tcp_c.cpp b/test/tcp_c.cpp
@@ -1,5 +1,5 @@
+#include "asio_net/tcp_client.hpp"
 #include "log.h"
-#include "tcp_client.hpp"
 
 using namespace asio_net;
 

diff --git a/test/tcp_reconnect.cpp b/test/tcp_reconnect.cpp
@@ -2,10 +2,10 @@
 #include <cstdlib>
 #include <thread>
 
+#include "asio_net/tcp_client.hpp"
+#include "asio_net/tcp_server.hpp"
 #include "assert_def.h"
 #include "log.h"
-#include "tcp_client.hpp"
-#include "tcp_server.hpp"
 
 using namespace asio_net;
 

diff --git a/test/tcp_s.cpp b/test/tcp_s.cpp
@@ -1,6 +1,6 @@
+#include "asio_net/tcp_server.hpp"
 #include "assert_def.h"
 #include "log.h"
-#include "tcp_server.hpp"
 
 using namespace asio_net;
 

diff --git a/test/tcp_ssl_c.cpp b/test/tcp_ssl_c.cpp
@@ -1,5 +1,5 @@
+#include "asio_net/tcp_client.hpp"
 #include "log.h"
-#include "tcp_client.hpp"
 
 using namespace asio_net;
 

diff --git a/test/tcp_ssl_s.cpp b/test/tcp_ssl_s.cpp
@@ -1,6 +1,6 @@
+#include "asio_net/tcp_server.hpp"
 #include "assert_def.h"
 #include "log.h"
-#include "tcp_server.hpp"
 
 using namespace asio_net;
 

diff --git a/test/udp.cpp b/test/udp.cpp
@@ -3,10 +3,10 @@
 #include <cstdlib>
 #include <thread>
 
+#include "asio_net/udp_client.hpp"
+#include "asio_net/udp_server.hpp"
 #include "assert_def.h"
 #include "log.h"
-#include "udp_client.hpp"
-#include "udp_server.hpp"
 
 using namespace asio_net;
 

diff --git a/test/udp_c.cpp b/test/udp_c.cpp
@@ -1,5 +1,5 @@
+#include "asio_net/udp_client.hpp"
 #include "log.h"
-#include "udp_client.hpp"
 
 using namespace asio_net;
 

diff --git a/test/udp_s.cpp b/test/udp_s.cpp
@@ -1,5 +1,5 @@
+#include "asio_net/udp_server.hpp"
 #include "log.h"
-#include "udp_server.hpp"
 
 using namespace asio_net;