Remove ACE stuff from github buildaction

0blu · Sep 9, 2024 · 242a9e9 · 242a9e9
1 parent 9fa88c6
commit 242a9e9
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 93 deletions.
diff --git a/.drone.yml b/.drone.yml
diff --git a/.github/workflows/dev-release.yml b/.github/workflows/dev-release.yml
@@ -11,7 +11,6 @@ on:
       - '.github/workflows/db_check.yml'
       - '.github/workflows/db_dump.yml'
       - 'sql/**'
-      - '.drone.yml'
       - 'README.md'
       - 'LICENSE'
       - '.gitignore'
@@ -26,23 +25,13 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: windows dependencies
-      #Sets versions for ACE/TBB
+      #Sets versions for TBB
       env:
-        ACE_VERSION: 6.5.11
-        ACE_VERSION2: 6_5_11
         TBB_VERSION: 2020.3
 
       run: |
-        #directory variables
-        export ACE_ROOT=$GITHUB_WORKSPACE/ACE_wrappers
+        # Setup TBB
         export TBB_ROOT_DIR=$GITHUB_WORKSPACE/tbb
-        #ACE package download
-        curl -LOJ http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-$ACE_VERSION2/ACE-$ACE_VERSION.zip
-        unzip ACE-$ACE_VERSION.zip
-        rm ACE-$ACE_VERSION.zip
-        #configuration of ACE header
-        echo "#include \"ace/config-win32.h\"" >> $ACE_ROOT/ace/config.h
-        #TBB package download
         curl -LOJ https://github.com/oneapi-src/oneTBB/releases/download/v$TBB_VERSION/tbb-$TBB_VERSION-win.zip
         unzip tbb-$TBB_VERSION-win.zip
         rm tbb-$TBB_VERSION-win.zip
@@ -52,14 +41,10 @@ jobs:
     #build and install
     - name: windows build & install
       run: |
-        #directory variables
-        export ACE_ROOT=$GITHUB_WORKSPACE/ACE_wrappers
-        cd $GITHUB_WORKSPACE/ACE_wrappers
-        /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2019/Enterprise/MSBuild/Current/Bin/MSBuild.exe "ACE_wrappers_vs2019.sln" //p:Configuration=Release //p:Platform=x64 //t:ACE //m:2
-        cd $GITHUB_WORKSPACE
+        # Setup TBB
         mkdir build
         cd build
-        cmake -D TBB_ROOT_DIR=$GITHUB_WORKSPACE/tbb -DWITH_WARNINGS=0 -DUSE_EXTRACTORS=1 -G "Visual Studio 16 2019" -A x64 ..
+        cmake -D TBB_ROOT_DIR=$GITHUB_WORKSPACE/tbb -DWITH_WARNINGS=0 -DBUILD_FOR_HOST_CPU=0 -DUSE_EXTRACTORS=1 -G "Visual Studio 16 2019" -A x64 ..
         /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2019/Enterprise/MSBuild/Current/Bin/MSBuild.exe "MaNGOS.sln" //p:Platform=x64 //p:Configuration=Release //m:2
       #git bash shell
       shell: bash
@@ -79,7 +64,6 @@ jobs:
           copy ${{github.workspace}}/tbb/bin/intel64/vc14/tbbmalloc_proxy.dll ${{github.workspace}}/bin/Release/tbbmalloc_proxy.dll
           copy ${{github.workspace}}/tbb/bin/intel64/vc14/tbbmalloc_proxy_debug.dll ${{github.workspace}}/bin/Release/tbbmalloc_proxy_debug.dll
 
-          copy ${{github.workspace}}/ACE_wrappers/lib/ACE.dll ${{github.workspace}}/bin/Release/ACE.dll
           copy ${{github.workspace}}/dep/windows/lib/x64_release/libmySQL.dll ${{github.workspace}}/bin/Release/libmySQL.dll
           # copy "c:/Program Files/OpenSSL-Win64/bin/libssl-1_1-x64.dll" ${{github.workspace}}/bin/Release/libssl-1_1-x64.dll
           # copy "c:/Program Files/OpenSSL-Win64/bin/libcrypto-1_1-x64.dll" ${{github.workspace}}/bin/Release/libcrypto-1_1-x64.dll
