From f9a8de9be7678acb6b55d8fc573ba960d11c569c Mon Sep 17 00:00:00 2001
From: Kargatum <dowlandtop@yandex.com>
Date: Fri, 15 Nov 2019 16:31:54 +0700
Subject: [PATCH] feat(Core/Shared): added new library - shared (#2416)

---
 src/server/CMakeLists.txt                     |  1 +
 src/server/authserver/CMakeLists.txt          | 26 ++++++---------
 src/server/shared/CMakeLists.txt              | 32 +++++++++++++++++++
 .../Server => shared/Network}/RealmSocket.cpp |  0
 .../Server => shared/Network}/RealmSocket.h   |  0
 .../Realms/RealmList.cpp                      |  4 +--
 .../{authserver => shared}/Realms/RealmList.h |  1 +
 src/server/worldserver/CMakeLists.txt         | 24 ++++++--------
 src/server/worldserver/Master.cpp             |  1 -
 9 files changed, 55 insertions(+), 34 deletions(-)
 create mode 100644 src/server/shared/CMakeLists.txt
 rename src/server/{authserver/Server => shared/Network}/RealmSocket.cpp (100%)
 rename src/server/{authserver/Server => shared/Network}/RealmSocket.h (100%)
 rename src/server/{authserver => shared}/Realms/RealmList.cpp (98%)
 rename src/server/{authserver => shared}/Realms/RealmList.h (99%)

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 8e4578897..a142c9771 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -16,6 +16,7 @@ set(winDebugging
   ${CMAKE_SOURCE_DIR}/src/common/Debugging/WheatyExceptionReport.h)
 endif()
 
+add_subdirectory(shared)
 add_subdirectory(game)
 add_subdirectory(authserver)
 add_subdirectory(scripts)
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index f79a760d4..ebf4fe0a7 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -31,18 +31,6 @@ endif()
 # Group sources
 GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
 
-add_library(authserver-interface INTERFACE)
-
-CollectIncludeDirectories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  PUBLIC_INCLUDES
-  # Exclude
-  ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders)
-
-target_include_directories(authserver-interface
-  INTERFACE
-    ${PUBLIC_INCLUDES})
-
 add_executable(authserver
   ${PRIVATE_SOURCES})
 
@@ -54,18 +42,24 @@ if(NOT WIN32)
 endif()
 
 target_link_libraries(authserver
-  PRIVATE
-    authserver-interface
   PUBLIC
-    common)
+    shared)
+
+CollectIncludeDirectories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  PUBLIC_INCLUDES
+  # Exclude
+  ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders)
 
 target_include_directories(authserver
+  PUBLIC
+    ${PUBLIC_INCLUDES}
   PRIVATE
     ${CMAKE_CURRENT_BINARY_DIR})
 
 set_target_properties(authserver
   PROPERTIES
-      FOLDER
+    FOLDER
       "server")
 
 if( WIN32 )
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
new file mode 100644
index 000000000..225d8266c
--- /dev/null
+++ b/src/server/shared/CMakeLists.txt
@@ -0,0 +1,32 @@
+#
+# Copyright (C) 2016+     AzerothCore <www.azerothcore.org>
+#
+
+CollectSourceFiles(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  PRIVATE_SOURCES)
+
+# Group sources
+GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
+
+add_library(shared 
+  ${PRIVATE_SOURCES})
+
+CollectIncludeDirectories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  PUBLIC_INCLUDES)
+
+target_include_directories(shared
+  PUBLIC
+    ${PUBLIC_INCLUDES}
+  PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR})
+
+target_link_libraries(shared
+  PUBLIC
+    common)
+
+set_target_properties(shared
+  PROPERTIES
+    FOLDER
+      "server")
diff --git a/src/server/authserver/Server/RealmSocket.cpp b/src/server/shared/Network/RealmSocket.cpp
similarity index 100%
rename from src/server/authserver/Server/RealmSocket.cpp
rename to src/server/shared/Network/RealmSocket.cpp
diff --git a/src/server/authserver/Server/RealmSocket.h b/src/server/shared/Network/RealmSocket.h
similarity index 100%
rename from src/server/authserver/Server/RealmSocket.h
rename to src/server/shared/Network/RealmSocket.h
diff --git a/src/server/authserver/Realms/RealmList.cpp b/src/server/shared/Realms/RealmList.cpp
similarity index 98%
rename from src/server/authserver/Realms/RealmList.cpp
rename to src/server/shared/Realms/RealmList.cpp
index f28012bb8..730c4ce41 100644
--- a/src/server/authserver/Realms/RealmList.cpp
+++ b/src/server/shared/Realms/RealmList.cpp
@@ -6,9 +6,9 @@
 
 #include "Common.h"
 #include "RealmList.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 
-RealmList::RealmList() : m_UpdateInterval(0), m_NextUpdateTime(time(NULL)) { }
+RealmList::RealmList() : m_UpdateInterval(0), m_NextUpdateTime(time(nullptr)) { }
 
 // Load the realm list from the database
 void RealmList::Initialize(uint32 updateInterval)
diff --git a/src/server/authserver/Realms/RealmList.h b/src/server/shared/Realms/RealmList.h
similarity index 99%
rename from src/server/authserver/Realms/RealmList.h
rename to src/server/shared/Realms/RealmList.h
index 9c3a52df7..021dd758a 100644
--- a/src/server/authserver/Realms/RealmList.h
+++ b/src/server/shared/Realms/RealmList.h
@@ -70,4 +70,5 @@ private:
 };
 
 #define sRealmList ACE_Singleton<RealmList, ACE_Null_Mutex>::instance()
+
 #endif
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 3b631919c..2e588f895 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -29,18 +29,6 @@ endif()
 # Group sources
 GroupSources(${CMAKE_CURRENT_SOURCE_DIR})
 
-add_library(worldserver-interface INTERFACE)
-
-CollectIncludeDirectories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  PUBLIC_INCLUDES
-  # Exclude
-  ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders)
-
-target_include_directories(worldserver-interface
-  INTERFACE
-    ${PUBLIC_INCLUDES})
-
 add_executable(worldserver
   ${PRIVATE_SOURCES})
 
@@ -57,19 +45,25 @@ endif()
 
 set_target_properties(worldserver PROPERTIES LINK_FLAGS "${worldserver_LINK_FLAGS}")
 
+CollectIncludeDirectories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  PUBLIC_INCLUDES
+  # Exclude
+  ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders)
+
 target_include_directories(worldserver
+  PUBLIC
+    ${PUBLIC_INCLUDES}
   PRIVATE
     ${CMAKE_CURRENT_BINARY_DIR})
 
 target_link_libraries(worldserver
   PRIVATE
-    worldserver-interface
-    authserver-interface
     game-interface
     scripts-interface
   PUBLIC
     game
-    common
+    shared
     scripts
     gsoap
     readline
diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp
index 0a91548b3..2a7a25de3 100644
--- a/src/server/worldserver/Master.cpp
+++ b/src/server/worldserver/Master.cpp
@@ -28,7 +28,6 @@
 #include "TCSoap.h"
 #include "Timer.h"
 #include "Util.h"
-#include "AuthSocket.h"
 #include "RealmList.h"
 #include "ScriptMgr.h"