Fix playeritemgossip_master build after upstream master merge

.circleci/config.yml

@@ -91,7 +91,7 @@ jobs:
             docker build --file Dockerfile --force-rm --tag $image_prefix:$CIRCLE_SHA1 --tag $image_prefix:$(echo $CIRCLE_BRANCH | tr '/' '-' | tr '[:upper:]' '[:lower:]') .
             docker save $image_prefix | gzip > ../../docker.tar.gz
             if [ "$DOCKERHUB_PUSH_IMAGES" == "TRUE" ]; then
-              if [ "$CIRCLE_BRANCH" == "3.3.5" ] || [ "$CIRCLE_BRANCH" == "master" ] || [ "$CIRCLE_BRANCH" == "wotlk_classic" ]; then
+              if [ "$CIRCLE_BRANCH" == "3.3.5" ] || [ "$CIRCLE_BRANCH" == "master" ]; then
                 docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
                 echo "Pushing docker image to dockerhub"
                 docker push --all-tags $image_prefix
@@ -135,7 +135,7 @@ jobs:
             ccache -s
             git config user.email "circleci@build.bot" && git config user.name "Circle CI"
             $CXX --version
-            cmake -S . -B ./bin -DWITH_WARNINGS=1 -DWITH_WARNINGS_AS_ERRORS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=0 -DUSE_SCRIPTPCH=0 -DTOOLS=1 -DSCRIPTS=dynamic -DSERVERS=1 -DNOJEM=0 -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=bin/check_install
+            cmake -S . -B ./bin -DWITH_WARNINGS=1 -DWITH_WARNINGS_AS_ERRORS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=0 -DUSE_SCRIPTPCH=0 -DTOOLS=1 -DSCRIPTS=dynamic -DSERVERS=1 -DNOJEM=0 -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG -g0" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG -g0" -DCMAKE_INSTALL_PREFIX=bin/check_install
       - run:
           name: Build
           command: |
@@ -155,4 +155,3 @@ workflows:
     jobs:
       - codestyle_and_sql
       - pch
-      - nopch

.github/workflows/linux-build.yml

@@ -0,0 +1,78 @@
+name: Ubuntu x64
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - cc: gcc-13
+            cxx: g++-13
+            pch: 1
+            launcher: 
+          - cc: clang-17
+            cxx: clang++-17
+            pch: 1
+            launcher: 
+          - cc: clang-17
+            cxx: clang++-17
+            pch: 0
+            launcher: ccache
+    steps:
+    - uses: actions/checkout@v5
+    - name: Set reusable strings
+      id: strings
+      shell: bash
+      run: |
+        echo "build-start=$EPOCHSECONDS" >> "$GITHUB_OUTPUT"
+        echo "build-output-dir=${{ github.workspace }}/bin" >> "$GITHUB_OUTPUT"
+        echo "ccache-key-prefix=ubuntu-${{ matrix.cc }}-${{ github.base_ref || github.ref_name }}" >> "$GITHUB_OUTPUT"
+    - name: Dependencies
+      run: |
+        sudo apt-get update && sudo apt-get install -yq ccache libboost-dev libboost-filesystem-dev libboost-locale-dev libboost-program-options-dev libboost-regex-dev libboost-thread-dev libssl-dev libreadline-dev zlib1g-dev libbz2-dev
+    - name: Restore nopch cache
+      id: ccache-restore
+      if: ${{ matrix.pch == '0' }}
+      uses: actions/cache@v4
+      with:
+        path: ${{ github.workspace }}/.ccache
+        key: ${{ steps.strings.outputs.ccache-key-prefix }}-${{ github.ref_name }}-${{ github.sha }}
+        restore-keys: |
+          ${{ steps.strings.outputs.ccache-key-prefix }}-${{ github.ref_name }}-
+          ${{ steps.strings.outputs.ccache-key-prefix }}-
+    - name: Setup
+      env:
+        CMAKE_BUILD_TYPE: Debug
+        CMAKE_C_COMPILER_LAUNCHER: ${{ matrix.launcher }}
+        CMAKE_CXX_COMPILER_LAUNCHER: ${{ matrix.launcher }}
+        CC: /usr/bin/${{ matrix.cc }}
+        CXX: /usr/bin/${{ matrix.cxx }}
+      run: >
+        cmake -GNinja -S ${{ github.workspace }} -B ${{ steps.strings.outputs.build-output-dir }}
+        -DWITH_WARNINGS=1 -DWITH_WARNINGS_AS_ERRORS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=${{ matrix.pch }} -DUSE_SCRIPTPCH=${{ matrix.pch }} -DTOOLS=1 -DSCRIPTS=dynamic -DSERVERS=1 -DNOJEM=0
+        -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG -g0" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG -g0"
+        -DCMAKE_INSTALL_PREFIX=check_install -DBUILD_TESTING=1
+    - name: Build
+      env:
+        CCACHE_BASEDIR: ${{ github.workspace }}
+        CCACHE_DIR: ${{ github.workspace }}/.ccache
+        CCACHE_CPP2: 1
+      run: |
+        ccache -z
+        cmake --build ${{ steps.strings.outputs.build-output-dir }}
+        ccache -s
+        ccache --evict-older-than $(($EPOCHSECONDS - ${{ steps.strings.outputs.build-start }}))s
+    - name: Unit tests
+      run: |
+        cmake --build ${{ steps.strings.outputs.build-output-dir }} --target test
+    - name: Check executables
+      run: |
+        cmake --install ${{ steps.strings.outputs.build-output-dir }}
+        cd ${{ github.workspace }}/check_install/bin
+        ./bnetserver --version
+        ./worldserver --version