@@ -95,14 +79,9 @@ jobs:
     #build with anticheat and install
     - name: windows build with anticheat & install
       run: |
-        #directory variables
-        export ACE_ROOT=$GITHUB_WORKSPACE/ACE_wrappers
-        cd $GITHUB_WORKSPACE/ACE_wrappers
-        /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2019/Enterprise/MSBuild/Current/Bin/MSBuild.exe "ACE_wrappers_vs2019.sln" //p:Configuration=Release //p:Platform=x64 //t:ACE //m:2
-        cd $GITHUB_WORKSPACE
         mkdir buildac
         cd buildac
-        cmake -D TBB_ROOT_DIR=$GITHUB_WORKSPACE/tbb -DWITH_WARNINGS=0 -DUSE_EXTRACTORS=1 -DUSE_ANTICHEAT=1 -G "Visual Studio 16 2019" -A x64 ..
+        cmake -D TBB_ROOT_DIR=$GITHUB_WORKSPACE/tbb -DWITH_WARNINGS=0 -DBUILD_FOR_HOST_CPU=0 -DUSE_EXTRACTORS=1 -DUSE_ANTICHEAT=1 -G "Visual Studio 16 2019" -A x64 ..
         /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2019/Enterprise/MSBuild/Current/Bin/MSBuild.exe "MaNGOS.sln" //p:Platform=x64 //p:Configuration=Release //m:2
       #git bash shell
       shell: bash
@@ -122,7 +101,6 @@ jobs:
           copy ${{github.workspace}}/tbb/bin/intel64/vc14/tbbmalloc_proxy.dll ${{github.workspace}}/bin/Release/tbbmalloc_proxy.dll
           copy ${{github.workspace}}/tbb/bin/intel64/vc14/tbbmalloc_proxy_debug.dll ${{github.workspace}}/bin/Release/tbbmalloc_proxy_debug.dll
 
-          copy ${{github.workspace}}/ACE_wrappers/lib/ACE.dll ${{github.workspace}}/bin/Release/ACE.dll
           copy ${{github.workspace}}/dep/windows/lib/x64_release/libmySQL.dll ${{github.workspace}}/bin/Release/libmySQL.dll
           # copy "c:/Program Files/OpenSSL-Win64/bin/libssl-1_1-x64.dll" ${{github.workspace}}/bin/Release/libssl-1_1-x64.dll
           # copy "c:/Program Files/OpenSSL-Win64/bin/libcrypto-1_1-x64.dll" ${{github.workspace}}/bin/Release/libcrypto-1_1-x64.dll

diff --git a/.github/workflows/vmangos.yml b/.github/workflows/vmangos.yml
@@ -15,7 +15,6 @@ on:
       - '.github/workflows/db_check.yml'
       - '.github/workflows/db_dump.yml'
       - 'sql/**'
-      - '.drone.yml'
       - 'README.md'
       - 'LICENSE'
       - '.gitignore'
@@ -29,7 +28,6 @@ on:
       - '.github/workflows/db_check.yml'
       - '.github/workflows/db_dump.yml'
       - 'sql/**'
-      - '.drone.yml'
       - 'README.md'
       - 'LICENSE'
       - '.gitignore'
@@ -57,27 +55,17 @@ jobs:
       if: matrix.os == 'ubuntu-latest'
       run: |
         sudo apt-get -qq update
-        sudo apt-get -qq install build-essential cmake cppcheck git libace-dev libiberty-dev libmysql++-dev libssl-dev libtbb-dev make openssl
+        sudo apt-get -qq install build-essential cmake cppcheck git libiberty-dev libmysql++-dev libssl-dev libtbb-dev make openssl
       #windows dependencies
     - name: windows dependencies
       if: matrix.os == 'windows-2019'
-      #Sets versions for ACE/TBB
+      #Sets versions TBB
       env:
-        ACE_VERSION: 6.5.11
-        ACE_VERSION2: 6_5_11
         TBB_VERSION: 2020.3
 
       run: |
-        #directory variables
-        export ACE_ROOT=$GITHUB_WORKSPACE/ACE_wrappers
+        # Setup TBB
         export TBB_ROOT_DIR=$GITHUB_WORKSPACE/tbb
