Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace ACE with native IO implementation #2740

Draft
wants to merge 254 commits into
base: development
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
254 commits
Select commit Hold shift + click to select a range
5fb737a
Use modern networking sockets for low CPU usage and high performant c…
0blu Jun 22, 2024
2846aeb
Fix realmd build.
ratkosrb Jun 22, 2024
29dc202
Remove commented out stuff.
ratkosrb Jun 22, 2024
54fa00e
Fix crash on login.
ratkosrb Jun 22, 2024
cd634e9
Fix reconnecting to realmd.
ratkosrb Jun 23, 2024
ea60861
No need to endian convert build twice.
ratkosrb Jun 23, 2024
03257ea
Add MaxSessionDuration to realmd (#2687)
0blu Jun 23, 2024
a403bec
Include stirng header in CreateThread.h
ratkosrb Jun 23, 2024
76be16f
Add CMD_XFER_ACCEPT support (#2691)
0blu Jun 25, 2024
1bbe6a8
Remove semicolon after include.
ratkosrb Jun 25, 2024
b175ca5
Fix build error in EnumFlag.
ratkosrb Jun 25, 2024
22146a7
Fix AuthSocket build.
ratkosrb Jun 25, 2024
c4dd43f
Code style fixes.
ratkosrb Jun 25, 2024
cbd8523
NativeIO: Add Linux support (#2696)
0blu Jun 30, 2024
d9254f4
Merge pull request #2697 from vmangos/development
ratkosrb Jul 1, 2024
3e5aa9c
Native networking for mangosd (#2707)
0blu Aug 7, 2024
2e4421e
Minor changes to native branch (#2715)
0blu Aug 9, 2024
b518e9f
Fix build with Visual Studio 2015 (#2717)
0blu Aug 11, 2024
1632f5c
Use backward library for stacktrace.
ratkosrb Aug 11, 2024
d335327
Fix extractors build.
ratkosrb Aug 12, 2024
ebfc7b8
Add missing includes.
ratkosrb Aug 12, 2024
2949fba
More missing includes.
ratkosrb Aug 12, 2024
fdce76d
Replace ACE_TSS in Database with non ACE implementation (#2718)
0blu Aug 23, 2024
4dd18c9
Add IO::Networking::DNS::ResolveDomain (#2722)
0blu Aug 26, 2024
ff12710
Increase max line length of `sConfig::Reload()`
0blu Aug 20, 2024
04eea38
Rename `sConfig.SetSource()`
0blu Aug 20, 2024
529259e
Add `std::expected` backport
0blu Aug 23, 2024
38b2fb7
ServiceWin32 use `nullptr` instead of `0`
0blu Aug 23, 2024
a566778
Replace `ACE/get_opt` with custom `ArgparseForServer`
0blu Aug 23, 2024
095a260
Merge pull request #2723 from 0blu/native-argparse
ratkosrb Aug 27, 2024
c2882c3
Use std::chrono instead of ACE Time
0blu Aug 23, 2024
026dd9e
Merge pull request #2724 from 0blu/native-time
ratkosrb Aug 27, 2024
e77012c
Move mangos remote stuff in separate folder
0blu Aug 23, 2024
b2d7378
Logical const-correctness for sConfig
0blu Aug 24, 2024
eb9630d
Add `sConfig.IsSet`
0blu Aug 24, 2024
1d7e802
Add `AsyncSocket::ReadSome`
0blu Aug 24, 2024
5c76ab9
Add `AsyncSocket::ReadSome`
0blu Aug 25, 2024
6dc90a7
Move `array_deleter` into separate header
0blu Aug 25, 2024
3e955e2
Remove ACE from `RASocket`
0blu Aug 25, 2024
4642008
RASocket add support for telnet negotiation
0blu Aug 25, 2024
2d1f188
Merge pull request #2727 from 0blu/native-mangos-ra
ratkosrb Aug 27, 2024
95f3270
Move gSOAP into a diffrent folder
0blu Aug 26, 2024
9993ddc
Update gSOAP `2.7.10` (2008) to `2.8.135` (2024)
0blu Aug 26, 2024
f5dce5d
Fix double free in SOAP code
0blu Aug 26, 2024
8c3f71f
Merge pull request #2730 from 0blu/native-mangos-update-gsoap
ratkosrb Aug 27, 2024
7c571cd
Add `IO::Networking::IpAddress::FromIpv4Uint32`
0blu Aug 26, 2024
63dfc7a
Add SOAP without ACE
0blu Aug 26, 2024
1bb32a5
`Warden::GetModuleNames` without ACE
0blu Aug 26, 2024
6b17295
`IsIPAddress` without ACE
0blu Aug 26, 2024
13a3e4a
`Log::WaitBeforeContinueIfNeed` sleep without ACE
0blu Aug 26, 2024
9bf7b77
Replace ACE specific numeric types with std:: ones
0blu Aug 26, 2024
b17363a
Remove unused `DelayExecutor`
0blu Aug 26, 2024
87aca53
Don't print ACE version on startup
0blu Aug 26, 2024
ac58929
Remove ACE include from `mangosd/Master.cpp`
0blu Aug 26, 2024
e894710
Remove ACE include from `realmd/AuthSocket.cpp`
0blu Aug 26, 2024
72e0a2b
Remove `LockedQueue` from `Common.h`
0blu Aug 27, 2024
7f89982
Always show warnings. Disable locally if needed.
0blu Aug 27, 2024
9b71eaa
Remove code for Solaris in `Common.h`
0blu Aug 27, 2024
5ec3c4d
Remove ACE from `sprintf` formatting macros
0blu Aug 27, 2024
6b1d8a1
Remove `countof` macro
0blu Aug 27, 2024
8316870
Remove networking includes stuff from `Common.h`
0blu Aug 27, 2024
edf34c8
Remove ACE from `Common.h`
0blu Aug 27, 2024
286f285
Fix `world-daemon` logging name
0blu Aug 27, 2024
78e3370
Fix missing includes
0blu Aug 27, 2024
ab442db
Add `#undef main` to realmd and mangosd
0blu Aug 27, 2024
afa1065
Fix linux build
0blu Aug 27, 2024
50c48e1
AsyncSocket non generic and offload to cpp file
0blu Aug 27, 2024
26226ab
NativeIO: Set atomic state before `::WSASend/Recv`
0blu Aug 27, 2024
ee78492
Merge pull request #2731 from 0blu/native-mangos-gsoap-without-ace
ratkosrb Aug 28, 2024
b7687bb
Merge pull request #2732 from 0blu/native-warden-fix
ratkosrb Aug 28, 2024
f48d8ab
Merge pull request #2733 from 0blu/native-remove-ace-header
ratkosrb Aug 28, 2024
0680ce0
Merge pull request #2734 from 0blu/native-non-generic-asyncsocket2
ratkosrb Aug 28, 2024
f371547
Merge pull request #2736 from vmangos/development
ratkosrb Aug 28, 2024
2b3bda5
Native: Remove even more ACE includes
0blu Aug 28, 2024
3d522b2
Fix usage of `MANGOS_ASSERT` (add `;` at end)
0blu Aug 29, 2024
78b9b04
Add `jeremy-rifkin/cpptrace` to repo tree
0blu Aug 29, 2024
405408f
Remove Replaced `backward.hpp` with `cpptrace`
0blu Aug 29, 2024
a0b378f
Merge pull request #2742 from 0blu/native-move-stacktrace-to-cpp-file
ratkosrb Aug 29, 2024
24a37c7
Add `IO::Utils::GetCurrentProcessId()`
0blu Aug 29, 2024
d4e6a69
Remove ACE headers for global Windows.h import 😭
0blu Aug 29, 2024
cc3307a
Remove last references of ACE in code and CMake
0blu Aug 29, 2024
692be45
Native: Fix Linux build after ACE removal
0blu Aug 29, 2024
9310ef4
Fix macOS build
0blu Aug 29, 2024
f8f08c1
Fix Linux build of mmap/MapBuilder.cpp
0blu Aug 29, 2024
21ca640
Merge pull request #2743 from 0blu/native-remove-ace-finally
ratkosrb Aug 30, 2024
6f787e6
Fix missing argument in a `sLog.Out()` call
0blu Aug 30, 2024
2909b75
Move `array_deleter` to `MaNGOS::Memory` namespace
0blu Aug 30, 2024
ac4c98b
Create `MaNGOS::Memory::no_deleter`
0blu Aug 30, 2024
c992a61
Move realmd packets to file `AuthPackets.h`
0blu Aug 30, 2024
f3395ce
Use `XFER_DATA_CHUNK*` instead of `uint8*`
0blu Aug 30, 2024
92af06b
Add `IO::Filesystem::FileHandle::Seek`
0blu Aug 30, 2024
3fb32fa
Readd `CMD_XFER_RESUME`
0blu Aug 30, 2024
fe2e36e
Remove `typedef` of `struct`s in AuthPackets
0blu Aug 30, 2024
5ce83ff
Use real `XFER_INIT` packet
0blu Aug 30, 2024
5f0106a
Merge pull request #2745 from 0blu/native-xfer-resume
ratkosrb Aug 30, 2024
03a1e98
Add `gulrak/filesystem`
0blu Aug 30, 2024
5904339
Replace some IO::Filesystem with std::filesystem
0blu Aug 30, 2024
4f2a255
Add `MaNGOS::Policies::NoCopyNoMove`
0blu Aug 31, 2024
b60a24a
Fix shutdown crash when with `ThreadSpecificPtr`
0blu Aug 31, 2024
f2ef52a
Merge pull request #2748 from 0blu/native-fix-tss
ratkosrb Aug 31, 2024
03f7c47
Fix RaspberryPi build
0blu Aug 31, 2024
d8adf2f
Native IO: Changed internal `ipv4` representation
0blu Aug 31, 2024
5809c11
Rename `nostd::expected` to `nonstd::expected`
0blu Aug 31, 2024
e32e50a
Refactor `IO::Networking::AsyncServer`
0blu Sep 2, 2024
bc19080
`IO::ReadableBuffer` to replace all buffers types
0blu Sep 2, 2024
d37da10
`ReadableBuffer` rename `ByteBuffer` member
0blu Sep 4, 2024
5f53005
Fix missing `;`
0blu Sep 4, 2024
fee4aa5
Enforce `;` at end of `MANGOS_DEBUG_ASSERT`
0blu Sep 4, 2024
691ef1b
Fix Linux build after AsyncSocketAcceptor refactor
0blu Sep 4, 2024
0a0af98
Fix windows build
0blu Sep 4, 2024
bb0c162
Rename file to `ReadableBuffer.h`
0blu Sep 4, 2024
4beb432
Fix typo `GetLeastUsedIoContext`
0blu Sep 4, 2024
53777b5
Add comment to `IO::ReadableBuffer`
0blu Sep 4, 2024
7e50e26
Merge pull request #2749 from 0blu/native-refactor-net-server
ratkosrb Sep 5, 2024
b374c06
Add connect feature for sockets
0blu Sep 5, 2024
6bc3c49
Fix mac build
0blu Sep 5, 2024
6161309
Update cpptrace to fix Visual Studio 2015 bug
0blu Sep 5, 2024
2ef457f
Merge pull request #2753 from 0blu/native-fix-cpptrace-vs14
ratkosrb Sep 5, 2024
a7897d1
Merge pull request #2752 from 0blu/native-socket-connector
ratkosrb Sep 5, 2024
af63ec8
Fix realmd build.
ratkosrb Sep 6, 2024
6ea706a
Native IO Documentation
0blu Sep 7, 2024
1eaa04f
Merge pull request #2754 from 0blu/native-documentation
ratkosrb Sep 7, 2024
d9f17f6
Merge pull request #2746 from 0blu/native-some-std-filesystem
ratkosrb Sep 7, 2024
1d18a61
Revert "Native Branch: Replace parts of `IO::Filesystem` with C++17 `…
ratkosrb Sep 7, 2024
e68c966
Fix WinXP bug. lol
0blu Sep 7, 2024
fe12603
Fix more potential errors on windows
0blu Sep 7, 2024
fee4a3b
Use `inet_pton` instead of `inet_addr`
0blu Sep 7, 2024
4a7960a
Change `cmake_minimum_required` of `cpptrace`
0blu Sep 7, 2024
eb2d287
Add dependencies to `3rd Party` cmake folder group
0blu Sep 7, 2024
60ddc5c
Add comment how to use `EnumFlag`
0blu Sep 7, 2024
2e30f60
Remove `FileOpenFlags`
0blu Sep 7, 2024
29aacce
Add comment to `Errors.h`
0blu Sep 9, 2024
9fa88c6
log stacktrace to `sLog` instead of `std::cout`
0blu Sep 9, 2024
242a9e9
Remove ACE stuff from github buildaction
0blu Sep 9, 2024
5025e3d
Update `cpptrace` to fix 32bit bug
0blu Sep 13, 2024
9b277c9
AsyncSocketAcceptor only log on real error
0blu Sep 13, 2024
3b18cdf
"Lowered" log level of mostly uninteresting logs
0blu Sep 13, 2024
0bf3237
Reason for `IO::ReadableBuffer`
0blu Sep 13, 2024
6c9e0a6
Merge pull request #2761 from 0blu/native-some-changes-1
ratkosrb Sep 14, 2024
8a9a39a
Fix cmake error.
ratkosrb Sep 14, 2024
ab4cc77
Merge pull request #2763 from vmangos/development
ratkosrb Sep 14, 2024
907c08d
Fix RaspberryPI build
Nolin7777 Sep 14, 2024
607116e
Remove unnecessary include. (#2764)
schell244 Sep 14, 2024
0f40bf9
RaspberryPi Fixes (#2765)
schell244 Sep 15, 2024
ff592ab
cpp trace version change
0blu Sep 15, 2024
f114e9d
Merge pull request #2768 from 0blu/cpptrace-fix
ratkosrb Sep 16, 2024
96cdcc4
Fix incorrect `Networking::IsInSameSubnet` check
0blu Sep 16, 2024
81f134e
Add comment
0blu Sep 16, 2024
0330866
Nolint non initialized internal union
0blu Sep 16, 2024
cb060ad
IPAddress: rename `getType` to `GetType`
0blu Sep 16, 2024
e6c4c39
IoContext, yield once on error
0blu Sep 16, 2024
5973bad
Dont crash on missing migrations
0blu Sep 16, 2024
c75ba67
Merge pull request #2770 from 0blu/ip-subnet-check-fix
ratkosrb Sep 17, 2024
b38dd07
Update `cpptrace` dependency to version `0.7.1`
0blu Sep 17, 2024
5465f01
Hide `cpptrace` cmake variables
0blu Sep 17, 2024
05d617f
Testing native ip
0blu Sep 13, 2024
cd4e0bc
Fix indent
0blu Sep 16, 2024
954a7b9
Add `UndefinedErrorType` to `GetErrorBaseString`
0blu Sep 16, 2024
0b4ef09
Fix protocol parser
0blu Sep 16, 2024
783cbb8
Add `SplitStringByDelimiter` util
0blu Sep 16, 2024
30f268a
Proxy comment
0blu Sep 16, 2024
f75dad8
Changed default `WaitAtStartupError`
0blu Sep 16, 2024
788af92
Fixup default `WaitAtStartupError `
0blu Sep 16, 2024
b127da2
Fixup default WaitAtStartupError 2
0blu Sep 16, 2024
1f193fd
Add `TrustedProxyServers` to config
0blu Sep 16, 2024
2c3bccc
Rename `InitializeAndFixateMemoryLocation`
0blu Sep 16, 2024
31e636f
IP comment
0blu Sep 17, 2024
32b70e3
Fixup, Error ToString
0blu Sep 17, 2024
13d344f
IP Address `toString` -> `ToString`
0blu Sep 17, 2024
b08a220
Fixup InitializeAndFixateMemoryLocation
0blu Sep 17, 2024
12a5bd5
Fixup SplitStringByDelimiter
0blu Sep 17, 2024
a251e5f
Fixup ProxyV2Reader
0blu Sep 17, 2024
3788d87
WorldSocket header optimization.
0blu Sep 17, 2024
b1662cc
Mangosd add `TrustedProxyServers`
0blu Sep 17, 2024
a02eb3f
Realmd add `TrustedProxyServers`
0blu Sep 17, 2024
37b832c
Fix unix build
0blu Sep 17, 2024
a14d299
Merge pull request #2771 from 0blu/native-proxy-protocol-real-ip
ratkosrb Sep 18, 2024
89a399f
Improve `SystemErrorToString`
0blu Sep 22, 2024
c1c4927
Resolve IP addresses without touching DNS layer
0blu Sep 22, 2024
54c7538
RealmList DNS resolve
0blu Sep 22, 2024
8eb16b5
Merge pull request #2774 from 0blu/realmlist-dns
ratkosrb Sep 23, 2024
ce22bf7
Fix Apple Silicon Build
Nolin7777 Sep 23, 2024
0096b51
Fix uninitialized IP string in `AuthHandler`
0blu Sep 23, 2024
a443e7e
Remove deprecated `std::unexpected`
0blu Sep 23, 2024
612e8aa
Add `IO::Networking::DNS::SelectionStrategy`
0blu Sep 23, 2024
e1f8888
Fix crash if unable to bind port
0blu Sep 23, 2024
60a3ca7
Print human readable error on ::bind() error
0blu Sep 23, 2024
2f79467
Merge pull request #2777 from 0blu/native-realmd-no-init-ip
ratkosrb Sep 25, 2024
fdcae22
Merge branch 'development' of https://github.com/vmangos/core into HEAD
0blu Sep 26, 2024
2106888
`PrintStacktrace` show error if no debug symbols
0blu Sep 26, 2024
78f4183
Re-add `OpenWorldLogFiles` at main
0blu Sep 30, 2024
bbe66ba
Add `LogFile.Network` to config
0blu Sep 30, 2024
1812d0d
Minor code style fixes
0blu Sep 30, 2024
7d594f4
Merge remote-tracking branch 'upstream/development' into native-devel…
0blu Sep 30, 2024
cb7d1ef
`barGoLink` -> `BarGoLink`
0blu Oct 2, 2024
0de6df1
Fix asserts in `BarGoLink`
0blu Oct 2, 2024
ee5a2bc
Remove unnecessary cast for `BarGoLink`
0blu Oct 2, 2024
a29ae88
Update `Errors.h` comments
0blu Oct 2, 2024
aca217a
Add `<cstring>` to `ProxyV2Reader.cpp`
0blu Oct 3, 2024
335d508
Merge remote-tracking branch 'upstream/development' into native-devel…
0blu Oct 3, 2024
4bbe3f3
NativeIO: Fix ignored `EPOLLERR` on Linux
0blu Oct 9, 2024
c3c924b
Fix epoll context switch race condition
0blu Oct 10, 2024
2a7abcd
Merge remote-tracking branch 'upstream/development' into native
0blu Oct 10, 2024
7517f6c
Remove unnecessary "[ERROR]" prefix on some logs
0blu Oct 12, 2024
418cea4
Replace `SystemErrorToCString` with `SystemErrorToString`
0blu Oct 12, 2024
62bf2ce
Set `m_writeSrcAlreadyTransferred` when send buffer is set
0blu Oct 12, 2024
604f6b8
Remove even more ACE references
0blu Oct 13, 2024
39a6cde
Improve WorldSocket packet send logic
0blu Oct 13, 2024
77e76ef
Improve network log output
0blu Oct 18, 2024
9e8b78c
Improve network multithreading asserts
0blu Oct 18, 2024
05748f0
Fix world shutdown signal
0blu Oct 18, 2024
ede48a3
Native: posix, close socket then report error
0blu Oct 22, 2024
22fcfab
Native: only print socket error if not closing
0blu Oct 22, 2024
174d1a2
Native: Print more messages on shutdown
0blu Oct 22, 2024
f3024e3
Don't trigger Aspect of the Cheetah daze from non damaging spells.
ratkosrb Oct 13, 2024
3b650c3
Don't trigger Sweeping Strikes from Rend.
ratkosrb Oct 14, 2024
b00837b
Rename local variables in GetWeaponBasedAuraModifier.
ratkosrb Oct 14, 2024
a88e798
Improve handler of Forsaken Skills. (#2799)
Gamemechanicwow Oct 14, 2024
5f4aff8
Add missing relations for quest Mortal Champions.
ratkosrb Oct 15, 2024
4b495bb
Remove reference to TBC rank of healthstone. (#2800)
Gamemechanicwow Oct 15, 2024
ae75dbb
Fix typo in game_tele (#2801)
Stoabrogga Oct 18, 2024
616099a
Improve tele command (#2797)
Stoabrogga Oct 19, 2024
62e0daa
`SetNativeSocketOption` report error when socket is closed
0blu Nov 1, 2024
ff63608
Add some comments
0blu Nov 1, 2024
948f066
Native Posix: Use `::shutdown()` instead of `::close()`
0blu Nov 1, 2024
41b6d19
Fix cmake.
ratkosrb Nov 1, 2024
4789587
Merge remote-tracking branch 'upstream/development' into native
0blu Nov 4, 2024
6cbc7e1
Remove openssl from ClientPatchCache
0blu Nov 4, 2024
d784838
Fix linux build
0blu Nov 4, 2024
8a78b31
Fix mail sender on native branch
0blu Nov 4, 2024
bc67512
Merge remote-tracking branch 'upstream/development' into native
0blu Nov 5, 2024
9ece52c
Fix MAILSENDER on `native`
0blu Nov 5, 2024
2dc1e47
Add diff for manual cpptrace changes
0blu Nov 5, 2024
01bfa88
Merge remote-tracking branch 'upstream/development' into native
0blu Nov 12, 2024
1d64bc9
Native,Windows: Fix shutdown `IoContext` stuck bug
0blu Nov 12, 2024
df2868d
Merge remote-tracking branch 'upstream/development' into native
0blu Nov 13, 2024
0a20d5b
Merge remote-tracking branch 'upstream/development' into native
0blu Nov 17, 2024
7e9f308
Merge remote-tracking branch 'upstream/development' into native
0blu Nov 17, 2024
1c80773
IO::Networking::IpAddress `==` operator
0blu Nov 19, 2024
58f05d5
Merge remote-tracking branch 'upstream/development' into native
0blu Nov 19, 2024
8f140e6
Merge remote-tracking branch 'upstream/development' into native
0blu Dec 7, 2024
4c68310
Merge remote-tracking branch 'upstream/development' into native
0blu Dec 8, 2024
67c35f4
Fix indentation in IpAddress.cpp
0blu Dec 8, 2024
ea1c5d3
Fix compiler note for missing forward declaration
0blu Dec 10, 2024
43af32f
Use different log level for failed but non critical `::recv()` call
0blu Dec 10, 2024
528e018
Merge remote-tracking branch 'upstream/development' into native
0blu Dec 10, 2024
7452743
Fix reconnecting to realmd.
ratkosrb Dec 12, 2024
9e3f0e1
Skip MinRealmListDelay check on first connection (#2848)
schell244 Dec 13, 2024
dfead75
Merge branch 'native' into dev_copy
ratkosrb Dec 31, 2024
512772f
Merge pull request #2856 from vmangos/dev_copy
ratkosrb Dec 31, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 0 additions & 36 deletions .drone.yml

This file was deleted.

22 changes: 3 additions & 19 deletions .github/workflows/dev-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ on:
- '.github/workflows/db_check.yml'
- '.github/workflows/db_dump.yml'
- 'sql/**'
- '.drone.yml'
- 'README.md'
- 'LICENSE'
- '.gitignore'
Expand All @@ -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
Expand All @@ -52,11 +41,7 @@ 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 -DBUILD_FOR_HOST_CPU=0 -DUSE_EXTRACTORS=1 -G "Visual Studio 16 2019" -A x64 ..
Expand All @@ -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
Expand Down
22 changes: 3 additions & 19 deletions .github/workflows/vmangos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ on:
- '.github/workflows/db_check.yml'
- '.github/workflows/db_dump.yml'
- 'sql/**'
- '.drone.yml'
- 'README.md'
- 'LICENSE'
- '.gitignore'
Expand All @@ -29,7 +28,6 @@ on:
- '.github/workflows/db_check.yml'
- '.github/workflows/db_dump.yml'
- 'sql/**'
- '.drone.yml'
- 'README.md'
- 'LICENSE'
- '.gitignore'
Expand Down Expand Up @@ -57,27 +55,17 @@ jobs:
if: matrix.os == 'ubuntu-latest'
run: |
sudo apt-get -qq update
sudo apt-get -qq install build-essential cmake libace-dev libmysql++-dev libtbb-dev libcurl4-openssl-dev openssl
sudo apt-get -qq install build-essential cmake libmysql++-dev libtbb-dev libcurl4-openssl-dev 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
Expand All @@ -99,10 +87,6 @@ jobs:
- name: windows build & install
if: matrix.os == 'windows-2019'
run: |
# Build ACE
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
# Build CURL
cd $GITHUB_WORKSPACE/dep/windows/optional_dependencies/
./curl_download_and_build.bat
Expand Down
15 changes: 1 addition & 14 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -83,19 +83,6 @@ set(CMAKE_INSTALL_RPATH ${LIBS_DIR})
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)

# Find needed packages and if necessery abort if something important is missing
unset(ACE_INCLUDE_DIR CACHE)
unset(ACE_LIBRARIES CACHE)
unset(ACE_LIBRARIES_DIR CACHE)
unset(ACE_INCLUDE_DIR)
unset(ACE_LIBRARIES)
unset(ACE_LIBRARIES_DIR)

find_package(ACE)
if(NOT ACE_FOUND)
message(FATAL_ERROR
"This project requires ACE installed. Please download the ACE Micro Release Kit from http://download.dre.vanderbilt.edu/ and install it. If this script didn't find ACE and it was correctly installed please set ACE_ROOT to the correct path."
)
endif()

if(NOT USE_STD_MALLOC)
unset(TBB_INCLUDE_DIRS CACHE)
Expand Down
81 changes: 0 additions & 81 deletions cmake/find/FindACE.cmake

This file was deleted.

5 changes: 0 additions & 5 deletions contrib/mmap/src/MMapCommon.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@
#ifndef _MMAP_COMMON_H
#define _MMAP_COMMON_H

// stop warning spam from ACE includes
#ifdef _WIN32
# pragma warning( disable : 4996 )
#endif

#include <string>
#include <vector>

Expand Down
1 change: 1 addition & 0 deletions contrib/mmap/src/MapBuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include "Maps/GridMapDefines.h"
#include "DetourNavMeshBuilder.h"
#include "DetourCommon.h"
#include <climits>

using namespace VMAP;

Expand Down
1 change: 0 additions & 1 deletion contrib/mmap/src/MapBuilder.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
#include "TileWorker.h"

using namespace VMAP;
// G3D namespace typedefs conflicts with ACE typedefs

using json = nlohmann::json;

Expand Down
9 changes: 9 additions & 0 deletions dep/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,12 @@ add_subdirectory(gsoap)
if (USE_EXTRACTORS)
add_subdirectory(libmpq)
endif()

add_subdirectory(cpptrace)
set_target_properties(cpptrace-lib PROPERTIES FOLDER "3rd Party")
get_cmake_property(variables CACHE_VARIABLES) # hide "CPPTRACE_*" variables in default cmake config
foreach(variable ${variables})
if(variable MATCHES "^CPPTRACE_")
mark_as_advanced(${variable})
endif()
endforeach()
Loading
Loading