.github/workflows/win-x64-build.yml

@@ -84,10 +84,10 @@ jobs:
       run: |
         cd ${{ steps.strings.outputs.build-output-dir }}/bin/${{ env.CMAKE_BUILD_TYPE }}
         copy "${{ env.MYSQL_ROOT_DIR }}/lib/libmysql.dll" libmysql.dll
-        copy "${{ env.OPENSSL_ROOT_DIR }}/bin/libssl-3-x64.dll" libssl-3-x64.dll
-        copy "${{ env.OPENSSL_ROOT_DIR }}/bin/libcrypto-3-x64.dll" libcrypto-3-x64.dll
-        copy "${{ env.OPENSSL_ROOT_DIR }}/bin/legacy.dll" legacy.dll
-      
+        # mysql may depend on a different version of openssl so copy its dlls first (override later with openssl's own if same version)
+        Copy-Item -Path "${{ env.MYSQL_ROOT_DIR }}/bin/*" -Include libcrypto*,libssl* -Destination .
+        Copy-Item -Path "${{ env.OPENSSL_ROOT_DIR }}/bin/*" -Include libcrypto*,libssl*,legacy* -Destination .
+
     - name: Check binaries
       run: |
         cd ${{ steps.strings.outputs.build-output-dir }}/bin/${{ env.CMAKE_BUILD_TYPE }}

cmake/compiler/msvc/settings.cmake

@@ -48,7 +48,7 @@ if("${CMAKE_MAKE_PROGRAM}" MATCHES "MSBuild")
   target_compile_options(trinity-compile-option-interface
     INTERFACE
       /MP)
-else()
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
   # Forces writes to the PDB file to be serialized through mspdbsrv.exe (/FS)
   # Enable faster PDB generation in parallel builds by minimizing RPC calls to mspdbsrv.exe (/Zf)
   target_compile_options(trinity-compile-option-interface

cmake/genrev.cmake

@@ -134,7 +134,7 @@ if(WIN32)
 	OUTPUT_STRIP_TRAILING_WHITESPACE
   )
   # Remove "Microsoft Windows" from the result
-  string(REGEX REPLACE "^.* Windows " "" TRINITY_BUILD_HOST_SYSTEM_RELEASE ${TRINITY_BUILD_HOST_SYSTEM_RELEASE})
+  string(REGEX REPLACE "^.* Windows " "" TRINITY_BUILD_HOST_SYSTEM_RELEASE "${TRINITY_BUILD_HOST_SYSTEM_RELEASE}")
 endif()
 
 if(CMAKE_SCRIPT_MODE_FILE)

