Update dependencies and CI

.ci/vcpkg/overlay-ports/libsodium/portfile.cmake

@@ -0,0 +1,78 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO jedisct1/libsodium
+    REF 73248a4972336f411f688864eb6b086d215122fc # latest commit on: 1.0.19-stable branch as of 2024-03-24
+    SHA512 b9bf37017e4a1deb0f5cbf9955c2bee6925fed57ed173be9bb58e7a00439038772559f4cbe36d1fb40107b9afd9a9b5a4302ab83630b4740f2ffeab4f03ed671
+    HEAD_REF master
+)
+
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+    set(lib_linkage "LIB")
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+        set(lib_linkage "DLL")
+    endif()
+
+    set(LIBSODIUM_PROJECT_SUBPATH "builds/msvc/vs2022/libsodium/libsodium.vcxproj" CACHE STRING "Triplet variable")
+
+    vcpkg_msbuild_install(
+        SOURCE_PATH "${SOURCE_PATH}"
+        PROJECT_SUBPATH "${LIBSODIUM_PROJECT_SUBPATH}"
+        RELEASE_CONFIGURATION "Release${lib_linkage}"
+        DEBUG_CONFIGURATION "Debug${lib_linkage}"
+    )
+
+    file(INSTALL "${SOURCE_PATH}/src/libsodium/include/sodium.h" "${SOURCE_PATH}/src/libsodium/include/sodium" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+    file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/libsodium/include/sodium/version.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/sodium")
+    file(REMOVE "${CURRENT_PACKAGES_DIR}/include/Makefile.am" "${CURRENT_PACKAGES_DIR}/include/sodium/version.h.in")
+
+    block(SCOPE_FOR VARIABLES)
+        set(PACKAGE_NAME "libsodium")
+        set(PACKAGE_VERSION "${VERSION}")
+        set(prefix [[unused]])
+        set(exec_prefix [[${prefix}]])
+        set(includedir [[${prefix}/include]])
+        set(libdir [[${prefix}/lib]])
+        set(PKGCONFIG_LIBS_PRIVATE "")
+        configure_file("${SOURCE_PATH}/libsodium.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libsodium.pc" @ONLY)
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libsodium.pc" " -lsodium" " -llibsodium")
+        if(NOT VCPKG_BUILD_TYPE)
+            set(includedir [[${prefix}/../include]])
+            configure_file("${SOURCE_PATH}/libsodium.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libsodium.pc" @ONLY)
+            vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libsodium.pc" " -lsodium" " -llibsodium")
+        endif()
+    endblock()
+else()
+
+    vcpkg_list(SET options)
+    if(VCPKG_TARGET_IS_EMSCRIPTEN)
+        vcpkg_list(APPEND options "--disable-ssp" "--disable-asm")
+    endif()
+
+    vcpkg_configure_make(
+        AUTOCONFIG
+        SOURCE_PATH "${SOURCE_PATH}"
+        OPTIONS
+            ${options}
+    )
+    vcpkg_install_make()
+
+    file(REMOVE_RECURSE
+        "${CURRENT_PACKAGES_DIR}/debug/include"
+        "${CURRENT_PACKAGES_DIR}/debug/share"
+    )
+endif()
+
+vcpkg_fixup_pkgconfig()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sodium/export.h" "#ifdef SODIUM_STATIC" "#if 1")
+endif()
+
+# vcpkg legacy
+configure_file(
+    "${CMAKE_CURRENT_LIST_DIR}/sodiumConfig.cmake.in"
+    "${CURRENT_PACKAGES_DIR}/share/unofficial-sodium/unofficial-sodiumConfig.cmake"
+    @ONLY
+)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

.ci/vcpkg/overlay-ports/libsodium/sodiumConfig.cmake.in

@@ -0,0 +1,32 @@
+
+if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT WIN32)
+    include(CMakeFindDependencyMacro)
+    find_dependency(Threads)
+endif()
+
+if(NOT TARGET unofficial-sodium::sodium)
+    add_library(unofficial-sodium::sodium UNKNOWN IMPORTED)
+
+    set_target_properties(unofficial-sodium::sodium PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include"
+        IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+    )
+
+    if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT WIN32)
+        set_target_properties(unofficial-sodium::sodium PROPERTIES
+            INTERFACE_LINK_LIBRARIES Threads::Threads
+        )
+    endif()
+
+    find_library(VCPKG_SODIUM_LIBRARY_RELEASE NAMES sodium libsodium PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH)
+    if(EXISTS "${VCPKG_SODIUM_LIBRARY_RELEASE}")
+        set_property(TARGET unofficial-sodium::sodium APPEND PROPERTY IMPORTED_CONFIGURATIONS "Release")
+        set_target_properties(unofficial-sodium::sodium PROPERTIES IMPORTED_LOCATION_RELEASE "${VCPKG_SODIUM_LIBRARY_RELEASE}")
+    endif()
+
+    find_library(VCPKG_SODIUM_LIBRARY_DEBUG NAMES sodium libsodium PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH)
+    if(EXISTS "${VCPKG_SODIUM_LIBRARY_DEBUG}")
+        set_property(TARGET unofficial-sodium::sodium APPEND PROPERTY IMPORTED_CONFIGURATIONS "Debug")
+        set_target_properties(unofficial-sodium::sodium PROPERTIES IMPORTED_LOCATION_DEBUG "${VCPKG_SODIUM_LIBRARY_DEBUG}")
+    endif()
+endif()