-        #ACE package download
-        curl -LOJ http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-$ACE_VERSION2/ACE-$ACE_VERSION.zip
-        unzip ACE-$ACE_VERSION.zip
-        rm ACE-$ACE_VERSION.zip
-        #configuration of ACE header
-        echo "#include \"ace/config-win32.h\"" >> $ACE_ROOT/ace/config.h
-        #TBB package download
         curl -LOJ https://github.com/oneapi-src/oneTBB/releases/download/v$TBB_VERSION/tbb-$TBB_VERSION-win.zip
         unzip tbb-$TBB_VERSION-win.zip
         rm tbb-$TBB_VERSION-win.zip
@@ -99,11 +87,6 @@ jobs:
     - name: windows build & install
       if: matrix.os == 'windows-2019'
       run: |
-        #directory variables
-        export ACE_ROOT=$GITHUB_WORKSPACE/ACE_wrappers
-        cd $GITHUB_WORKSPACE/ACE_wrappers
-        /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2019/Enterprise/MSBuild/Current/Bin/MSBuild.exe "ACE_wrappers_vs2019.sln" //p:Configuration=Release //p:Platform=x64 //t:ACE //m:2
-        cd $GITHUB_WORKSPACE
         mkdir build
         cd build
         cmake -D TBB_ROOT_DIR=$GITHUB_WORKSPACE/tbb -DWITH_WARNINGS=0 -DUSE_EXTRACTORS=1 -G "Visual Studio 16 2019" -A x64 ..

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,7 +20,7 @@ cmake_minimum_required(VERSION 3.1...3.20)
 
 project(MaNGOS)
 
-# Allow -DACE_ROOT, -DTBB_ROOT, etc.
+# Allow -DTBB_ROOT, etc.
 if(${CMAKE_VERSION} VERSION_GREATER "3.11")
   cmake_policy(SET CMP0074 NEW)
 endif()

diff --git a/src/mangosd/CMakeLists.txt b/src/mangosd/CMakeLists.txt
@@ -41,7 +41,6 @@ endif()
 
 include_directories(
   ${CMAKE_SOURCE_DIR}/src/shared
-  ${CMAKE_SOURCE_DIR}/dep/include/gsoap
   ${CMAKE_SOURCE_DIR}/dep/include/g3dlite
   ${CMAKE_SOURCE_DIR}/src/framework
   ${CMAKE_SOURCE_DIR}/src/framework/Network

diff --git a/src/realmd/CMakeLists.txt b/src/realmd/CMakeLists.txt
@@ -33,8 +33,6 @@ if(WIN32)
   list(APPEND EXECUTABLE_SRCS
     realmd.rc
   )
-
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D__ACE_INLINE__")
 endif()
 
 include_directories(
@@ -43,7 +41,6 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/src/shared
   ${MYSQL_INCLUDE_DIR}
-  ${ACE_INCLUDE_DIR}
   ${OPENSSL_INCLUDE_DIR}
 )
 
@@ -60,7 +57,6 @@ add_executable(${EXECUTABLE_NAME}
 target_link_libraries(${EXECUTABLE_NAME}
   shared
   framework
-  ${ACE_LIBRARIES}
 )
 
 if(WIN32)

diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt
@@ -186,8 +186,6 @@ if(WIN32) # For window build: Exclude Unix/MacOS files
       WheatyExceptionReport.h
     )
   endif()
-
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D__ACE_INLINE__")
 else()
   list(REMOVE_ITEM shared_SRCS
     WheatyExceptionReport.cpp
@@ -244,7 +242,6 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dep/include
   ${CMAKE_SOURCE_DIR}/src/framework
   ${CMAKE_BINARY_DIR}
-  ${ACE_INCLUDE_DIR}
   ${MYSQL_INCLUDE_DIR}
   ${OPENSSL_INCLUDE_DIR}
 )
@@ -261,7 +258,7 @@ add_library(shared STATIC
 
 if(UNIX)
   find_package(Threads)
-  target_link_libraries(shared ${ACE_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+  target_link_libraries(shared ${CMAKE_THREAD_LIBS_INIT})
 endif(UNIX)
 
 if(WIN32)