cmake/macros/AutoCollect.cmake

@@ -8,39 +8,51 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-# Collects all source files into the given variable,
-# which is useful to include all sources in subdirectories.
-# Ignores full qualified directories listed in the variadic arguments.
+# Adds all found source files to a given target
 #
 # Use it like:
-# CollectSourceFiles(
+# CollectAndAddSourceFiles(
+#   common
 #   ${CMAKE_CURRENT_SOURCE_DIR}
-#   COMMON_PRIVATE_SOURCES
-#   # Exclude
+#   EXCLUDE
 #   ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders
-#   ${CMAKE_CURRENT_SOURCE_DIR}/Platform)
+#   ${CMAKE_CURRENT_SOURCE_DIR}/Platform
+#   HEADER_VISIBILITY PRIVATE) # default is PUBLIC, this controls whether other targets that have this target as dependency will be able to access its headers
 #
-function(CollectSourceFiles current_dir variable)
-  list(FIND ARGN "${current_dir}" IS_EXCLUDED)
+function(CollectAndAddSourceFiles target_name current_dir)
+  cmake_parse_arguments(PARSE_ARGV 2 arg "" "BASE_DIR;HEADER_VISIBILITY" "EXCLUDE")
+  if(NOT arg_BASE_DIR)
+    set(arg_BASE_DIR "${current_dir}")
+  endif()
+  if(NOT arg_HEADER_VISIBILITY)
+    set(arg_HEADER_VISIBILITY "PUBLIC")
+  endif()
+  list(FIND arg_EXCLUDE "${current_dir}" IS_EXCLUDED)
   if(IS_EXCLUDED EQUAL -1)