.ci/vcpkg/overlay-ports/libsodium/vcpkg.json

@@ -0,0 +1,14 @@
+{
+  "name": "libsodium",
+  "version": "1.0.19-stable",
+  "description": "A modern and easy-to-use crypto library",
+  "homepage": "https://libsodium.org/",
+  "license": "ISC",
+  "dependencies": [
+    {
+      "name": "vcpkg-msbuild",
+      "host": true,
+      "platform": "windows & !mingw"
+    }
+  ]
+}

.cirrus.yml

@@ -44,7 +44,7 @@ freebsd_build_task:
 #     - brew install cmake
 #     - brew install gettext
 #     # NOTE: Specify an explicit Asciidoctor version to help ensure reproducible builds
-#     - sudo gem install asciidoctor -v 2.0.16 --no-document
+#     - sudo gem install asciidoctor -v 2.0.22 --no-document
 #     # gcc6+ is currently required to bootstrap vcpkg on macOS
 #     - brew install gcc@7
 #     - sudo bundle install --gemfile="macosx/BuildBot/Gemfile"

.github/workflows/CI_macos.yml

@@ -27,28 +27,20 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: "Xcode 11.7 (x64)"
-            image: "macos-11"
+          - name: "Xcode 14.3 (x64)"
+            image: "macos-13"
             osx_target_arch: "x86_64"
             vcpkg_triplet: "x64-osx"
-            xcode_dev_dir: "/Applications/Xcode_11.7.app"
+            xcode_dev_dir: "/Applications/Xcode_14.3.1.app"
             include_videos: false
             artifact_suffix: "x64"
-            publish_artifact: false
-          - name: "Xcode 13.4 (x64)"
-            image: "macos-12"
-            osx_target_arch: "x86_64"
-            vcpkg_triplet: "x64-osx"
-            xcode_dev_dir: "/Applications/Xcode_13.4.1.app"
-            include_videos: true
-            artifact_suffix: "x64"
             publish_artifact: true
-          - name: "Xcode 13.4 (ARM64)"
-            image: "macos-12"
+          - name: "Xcode 14.3 (ARM64)"
+            image: "macos-13"
             osx_target_arch: "arm64"
             vcpkg_triplet: "arm64-osx"
-            xcode_dev_dir: "/Applications/Xcode_13.4.1.app"
-            include_videos: false
+            xcode_dev_dir: "/Applications/Xcode_14.3.1.app"
+            include_videos: true
             artifact_suffix: "arm64"
             publish_artifact: true
       fail-fast: false
@@ -58,7 +50,7 @@ jobs:
     runs-on: '${{ matrix.image }}'
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     env:
-      MACOSX_DEPLOYMENT_TARGET: '10.9'
+      MACOSX_DEPLOYMENT_TARGET: '10.13'
       VSCMD_SKIP_SENDTELEMETRY: 1
       DESIRED_XCODE_DEV_DIR: '${{ matrix.xcode_dev_dir }}'
       WZ_INCLUDE_VIDEOS: '${{ matrix.include_videos }}'
@@ -85,13 +77,19 @@ jobs:
       working-directory: ./src
       run: git submodule update --init --recursive
     - name: Install Pre-reqs
+      env:
+        HOMEBREW_NO_AUTO_UPDATE: 1
+        HOMEBREW_NO_INSTALL_UPGRADE: 1
       run: |
