bugfix(string): Keep %hs printable when rewriting wide formats for libc

.github/workflows/bgfx-builds.yml

@@ -0,0 +1,383 @@
+name: BGFX Builds
+
+run-name: bgfx builds from ${{ inputs.ref || github.ref_name }}
+
+permissions:
+  contents: write
+
+on:
+  push:
+    branches:
+      - bobtista/topic/trunk
+  workflow_dispatch:
+    inputs:
+      ref:
+        description: "Branch, tag, or SHA to build"
+        required: false
+        default: "bobtista/topic/trunk"
+        type: string
+      publish:
+        description: "Update the latest-bgfx rolling release"
+        required: false
+        default: true
+        type: boolean
+
+concurrency:
+  group: bgfx-builds
+  cancel-in-progress: true
+
+env:
+  FFMPEG_WIN64_ASSET: ffmpeg-n8.1-latest-win64-gpl-shared-8.1
+
+jobs:
+  win64:
+    name: ${{ matrix.preset }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - preset: win64
+            config: Release
+            zip: GeneralsZH-win64
+          - preset: win64-debug
+            config: Debug
+            zip: GeneralsZH-win64-debug
+    runs-on: windows-2022
+    timeout-minutes: 120
+    outputs:
+      sha: ${{ steps.sha.outputs.sha }}
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          ref: ${{ inputs.ref || github.ref_name }}
+
+      - name: Resolve Built Commit
+        id: sha
+        shell: pwsh
+        run: |
+          "sha=$(git rev-parse HEAD)" >> $env:GITHUB_OUTPUT
+
+      - name: Cache FFmpeg
+        id: cache-ffmpeg
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
+        with:
+          path: .deps-cache/ffmpeg-x64
+          key: ffmpeg-win64-${{ env.FFMPEG_WIN64_ASSET }}
+
+      - name: Download FFmpeg
+        if: steps.cache-ffmpeg.outputs.cache-hit != 'true'
+        shell: pwsh
+        run: |
+          $asset = "$env:FFMPEG_WIN64_ASSET.zip"
+          # The rolling alias assets (ffmpeg-nX.Y-latest-*) live in the release TAGGED
+          # "latest", which is not the same thing as the newest release. Asking for
+          # releases/latest/download resolves to whatever autobuild-* published most
+          # recently, and those carry versioned names only, so the pinned asset 404s.
+          $uri = "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/$asset"
+          # Every autobuild deletes and re-uploads those alias assets, so a download
+          # landing in that window 404s on a file that exists minutes either side.
+          # Retry instead of failing the build over a few seconds of republishing.
+          $downloaded = $false
+          foreach ($attempt in 1..5) {
+            try {
+              Invoke-WebRequest -Uri $uri -OutFile ffmpeg.zip
+              $downloaded = $true
+              break
+            } catch {
+              Write-Host "FFmpeg download attempt $attempt/5 failed: $($_.Exception.Message)"
+              if ($attempt -lt 5) { Start-Sleep -Seconds 30 }
+            }
+          }
+          if (-not $downloaded) { throw "FFmpeg download failed after 5 attempts: $uri" }
+          Expand-Archive -Path ffmpeg.zip -DestinationPath ffmpeg-tmp
+          $inner = Get-ChildItem -Directory ffmpeg-tmp | Select-Object -First 1
+          New-Item -ItemType Directory -Force -Path .deps-cache | Out-Null
+          Move-Item -Path $inner.FullName -Destination .deps-cache/ffmpeg-x64
+          Remove-Item ffmpeg.zip
+
+      - name: Set Up VC2022 Environment
+        uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
+        with:
+          arch: x64
+
+      - name: Set Up sccache
+        # Single-archive local sccache dir cached as ONE entry per run (not the GHA
+        # per-object backend, which fragmented into thousands of tiny cache entries and
+        # hit API rate limits -> silent false misses). append-timestamp + restore-key
+        # prefix warm-restore each run; max-size bounds it well under the repo cache cap.
+        uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23
+        with:
+          variant: sccache
+          key: bgfx-${{ matrix.preset }}
+          max-size: 2G
+          verbose: 1
+
+      - name: Cache CMake Dependencies
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
+        with:
+          path: build\${{ matrix.preset }}\_deps
+          key: cmake-deps-${{ matrix.preset }}-${{ hashFiles('CMakePresets.json','cmake/**/*.cmake','**/CMakeLists.txt') }}
+          restore-keys: |
+            cmake-deps-${{ matrix.preset }}-
+
+      - name: Configure with CMake
+        shell: pwsh
+        run: |
+          cmake --preset ${{ matrix.preset }} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache
+
+      - name: Build GeneralsMD
+        shell: pwsh
+        run: |
+          cmake --build build/${{ matrix.preset }} --config ${{ matrix.config }} --target z_generals
+          sccache --show-stats
+
+      - name: Stage and Zip
+        shell: pwsh
+        run: |
+          $build = "build/${{ matrix.preset }}"
+          $cfg = "${{ matrix.config }}"
+          $stage = New-Item -ItemType Directory -Force -Path "stage/${{ matrix.zip }}"
+
+          Copy-Item "$build/GeneralsMD/$cfg/*.exe" $stage
+          if (Test-Path "$build/GeneralsMD/$cfg/*.pdb") {
+            Copy-Item "$build/GeneralsMD/$cfg/*.pdb" $stage
+          }
+
+          $dlls = Get-ChildItem -Path "$build/_deps" -Recurse -Include "SDL3*.dll","OpenAL32*.dll" |
+            Where-Object { $_.FullName -like "*\$cfg\*" }
+          if (-not $dlls) {
+            throw "No SDL3/OpenAL runtime DLLs found under $build/_deps for config $cfg"
+          }
+          $dlls | Copy-Item -Destination $stage
+          Copy-Item ".deps-cache/ffmpeg-x64/bin/*.dll" $stage
+
+          @(
+            "Command & Conquer Generals Zero Hour (GeneralsMD) bgfx build",
+            "preset: ${{ matrix.preset }} ($cfg)",
+            "ref: ${{ inputs.ref || github.ref_name }}",
+            "commit: $(git rev-parse HEAD)",
+            "built: $((Get-Date).ToUniversalTime().ToString('o'))"
+          ) | Set-Content "$stage/BUILD_INFO.txt"
+
+          # Ship the default render settings (sun shadow map on). The exe-only zip
+          # excludes Data\ via the $slim filter below.
+          New-Item -ItemType Directory -Force -Path "$stage/Data/INI" | Out-Null
+          Copy-Item "scripts/build/dist/Bgfx.ini" "$stage/Data/INI/Bgfx.ini"
+          Copy-Item "LICENSE.md","INSTALLING.md" $stage
+
+          Compress-Archive -Path $stage.FullName -DestinationPath "${{ matrix.zip }}.zip"
+
+          $slimStage = New-Item -ItemType Directory -Force -Path "stage/${{ matrix.zip }}-exe-only"
+          Get-ChildItem "$stage/*" -Include "*.exe","*.pdb","BUILD_INFO.txt" |
+            Copy-Item -Destination $slimStage
+          Copy-Item "LICENSE.md","INSTALLING.md" $slimStage
+          Compress-Archive -Path $slimStage.FullName -DestinationPath "${{ matrix.zip }}-exe-only.zip"
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        with:
+          name: ${{ matrix.zip }}
+          path: |
+            ${{ matrix.zip }}.zip
+            ${{ matrix.zip }}-exe-only.zip
+          retention-days: 30
+          if-no-files-found: error
+
+  macos:
+    name: macos-generalsmd-sdl3-bgfx
+    runs-on: macos-15
+    timeout-minutes: 120
+    env:
+      GGC_MACOS_RUNTIME_DIR: ${{ github.workspace }}/stage-macos/GeneralsZH-macos-arm64
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          ref: ${{ inputs.ref || github.ref_name }}
+
+      - name: Install Dependencies
+        run: |
+          brew install ninja dylibbundler ffmpeg ccache
+          command -v pkg-config || brew install pkgconf
+
+      - name: Cache CMake Dependencies
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
+        with:
+          path: build/macos-generalsmd-sdl3-bgfx/_deps
+          key: cmake-deps-macos-generalsmd-sdl3-bgfx-${{ hashFiles('CMakePresets.json','cmake/**/*.cmake','**/CMakeLists.txt') }}
+          restore-keys: |
+            cmake-deps-macos-generalsmd-sdl3-bgfx-
+
+      - name: Set Up ccache
+        # Single-archive ccache dir, append-timestamp + restore-key prefix so each run
+        # saves a fresh entry and warm-restores the latest; max-size caps total size.
+        uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23
+        with:
+          variant: ccache
+          key: bgfx-macos
+          max-size: 2G
+          verbose: 1
+
+      - name: Configure with CMake
+        run: |
+          cmake --preset macos-generalsmd-sdl3-bgfx -DRTS_CRASHDUMP_ENABLE=OFF -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+
+      - name: Build and Stage GeneralsMD
+        run: |
+          bash scripts/build/macos/build-macos-generalsmd.sh
+          ccache -s
+
+      - name: Zip
+        run: |
+          {
+            echo "Command & Conquer Generals Zero Hour (GeneralsMD) bgfx build"
+            echo "preset: macos-generalsmd-sdl3-bgfx (Release, arm64)"
+            echo "ref: ${{ inputs.ref || github.ref_name }}"
+            echo "commit: $(git rev-parse HEAD)"
+            echo "built: $(date -u +%Y-%m-%dT%H:%M:%SZ)"
+          } > "${GGC_MACOS_RUNTIME_DIR}/BUILD_INFO.txt"
+          cd "$(dirname "${GGC_MACOS_RUNTIME_DIR}")"
+          zip -ry "${GITHUB_WORKSPACE}/GeneralsZH-macos-arm64.zip" "$(basename "${GGC_MACOS_RUNTIME_DIR}")"
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        with:
+          name: GeneralsZH-macos-arm64
+          path: GeneralsZH-macos-arm64.zip
+          retention-days: 30
+          if-no-files-found: error
+
+  linux:
+    name: linux-generalsmd-sdl3-bgfx
+    runs-on: ubuntu-latest
+    timeout-minutes: 120
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          ref: ${{ inputs.ref || github.ref_name }}
+
+      - name: Install Dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends \
+            build-essential cmake ninja-build pkg-config ccache \
+            libx11-dev libxext-dev libxrandr-dev libxi-dev libxcursor-dev \
+            libxinerama-dev libxfixes-dev libxrender-dev libxss-dev libxtst-dev \
+            libxkbcommon-dev libwayland-dev wayland-protocols libdecor-0-dev \
+            libgl1-mesa-dev libegl1-mesa-dev libvulkan-dev \
+            libfreetype6-dev libfontconfig1-dev \
+            libasound2-dev libpulse-dev \
+            nasm curl xz-utils
+
+      - name: Cache CMake Dependencies
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
+        with:
+          path: build/linux-generalsmd-sdl3-bgfx/_deps
+          key: cmake-deps-linux-generalsmd-sdl3-bgfx-${{ hashFiles('CMakePresets.json','cmake/**/*.cmake','**/CMakeLists.txt') }}
+          restore-keys: |
+            cmake-deps-linux-generalsmd-sdl3-bgfx-
+
+      - name: Set Up ccache
+        uses: hendrikmuhs/ccache-action@d62db5f07c26379fc4b4e0916f098a92573c3b03 # v1.2.23
+        with:
+          variant: ccache
+          key: bgfx-linux
+          max-size: 2G
+          verbose: 1
+
+      - name: Cache Minimal FFmpeg
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
+        with:
+          path: ${{ github.workspace }}/ffmpeg-min
+          key: ffmpeg-min-${{ hashFiles('scripts/build/linux/build-ffmpeg-minimal.sh') }}
+
+      - name: Build Minimal FFmpeg
+        run: |
+          bash scripts/build/linux/build-ffmpeg-minimal.sh "${GITHUB_WORKSPACE}/ffmpeg-min"
+
+      - name: Configure with CMake
+        env:
+          PKG_CONFIG_PATH: ${{ github.workspace }}/ffmpeg-min/lib/pkgconfig
+        run: |
+          cmake --preset linux-generalsmd-sdl3-bgfx -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+
+      - name: Build GeneralsMD
+        run: |
+          cmake --build build/linux-generalsmd-sdl3-bgfx --config Release --target z_generals -j"$(nproc)"
+          ccache -s
+
+      - name: Stage
+        run: |
+          bash scripts/build/linux/deploy-linux-generalsmd.sh linux-generalsmd-sdl3-bgfx Release
+          {
+            echo "Command & Conquer Generals Zero Hour (GeneralsMD) bgfx build"
+            echo "preset: linux-generalsmd-sdl3-bgfx (Release, x86_64)"
+            echo "ref: ${{ inputs.ref || github.ref_name }}"
+            echo "commit: $(git rev-parse HEAD)"
+            echo "built: $(date -u +%Y-%m-%dT%H:%M:%SZ)"
+          } > "${GITHUB_WORKSPACE}/stage-linux/GeneralsZH-linux-x64/BUILD_INFO.txt"
+
+      - name: Zip
+        run: |
+          cd "${GITHUB_WORKSPACE}/stage-linux"
+          zip -ry "${GITHUB_WORKSPACE}/GeneralsZH-linux-x64.zip" GeneralsZH-linux-x64
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        with:
+          name: GeneralsZH-linux-x64
+          path: GeneralsZH-linux-x64.zip
+          retention-days: 30
+          if-no-files-found: error
+
+  publish:
+    name: Update latest-bgfx release
+    needs: [win64, macos, linux]
+    if: ${{ always() && needs.win64.result == 'success' && needs.macos.result == 'success' && (github.event_name != 'workflow_dispatch' || inputs.publish) }}
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    steps:
+      - name: Download Artifacts
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        with:
+          path: dist
+          merge-multiple: true
+
+      - name: Publish Rolling Release
+        env:
+          GH_TOKEN: ${{ github.token }}
+          SHA: ${{ needs.win64.outputs.sha }}
+          REF: ${{ inputs.ref || github.ref_name }}
+        run: |
+          (
+            cd dist
+            LC_ALL=C sha256sum *.zip > SHA256SUMS.txt
+          )
+
+          cat > notes.md <<EOF
+          Latest bgfx builds of Zero Hour (GeneralsMD), automatically updated.
+
+          Built from \`${REF}\` @ ${SHA} on $(date -u +%Y-%m-%d\ %H:%M\ UTC).
+
+          See the [installation guide](https://github.com/${GITHUB_REPOSITORY}/blob/${SHA}/INSTALLING.md) for platform requirements, retail game-data setup, mods and troubleshooting. Every archive also contains \`INSTALLING.md\`, \`LICENSE.md\` and \`BUILD_INFO.txt\`.
+
+          | Asset | Contents |
+          | --- | --- |
+          | GeneralsZH-win64.zip | Windows x64 Release: generalszh.exe + SDL3/OpenAL/FFmpeg DLLs |
+          | GeneralsZH-win64-exe-only.zip | Windows x64 Release: exe + PDB (requires matching runtime DLLs) |
+          | GeneralsZH-win64-debug.zip | Windows x64 Debug: exe + PDB + DLLs |
+          | GeneralsZH-win64-debug-exe-only.zip | Windows x64 Debug: exe + PDB (requires matching runtime DLLs) |
+          | GeneralsZH-macos-arm64.zip | macOS Apple Silicon: generalszh + bundled dylibs + run.sh |
+          | GeneralsZH-linux-x64.zip | Linux x86_64: generalszh + bundled libs + run.sh |
+          | SHA256SUMS.txt | SHA-256 checksums for every build archive |
+          EOF
+
+          gh release delete latest-bgfx --repo "$GITHUB_REPOSITORY" --cleanup-tag --yes || true
+          gh release create latest-bgfx dist/*.zip dist/SHA256SUMS.txt \
+            --repo "$GITHUB_REPOSITORY" \
+            --target "$SHA" \
+            --prerelease \
+            --title "Latest bgfx builds" \
+            --notes-file notes.md

.gitignore

@@ -66,4 +66,7 @@ build.ninja
 
 ## Python
 __pycache__/
-*.pyc
+*.pyc
+# Local prebuilt dependency cache (ffmpeg, etc.) to avoid slow rebuilds
+.deps-cache/
+scripts/render/ab_scenes.json.baseframes