-    file(GLOB COLLECTED_SOURCES
+    cmake_path(RELATIVE_PATH current_dir BASE_DIRECTORY "${arg_BASE_DIR}" OUTPUT_VARIABLE fileset_name)
+    # normalize file set name
+    string(REGEX REPLACE "[./\\]" "_" fileset_name "${fileset_name}")
+
+    file(GLOB private_source_files
       ${current_dir}/*.c
       ${current_dir}/*.cc
-      ${current_dir}/*.cpp
+      ${current_dir}/*.cpp)
+
+    file(GLOB public_header_files
       ${current_dir}/*.inl
-      ${current_dir}/*.def
       ${current_dir}/*.h
       ${current_dir}/*.hh
       ${current_dir}/*.hpp)
-    list(APPEND ${variable} ${COLLECTED_SOURCES})
+
+    target_sources(${target_name} PRIVATE ${private_source_files})
+    target_sources(${target_name} ${arg_HEADER_VISIBILITY} FILE_SET "headers_${fileset_name}" TYPE HEADERS BASE_DIRS ${current_dir} FILES ${public_header_files})
 
     file(GLOB SUB_DIRECTORIES ${current_dir}/*)
     foreach(SUB_DIRECTORY ${SUB_DIRECTORIES})
       if(IS_DIRECTORY ${SUB_DIRECTORY})
-        CollectSourceFiles("${SUB_DIRECTORY}" "${variable}" "${ARGN}")
+        CollectAndAddSourceFiles("${target_name}" "${SUB_DIRECTORY}" BASE_DIR ${arg_BASE_DIR} HEADER_VISIBILITY ${arg_HEADER_VISIBILITY} EXCLUDE ${arg_EXCLUDE})
       endif()
     endforeach()
-    set(${variable} ${${variable}} PARENT_SCOPE)
   endif()
 endfunction()
 
@@ -52,20 +64,21 @@ endfunction()
 # CollectIncludeDirectories(
 #   ${CMAKE_CURRENT_SOURCE_DIR}
 #   COMMON_PUBLIC_INCLUDES
-#   # Exclude
+#   EXCLUDE
 #   ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders
 #   ${CMAKE_CURRENT_SOURCE_DIR}/Platform)
 #
-function(CollectIncludeDirectories current_dir variable)
-  list(FIND ARGN "${current_dir}" IS_EXCLUDED)
+function(CollectIncludeDirectories current_dir sources_variable)
+  cmake_parse_arguments(PARSE_ARGV 2 arg "" "" "EXCLUDE")
+  list(FIND arg_EXCLUDE "${current_dir}" IS_EXCLUDED)
   if(IS_EXCLUDED EQUAL -1)
-    list(APPEND ${variable} ${current_dir})
+    list(APPEND ${sources_variable} ${current_dir})
     file(GLOB SUB_DIRECTORIES ${current_dir}/*)
     foreach(SUB_DIRECTORY ${SUB_DIRECTORIES})
       if(IS_DIRECTORY ${SUB_DIRECTORY})
-        CollectIncludeDirectories("${SUB_DIRECTORY}" "${variable}" "${ARGN}")
+        CollectIncludeDirectories("${SUB_DIRECTORY}" "${sources_variable}" EXCLUDE ${arg_EXCLUDE})
       endif()
     endforeach()
-    set(${variable} ${${variable}} PARENT_SCOPE)
+    set(${sources_variable} ${${sources_variable}} PARENT_SCOPE)
   endif()
 endfunction()

cmake/options.cmake

@@ -37,6 +37,7 @@ option(TOOLS            "Build map/vmap/mmap extraction/assembler tools"
 option(USE_SCRIPTPCH    "Use precompiled headers when compiling scripts"              1)
 option(USE_COREPCH      "Use precompiled headers when compiling servers"              1)
 option(WITH_DYNAMIC_LINKING "Enable dynamic library linking."                         0)
+option(WITH_FILESYSTEM_WATCHER "Include filesystem watcher library"                   0)
 IsDynamicLinkingRequired(WITH_DYNAMIC_LINKING_FORCED)
 if(WITH_DYNAMIC_LINKING AND WITH_DYNAMIC_LINKING_FORCED)
   set(WITH_DYNAMIC_LINKING_FORCED OFF)
@@ -46,6 +47,9 @@ if(WITH_DYNAMIC_LINKING OR WITH_DYNAMIC_LINKING_FORCED)
 else()
   set(BUILD_SHARED_LIBS OFF)
 endif()
+if(WITH_FILESYSTEM_WATCHER OR BUILD_SHARED_LIBS)
+  set(BUILD_EFSW ON)
+endif()
 option(WITH_WARNINGS    "Show all warnings during compile"                            0)
 option(WITH_WARNINGS_AS_ERRORS "Treat warnings as errors"                             0)
 option(WITH_COREDEBUG   "Include additional debug-code in core"                       0)
@@ -55,8 +59,8 @@ option(COPY_CONF        "Copy authserver and worldserver .conf.dist files to the
 set(WITH_SOURCE_TREE    "hierarchical" CACHE STRING "Build the source tree for IDE's.")
 set_property(CACHE WITH_SOURCE_TREE PROPERTY STRINGS no flat hierarchical hierarchical-folders)
 option(WITHOUT_GIT      "Disable the GIT testing routines"                            0)
-option(BUILD_TESTING    "Build test suite" 0)
+option(BUILD_TESTING    "Build test suite"                                            0)
 
 if(UNIX)
-  option(USE_LD_GOLD    "Use GNU gold linker"                                        0)
+  option(USE_LD_GOLD    "Use GNU gold linker"                                         0)
 endif()

dep/CMakeLists.txt

@@ -20,7 +20,9 @@ if(SERVERS OR TOOLS)
   add_subdirectory(utf8cpp)
   add_subdirectory(valgrind)
   add_subdirectory(openssl)
-  add_subdirectory(jemalloc)
+  if(CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT NOJEM)
+    add_subdirectory(jemalloc)
+  endif()
   add_subdirectory(argon2)
   add_subdirectory(openssl_ed25519)
   add_subdirectory(short_alloc)
@@ -31,10 +33,13 @@ if(SERVERS)
   add_subdirectory(readline)
   add_subdirectory(gsoap)
   add_subdirectory(rapidjson)
-  add_subdirectory(efsw)
   add_subdirectory(protobuf)
 endif()
 
+if(SERVERS AND BUILD_EFSW)
+  add_subdirectory(efsw)
+endif()
+
 if(TOOLS)
   add_subdirectory(CascLib)
 endif()