-        brew install gettext
+        echo "::group::brew install"
+        brew install automake gettext pkg-config
+        echo "::endgroup::"
+
         # NOTE: Specify an explicit Asciidoctor version to help ensure reproducible builds
-        gem install asciidoctor -v 2.0.16 --no-document
+        echo "::group::gem install asciidoctor"
+        gem install asciidoctor -v 2.0.22 --no-document
+        echo "::endgroup::"
 
-        #brew update
-        brew install pkg-config
         #if (brew outdated | grep cmake > /dev/null); then echo "upgrading CMake"; brew upgrade cmake; fi
         cmake --version
     - name: Prep Environment
@@ -252,16 +250,16 @@ jobs:
       - name: Create Universal Binary
         working-directory: ./dl-artifacts
         run: |
-          BASE_APP_BUNDLE="warzone2100_macOS_x64/Warzone 2100.app"
+          BASE_APP_BUNDLE="warzone2100_macOS_arm64/Warzone 2100.app"
           # extract entitlements plist from the "base" app bundle binary
           echo "Extract entitlements.plist"
           codesign -d --entitlements :- "${BASE_APP_BUNDLE}/Contents/MacOS/Warzone 2100" > "entitlements.plist"
           cat "entitlements.plist"
           echo "-----------------------------------"
           echo "Make universal binary + app package"
-          ../src/macosx/BuildBot/make_universal.sh "${BASE_APP_BUNDLE}" "warzone2100_macOS_arm64/Warzone 2100.app"
+          ../src/macosx/BuildBot/make_universal.sh "${BASE_APP_BUNDLE}" "warzone2100_macOS_x64/Warzone 2100.app"
           # Rename the "base" app package directory
-          mv "warzone2100_macOS_x64" "warzone2100_macOS_universal"
+          mv "warzone2100_macOS_arm64" "warzone2100_macOS_universal"
           echo "Re-code-sign"
           codesign --force --options runtime --entitlements "entitlements.plist" -s - "warzone2100_macOS_universal/Warzone 2100.app"
           # Zip and copy to build dir

.github/workflows/CI_windows.yml

@@ -103,7 +103,7 @@ jobs:
       id: asciidoctor-dl
       run: |
         echo "Installing Asciidoctor"
-        gem install asciidoctor -v 2.0.16 --no-document | Out-Null
+        gem install asciidoctor -v 2.0.22 --no-document | Out-Null
         echo "Installing Asciidoctor... finished"
         $AsciidoctorBat = (Get-Command asciidoctor.bat).Path
         echo "Asciidoctor.bat: ${AsciidoctorBat}"
@@ -399,10 +399,10 @@ jobs:
         $VerbosePreference = "Continue"
         . "${env:WZ_REPO_PATH}\.ci\powershell\request.ps1"
 
-        $LLVM_MINGW_RELEASE = "20231031";
+        $LLVM_MINGW_RELEASE = "20231128";
         $LLVM_MINGW_PKG = "llvm-mingw-${LLVM_MINGW_RELEASE}-ucrt-x86_64"
         $LLVM_MINGW_DL_URL = "https://github.com/mstorsjo/llvm-mingw/releases/download/${LLVM_MINGW_RELEASE}/${LLVM_MINGW_PKG}.zip"
-        $LLVM_MINGW_DL_SHA512 = "3173b7a9b7836adce0fa5a59b13a01fa7707d1fc5be27606e779cca853b4452571ab37a1d5d6b3fd2ca067f58aa6011b121ba4f29b9b0eaaa1de2679d6b55af9"
+        $LLVM_MINGW_DL_SHA512 = "86e99cce855bf01d75032fe282986976b53e5a71f52a80b00e92906db462426515fbe2764465afa4f5a67b6abc4325c7a21d0eb59845be615890ef2560f1ec37"
 
         $LLVM_MINGW_DL_BASEDIR = "${{ github.workspace }}\dl"
         $LLVM_MINGW_DL_PATH = "${LLVM_MINGW_DL_BASEDIR}\llvm-mingw.zip"
@@ -462,7 +462,7 @@ jobs:
     - name: Cache vcpkg dependencies
       id: vcpkg-cache
       if: success() && !(github.event_name == 'workflow_run' && github.event.workflow_run.name == 'Draft Tag Release')
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ${{ steps.settings.outputs.VCPKG_BINARYCACHE_DIR }}
         key: ${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.architecture }}-${{ steps.settings.outputs.WZ_VISUAL_STUDIO_INSTALL_VERSION }}-${{ hashFiles('**/get-dependencies_win.ps1') }}-${{ hashFiles('**/vcpkg.json') }}-${{ hashFiles('**/.ci/vcpkg/**') }}
