feat(Deps/ACE): remove ACE library (part 1/2) (#6980)

CMakeLists.txt

@@ -100,10 +100,6 @@ CU_RUN_HOOK("AFTER_LOAD_CMAKE_MODULES")
 set(ACE_EXPECTED_VERSION 6.0.3)
 
 find_package(PCHSupport)
-find_package(ACE REQUIRED)
-if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-    add_definitions(-DACE_LACKS_AUTO_PTR=1)
-endif()
 find_package(MySQL REQUIRED)
 
 if(UNIX AND WITH_PERFTOOLS)

apps/docker/Dockerfile

@@ -27,7 +27,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 # Do not use acore dashboard to install
 # since it's not cacheable by docker
 RUN apt-get update && apt-get install -y gdb gdbserver git dos2unix lsb-core sudo curl unzip \
-  make cmake clang libmysqlclient-dev libace-dev \
+  make cmake clang libmysqlclient-dev \
   libboost-system1.7*-dev libboost-filesystem1.7*-dev libboost-program-options1.7*-dev libboost-iostreams1.7*-dev \
   build-essential libtool cmake-data openssl libgoogle-perftools-dev google-perftools \
   libssl-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev mysql-client \
@@ -109,7 +109,7 @@ RUN addgroup --gid $GROUP_ID acore && \
 # install the required dependencies to run the server
 RUN apt-get update && apt-get install -y dos2unix gdb gdbserver google-perftools libgoogle-perftools-dev net-tools \
     libboost-system1.7*-dev libboost-filesystem1.7*-dev libboost-program-options1.7*-dev libboost-iostreams1.7*-dev \
-    tzdata libmysqlclient-dev libace-dev mysql-client curl unzip && rm -rf /var/lib/apt/lists/* ;
+    tzdata libmysqlclient-dev mysql-client curl unzip && rm -rf /var/lib/apt/lists/* ;
 
 # change timezone in container
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && dpkg-reconfigure --frontend noninteractive tzdata
@@ -281,7 +281,7 @@ ENV TZ=Etc/UTC
 # set noninteractive mode so tzdata doesn't ask to set timezone on install
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update && apt-get install -y libmysqlclient-dev libace-dev libssl-dev libbz2-dev \ 
+RUN apt-get update && apt-get install -y libmysqlclient-dev libssl-dev libbz2-dev \
     libboost-system1.7*-dev libboost-filesystem1.7*-dev libboost-program-options1.7*-dev libboost-iostreams1.7*-dev \
     sudo && rm -rf /var/lib/apt/lists/* ;
 

apps/installer/includes/os_configs/debian.sh

@@ -6,7 +6,7 @@ DEBIAN_VERSION=$(lsb_release -sr)
 
 sudo apt-get update -y
 
-sudo apt-get install -y gdbserver gdb unzip curl libace-6.* libace-dev \
+sudo apt-get install -y gdbserver gdb unzip curl \
                      libncurses-dev libreadline-dev clang g++ \
                      gcc git cmake make ccache
 

apps/installer/includes/os_configs/osx.sh

@@ -13,4 +13,4 @@ if ! command -v cmake &>/dev/null ; then
 fi
 ##########################################
 
-brew install openssl readline ace boost bash-completion curl unzip mysql ccache
+brew install openssl readline boost bash-completion curl unzip mysql ccache

apps/installer/includes/os_configs/ubuntu.sh

@@ -7,7 +7,7 @@ UBUNTU_VERSION=$(lsb_release -sr);
 sudo apt update
 
 # shared deps
-sudo apt-get -y install ccache clang cmake curl google-perftools libace-dev libmysqlclient-dev make unzip
+sudo apt-get -y install ccache clang cmake curl google-perftools libmysqlclient-dev make unzip
 
 if [[ $CONTINUOUS_INTEGRATION || $DOCKER ]]; then
   sudo add-apt-repository -y ppa:mhier/libboost-latest && sudo apt update && sudo apt-get -y install build-essential cmake-data  \
@@ -17,13 +17,13 @@ else
   case $UBUNTU_VERSION in
      "20.04")
        sudo apt-get install -y g++ gdb gdbserver gcc git \
-       libace-6.* libboost-all-dev libbz2-dev libncurses-dev libreadline-dev \
-       libssl-dev mysql-server 
+       libboost-all-dev libbz2-dev libncurses-dev libreadline-dev \
+       libssl-dev mysql-server
        ;;
      *)
        sudo add-apt-repository -y ppa:mhier/libboost-latest && sudo apt update && sudo apt-get install -y g++ gdb gdbserver gcc git \
-       libace-6.* libboost-all-dev libbz2-dev libncurses-dev libreadline-dev \
-       libssl-dev mysql-server 
+       libboost-all-dev libbz2-dev libncurses-dev libreadline-dev \
+       libssl-dev mysql-server
        ;;
   esac
 fi

deps/CMakeLists.txt

@@ -19,7 +19,6 @@ endif()
 add_subdirectory(threads)
 
 if(SERVERS OR TOOLS)
-  add_subdirectory(acelite)
   add_subdirectory(boost)
   add_subdirectory(zlib)
   add_subdirectory(g3dlite)

deps/PackageList.txt

@@ -1,9 +1,5 @@
 AzerothCore uses (parts of or in whole) the following opensource software:
 
-ACE (ADAPTIVE Communication Environment)
-  http://www.cs.wustl.edu/~schmidt/ACE.html
-  Version: 6.1.4
-
 argon2
   https://github.com/P-H-C/phc-winner-argon2
   Version: 62358ba

src/cmake/platform/win/settings.cmake

@@ -1,10 +1,6 @@
 # Platform-specfic options
 option(USE_MYSQL_SOURCES "Use included MySQL-sources to build libraries" 0)
 
-# Package overloads
-set(ACE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/deps/acelite)
-set(ACE_LIBRARY "ace")
-
 if( USE_MYSQL_SOURCES )
   set(MYSQL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/deps/mysqllite/include)
   set(MYSQL_LIBRARY "libmysql")

src/server/worldserver/PrecompiledHeaders/worldPCH.h

@@ -1,8 +1,11 @@
-#include "WorldSocket.h"        // must be first to make ACE happy with ACE includes in it
+/*
+ * Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3
+ */
 
 #include "Common.h"
-#include "Configuration/Config.h"
-#include "Database/DatabaseEnv.h"
+#include "Config.h"
+#include "DatabaseEnv.h"
 #include "Log.h"
 #include "Util.h"
 #include "World.h"
+#include "WorldSocket.h"