Dominik Roth
23615a8c92
rerender on assign/alive/shell, add Windows build tooling - Board.add_target/add_ally's id auto-assignment used a bare next(c for c in string.ascii_uppercase if c not in used), which raises StopIteration once 26 entities of a group exist -- a real crash confirmed via a live traceback, and a direct regression from moving that sequence from per-type to per-group. This was the actual cause of "Accept as"/"Accept all" silently doing nothing. Fixed with _next_free_id(), which rolls over to two-letter ids instead of raising. - New TargetType.STRIKE_REQUEST: the bearing/distance-offset "taking fire" fire-support request (see the earlier two-entity split) now creates this instead of reusing STRIKE, so a radioed-in request is never confused with a strike the player placed themselves. Same crosshair icon, excluded from type pickers/dedupe like STRIKE. - The "Accept as..." popover on a detected map marker now uses the same icon grid the entity-edit "Change type" popover does (was a plain unfiltered text list of every TargetType, which also wrongly offered STRIKE/STRIKE_REQUEST as pickable). - Firing panel: _cycle_assignment/_toggle_alive/_pick_shell no longer route through app.py's full solver+dedupe+canvas+panel refresh -- none of the three can affect the solver or dedupe, and none change which cards exist or their order (except _toggle_alive in hide/sort_later mode). New FiringPanel._rebuild_one() rebuilds just the one changed card; on_visual_change is a new, lighter callback (just a map redraw) for the two of these three that actually affect it. This was a real, confirmed lag source with many units on the board: every click on any of these was previously rebuilding every card of every target. - Map right-click entity menu: added "Mark destroyed"/"Mark alive", reusing the same cheap-refresh path (new FiringPanel.refresh_after_alive_change). - packaging/windows/: a from-scratch (untested against a real boot) MSYS2 + WiX .msi build pipeline for Windows, driven from Linux via dockur/windows (KVM-in-container), no Windows machine or GitHub required. See its own README for status/caveats. - New/updated tests: id-namespace sharing + the 26-entity overflow regression (tests/test_models.py), StrikeRequest split (tests/test_ocr.py), warp_to_map's img_scale param (tests/test_map_vision_warp.py). 44/44 passing. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
87 lines
3.2 KiB
Batchfile
87 lines
3.2 KiB
Batchfile
@echo off
|
|
REM Actual per-build packaging. Triggered by watch_build.bat once
|
|
REM install.bat's one-time provisioning has already put MSYS2/GTK4/
|
|
REM libadwaita/WiX in place. Reads source from Z:\src, writes
|
|
REM FEnigma-<version>.msi to Z:\dist, and Z:\BUILD_DONE (or
|
|
REM Z:\BUILD_FAILED, with the log copied alongside it) when finished.
|
|
REM
|
|
REM UNTESTED (see install.bat's note) -- the WiX harvest/link step in
|
|
REM particular is likely to need iteration: bulk-copying all of
|
|
REM mingw64\ is the "make it work first" approach, not a lean one, and
|
|
REM heat.exe's default harvest options may need tuning to actually
|
|
REM produce a working component set for a tree this size.
|
|
|
|
setlocal enabledelayedexpansion
|
|
set LOG=Z:\build.log
|
|
echo [build.bat] starting > %LOG%
|
|
|
|
if exist Z:\BUILD_VERSION (
|
|
set /p APPVER=<Z:\BUILD_VERSION
|
|
) else (
|
|
set APPVER=0.1.0
|
|
)
|
|
echo [build.bat] version %APPVER% >> %LOG%
|
|
|
|
rd /s /q C:\build 2>nul
|
|
mkdir C:\build\src
|
|
mkdir C:\build\dist\src
|
|
mkdir C:\build\dist\mingw64
|
|
|
|
echo [build.bat] copying source from Z:\src ... >> %LOG%
|
|
xcopy /e /i /q Z:\src C:\build\src >> %LOG% 2>&1
|
|
|
|
echo [build.bat] sanity import check ... >> %LOG%
|
|
set PYTHONPATH=C:\build\src\src
|
|
C:\msys64\mingw64\bin\python3.exe -c "import fenigma.app" >> %LOG% 2>&1
|
|
if errorlevel 1 (
|
|
echo [build.bat] FAILED: fenigma.app failed to import, see log >> %LOG%
|
|
copy %LOG% Z:\build.log.failed >nul
|
|
echo FAILED > Z:\BUILD_FAILED
|
|
exit /b 1
|
|
)
|
|
|
|
echo [build.bat] assembling dist tree ... >> %LOG%
|
|
xcopy /e /i /q C:\build\src\src C:\build\dist\src >> %LOG% 2>&1
|
|
REM Bulk-copy the whole mingw64 runtime rather than hand-tracing the DLL/
|
|
REM typelib/icon-theme/schema dependency closure -- bloated (likely 1GB+)
|
|
REM but reliable; trimming this down is a known follow-up, not attempted
|
|
REM here (see this file's top-of-file note).
|
|
robocopy C:\msys64\mingw64 C:\build\dist\mingw64 /e /xd include share\doc share\man share\gtk-doc /nfl /ndl /njh /njs >> %LOG% 2>&1
|
|
|
|
echo [build.bat] harvesting WiX components ... >> %LOG%
|
|
C:\wix\heat.exe dir C:\build\dist -cg AppFiles -gg -scom -sreg -sfrag -srd -sw5150 -dr INSTALLFOLDER -var var.DistDir -out C:\build\files.wxs >> %LOG% 2>&1
|
|
if errorlevel 1 (
|
|
echo [build.bat] FAILED: heat.exe harvest failed >> %LOG%
|
|
copy %LOG% Z:\build.log.failed >nul
|
|
echo FAILED > Z:\BUILD_FAILED
|
|
exit /b 1
|
|
)
|
|
|
|
copy /y C:\OEM\product.wxs C:\build\product.wxs >nul
|
|
|
|
echo [build.bat] compiling (candle) ... >> %LOG%
|
|
C:\wix\candle.exe -dDistDir=C:\build\dist -dAppVersion=%APPVER% -out C:\build\ C:\build\product.wxs C:\build\files.wxs >> %LOG% 2>&1
|
|
if errorlevel 1 (
|
|
echo [build.bat] FAILED: candle.exe failed >> %LOG%
|
|
copy %LOG% Z:\build.log.failed >nul
|
|
echo FAILED > Z:\BUILD_FAILED
|
|
exit /b 1
|
|
)
|
|
|
|
echo [build.bat] linking (light) ... >> %LOG%
|
|
C:\wix\light.exe -ext WixUIExtension -sice:ICE60 -sice:ICE61 -out C:\build\FEnigma-%APPVER%.msi C:\build\product.wixobj C:\build\files.wixobj >> %LOG% 2>&1
|
|
if errorlevel 1 (
|
|
echo [build.bat] FAILED: light.exe failed >> %LOG%
|
|
copy %LOG% Z:\build.log.failed >nul
|
|
echo FAILED > Z:\BUILD_FAILED
|
|
exit /b 1
|
|
)
|
|
|
|
if not exist Z:\dist mkdir Z:\dist
|
|
copy /y C:\build\FEnigma-%APPVER%.msi Z:\dist\ >> %LOG% 2>&1
|
|
copy /y %LOG% Z:\dist\build.log >nul
|
|
|
|
echo [build.bat] done >> %LOG%
|
|
echo DONE > Z:\BUILD_DONE
|
|
endlocal
|