@@ -554,7 +554,9 @@ jobs:
       if: failure()
       with:
         name: win_${{ matrix.architecture }}_vcpkg_logs
-        path: '${{ github.workspace }}\build\vcpkg\buildtrees\*\*-out.log'
+        path: |
+          ${{ github.workspace }}\build\vcpkg\buildtrees\*\*.log
+          ${{ github.workspace }}\build\vcpkg\buildtrees\*\*.txt
         if-no-files-found: 'warn'
         retention-days: 1
     - name: CMake Build (MSVC)

cmake/FindSodium.cmake

@@ -10,12 +10,26 @@
 
 include(FindPackageHandleStandardArgs)
 
+function(GetSodiumVersion sodium_INCLUDE_DIR)
+	if(sodium_INCLUDE_DIR AND EXISTS "${sodium_INCLUDE_DIR}/sodium/version.h")
+		file(STRINGS "${sodium_INCLUDE_DIR}/sodium/version.h" SODIUM_VERSION_STRING_LINE REGEX "^#define[ \t]+SODIUM_VERSION_STRING[ \t]+\"[.0-9]+\"$")
+		string(REGEX REPLACE "^#define[ \t]+SODIUM_VERSION_STRING[ \t]+\"([.0-9]+)\"$" "\\1" sodium_VERSION "${SODIUM_VERSION_STRING_LINE}")
+		unset(SODIUM_VERSION_STRING_LINE)
+	else()
+		if (sodium_INCLUDE_DIR)
+			message ( WARNING "Can't find ${sodium_INCLUDE_DIR}/sodium/version.h" )
+		endif()
+		set(sodium_VERSION "")
+	endif()
+	set(sodium_VERSION "${sodium_VERSION}" PARENT_SCOPE)
+endfunction()
+
 if (VCPKG_TOOLCHAIN)
 	find_package(unofficial-sodium CONFIG)
 	# If we found the vcpkg unofficial-sodium configuration, return with that result
 	if(unofficial-sodium_FOUND AND TARGET unofficial-sodium::sodium)
-		set(sodium_VERSION "${unofficial-sodium_VERSION}")
 		get_target_property(sodium_INCLUDE_DIR unofficial-sodium::sodium INTERFACE_INCLUDE_DIRECTORIES)
+		GetSodiumVersion("${sodium_INCLUDE_DIR}")
 		find_package_handle_standard_args(${CMAKE_FIND_PACKAGE_NAME} REQUIRED_VARS sodium_INCLUDE_DIR VERSION_VAR sodium_VERSION)
 		message(STATUS "Using vcpkg unofficial-sodium configuration (${sodium_VERSION})")
 		return()
@@ -52,16 +66,7 @@ FIND_LIBRARY(
 	HINTS ${PCFG_SODIUM_LIBRARY_DIRS} ${PCFG_SODIUM_LIBDIR}
 )
 
-if(sodium_INCLUDE_DIR AND EXISTS "${sodium_INCLUDE_DIR}/sodium/version.h")
-	file(STRINGS "${sodium_INCLUDE_DIR}/sodium/version.h" SODIUM_VERSION_STRING_LINE REGEX "^#define[ \t]+SODIUM_VERSION_STRING[ \t]+\"[.0-9]+\"$")
-	string(REGEX REPLACE "^#define[ \t]+SODIUM_VERSION_STRING[ \t]+\"([.0-9]+)\"$" "\\1" sodium_VERSION "${SODIUM_VERSION_STRING_LINE}")
-	unset(SODIUM_VERSION_STRING_LINE)
-else()
-	if (sodium_INCLUDE_DIR)
-		message ( WARNING "Can't find ${sodium_INCLUDE_DIR}/sodium/version.h" )
-	endif()
-	set(sodium_VERSION "")
-endif()
+GetSodiumVersion("${sodium_INCLUDE_DIR}")
 
 find_package_handle_standard_args(${CMAKE_FIND_PACKAGE_NAME} REQUIRED_VARS sodium_INCLUDE_DIR sodium_LIBRARIES VERSION_VAR sodium_VERSION)
 

configure_mac.cmake

@@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.5)
 ########################################################
 
 # To ensure reproducible builds, pin to a specific vcpkg commit
