Merge pull request #57 from vmangos/development

11
mygithome002 · Dec 12, 2024 · feb0e46 · feb0e46
2 parents 55f31d2 + 1cb0126
commit feb0e46
Show file tree

Hide file tree

Showing 272 changed files with 45,602 additions and 24,469 deletions.
diff --git a/.clang-format b/.clang-format
@@ -0,0 +1,54 @@
+---
+Language: Cpp
+BasedOnStyle: LLVM
+AccessModifierOffset: -4
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignOperands: false
+AlignTrailingComments: false
+AlwaysBreakTemplateDeclarations: Yes
+BraceWrapping: 
+  AfterCaseLabel: true
+  AfterClass: true
+  AfterControlStatement: true
+  AfterEnum: true
+  AfterFunction: true
+  AfterNamespace: true
+  AfterStruct: true
+  AfterUnion: true
+  AfterExternBlock: false
+  BeforeCatch: true
+  BeforeElse: true
+  BeforeLambdaBody: true
+  BeforeWhile: true
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakBeforeBraces: Custom
+BreakConstructorInitializers: AfterColon
+BreakConstructorInitializersBeforeComma: false
+ColumnLimit: 999
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+IncludeCategories: 
+  - Regex: '^<.*'
+    Priority: 1
+  - Regex: '^".*'
+    Priority: 2
+  - Regex: '.*'
+    Priority: 3
+IncludeIsMainRegex: '([-_](test|unittest))?$'
+IndentCaseBlocks: true
+IndentWidth: 4
+InsertNewlineAtEOF: true
+MacroBlockBegin: ''
+MacroBlockEnd: ''
+MaxEmptyLinesToKeep: 2
+NamespaceIndentation: All
+PointerAlignment: Left
+SpaceInEmptyParentheses: false
+SpacesInAngles: false
+SpacesInConditionalStatement: false
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+TabWidth: 4
+...
diff --git a/.editorconfig b/.editorconfig
@@ -1,8 +1,22 @@
 root = true
 
-[*]
+[{*.h,*.c,*.hpp,*.cpp}]
+charset = utf-8
+insert_final_newline = true
 indent_style = space
 indent_size = 4
-charset = utf-8
+tab_width = 16 # <-- To instantly see when a TAB was used
 trim_trailing_whitespace = true
+max_line_length = 999
+
+[*.md]
+charset = utf-8
 insert_final_newline = true
+indent_style = space
+
+[{*.cmake,CMakeLists.txt}]
+charset = utf-8
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
diff --git a/.github/workflows/dev-release.yml b/.github/workflows/dev-release.yml
@@ -59,7 +59,7 @@ jobs:
         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 ..
+        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
@@ -89,56 +89,13 @@ jobs:
     - name: Archive this artefact
       uses: actions/upload-artifact@v4
       with:
-          name: snapshot-devbuild-without-anticheat
-          path: "${{github.workspace}}/bin/${{env.ARCHIVE_FILENAME}}"
-
-    #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 ..
-        /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
-    - name: Create Upload File Name
-      run: |
-          echo "ARCHIVE_FILENAME=${{ github.event.repository.name }}-$(git rev-parse --short HEAD)-with-anticheat.zip" >> $env:GITHUB_ENV
-    - name: Archive files
-      run: |
-          #data is in Release folder
-          cd ${{github.workspace}}/bin
-          copy ${{github.workspace}}/tbb/bin/intel64/vc14/tbb.dll ${{github.workspace}}/bin/Release/tbb.dll
-          copy ${{github.workspace}}/tbb/bin/intel64/vc14/tbb_debug.dll ${{github.workspace}}/bin/Release/tbb_debug.dll
-          copy ${{github.workspace}}/tbb/bin/intel64/vc14/tbb_preview.dll ${{github.workspace}}/bin/Release/tbb_preview.dll
-          copy ${{github.workspace}}/tbb/bin/intel64/vc14/tbb_preview_debug.dll ${{github.workspace}}/bin/Release/tbb_preview_debug.dll
-          copy ${{github.workspace}}/tbb/bin/intel64/vc14/tbbmalloc.dll ${{github.workspace}}/bin/Release/tbbmalloc.dll
-          copy ${{github.workspace}}/tbb/bin/intel64/vc14/tbbmalloc_debug.dll ${{github.workspace}}/bin/Release/tbbmalloc_debug.dll
-          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
-          copy ${{github.workspace}}/dep/windows/lib/x64_release/libeay32.dll ${{github.workspace}}/bin/Release/libeay32.dll
-
-          7z a -tzip ${{env.ARCHIVE_FILENAME}} Release
-    - name: Archive this artefact
-      uses: actions/upload-artifact@v4
-      with:
-          name: snapshot-devbuild-with-anticheat
+          name: snapshot-devbuild
           path: "${{github.workspace}}/bin/${{env.ARCHIVE_FILENAME}}"
 
     - name: Download artifact snapshot-Release
       uses: actions/download-artifact@v4
       with:
-        pattern: snapshot-devbuild-*
+        pattern: snapshot-devbuild
         merge-multiple: true
         path: all_snapshots
 

diff --git a/.github/workflows/vmangos.yml b/.github/workflows/vmangos.yml
@@ -57,7 +57,7 @@ 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 libace-dev libmysql++-dev libtbb-dev libcurl4-openssl-dev openssl
       #windows dependencies
     - name: windows dependencies
       if: matrix.os == 'windows-2019'
@@ -92,21 +92,25 @@ jobs:
         mkdir build
         mkdir _install
         cd build
-        cmake ../ -DCMAKE_INSTALL_PREFIX=../_install -DWITH_WARNINGS=0 -DUSE_EXTRACTORS=1
+        cmake ../ -DCMAKE_INSTALL_PREFIX=../_install -DWITH_WARNINGS=0 -DUSE_EXTRACTORS=1 -DENABLE_MAILSENDER=1
         make -j2
         make install
     #windows
     - name: windows build & install
       if: matrix.os == 'windows-2019'
       run: |
-        #directory variables
+        # 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
+        # Build actual project
         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 ..
+        cmake -D TBB_ROOT_DIR=$GITHUB_WORKSPACE/tbb -DWITH_WARNINGS=0 -DUSE_EXTRACTORS=1 -DENABLE_MAILSENDER=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
diff --git a/.gitignore b/.gitignore
@@ -35,8 +35,10 @@ cmake-build-*
 #
 # Top-level generic files
 #
-bin
-build
+/bin/
+/build/
+/run/
+/opt/
 tags
 TAGS
 !.gitignore

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,8 +35,10 @@ cmake-build-* @@
     #
     # Top-level generic files
     #
-    bin
-    build
+    /bin/
+    /build/
+    /run/
+    /opt/
     tags
     TAGS
     !.gitignore
@@ Expand Down @@