-set(VCPKG_COMMIT_SHA "11e79b1072c7f12d84258b77948cda3b166aac59")
+set(VCPKG_COMMIT_SHA "9de2e978bdfec6bb7852cc1d6ecf375c923c485c")
 
 # WZ minimum supported macOS deployment target (< 10.9 is untested)
 set(MIN_SUPPORTED_MACOSX_DEPLOYMENT_TARGET "10.9")
@@ -347,22 +347,26 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E echo "++ vcpkg install finished")
 # 3.) CMake configure (generate Xcode project)
 
 set(_additional_configure_arguments "")
-if(DEFINED WZ_DISTRIBUTOR)
-	set(_additional_configure_arguments "\"-DWZ_DISTRIBUTOR:STRING=${WZ_DISTRIBUTOR}\"")
+if(NOT DEFINED WZ_DISTRIBUTOR)
+    set(WZ_DISTRIBUTOR "UNKNOWN")
 endif()
+list(APPEND _additional_configure_arguments "-DCMAKE_FIND_USE_CMAKE_SYSTEM_PATH=FALSE" "-DCMAKE_FIND_USE_INSTALL_PREFIX=FALSE" "-DCMAKE_FIND_USE_PACKAGE_REGISTRY=FALSE" "-DCMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY=FALSE")
 if(DEFINED ADDITIONAL_CMAKE_ARGUMENTS)
 	list(APPEND _additional_configure_arguments ${ADDITIONAL_CMAKE_ARGUMENTS})
 endif()
 
 execute_process(COMMAND ${CMAKE_COMMAND} -E echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++")
 execute_process(COMMAND ${CMAKE_COMMAND} -E echo "++ Running CMake configure (to generate Xcode project)...")
+string(REPLACE ";" " " _debug_output_args "${_additional_configure_arguments}")
+execute_process(COMMAND ${CMAKE_COMMAND} -E echo "++ ${CMAKE_COMMAND} \"-DCMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake\" \"-DWZ_DISTRIBUTOR:STRING=${WZ_DISTRIBUTOR}\" ${_debug_output_args} -G Xcode -B . -S \"${_repoBase}\"")
 execute_process(
 	COMMAND ${CMAKE_COMMAND}
 		"-DCMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake"
-		-DGLEW_USE_STATIC_LIBS=ON
+		"-DWZ_DISTRIBUTOR:STRING=${WZ_DISTRIBUTOR}"
 		${_additional_configure_arguments}
 		-G Xcode
-		"${_repoBase}"
+		-B .
+		-S "${_repoBase}"
 	RESULT_VARIABLE _exstatus
 )
 

get-dependencies_win.ps1

@@ -5,7 +5,7 @@ param([string]$VCPKG_BUILD_TYPE = "")
 ############################
 
 # To ensure reproducible builds, pin to a specific vcpkg commit
-$VCPKG_COMMIT_SHA = "11e79b1072c7f12d84258b77948cda3b166aac59";
+$VCPKG_COMMIT_SHA = "9de2e978bdfec6bb7852cc1d6ecf375c923c485c";
 
 # WZ Windows features (for vcpkg install)
 $VCPKG_INSTALL_FEATURES = @()

lib/wzmaplib/CMakeLists.txt

@@ -130,7 +130,11 @@ target_link_libraries(wzmaplib PRIVATE quickjs)
 ##################################
 # ZipIOProvider (requires libzip)
 
-find_package(libzip QUIET)
+set(LIBZIP_FIND_ADDITIONAL_PARAMS)
+if (APPLE OR WIN32)
+    list(APPEND LIBZIP_FIND_ADDITIONAL_PARAMS NO_SYSTEM_ENVIRONMENT_PATH)
+endif()
+find_package(libzip QUIET ${LIBZIP_FIND_ADDITIONAL_PARAMS})
 if (libzip_FOUND)
 	# Test linking libzip
 	include(CheckCXXSourceCompiles)
@@ -158,6 +162,8 @@ if (libzip_FOUND)
 	cmake_pop_check_state()
 	if(libzip_LINK_TEST)
 		message( STATUS "Found libzip... (link test successful)" )
+		get_target_property(_libzip_INCLUDE_DIR libzip::zip INTERFACE_INCLUDE_DIRECTORIES)
+		message( STATUS "- libzip include dir: ${_libzip_INCLUDE_DIR}" )
 	else()
 		message( STATUS "Found libzip, but link test NOT successful" )
 	endif()