mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-18 13:09:57 -04:00
Make every packaging script refuse a translator not built from the checkout's sources, early.
build_xlate.py --id-only wrote an nx2navi_xlate.id for whatever exe sat in the folder, from the sources as they are, so make_launcher's guard (check_xlate, which compares only the .id) passed an old exe beside a fresh .id. Nothing calls the option; it is gone, and only a build writes an .id. make_release.check_translator compared build/xlate's .id with build_xlate.identity(), which hashes the tree the last build prepared there, so a patch or vendor change since that build passed unseen; make_appimage.py and make_kit.py checked nothing. The fresh-prepare identity moves from make_launcher into build_xlate as source_identity(), and build_xlate.check_built(folder, exe) refuses a missing exe or .id and an .id that differs from it. make_launcher, make_release, make_appimage and make_kit stop on its reason, each before its downloads, builds or deletions: make_launcher's check moves from build_app to the top of main, before the --out folder is deleted and the toolchain lock is resolved. A translator folder built from the current sources, as the release scripts pass it (work\xlate_6866a13e), passes as before. Not reproduced before the change beyond the audit's probes. tests/xlate_package_check.py (new) checks a matching folder, missing files, another identity and a stale build (refused although identity() over its own tree equals its .id), that --id-only is refused, and that make_launcher, make_release and make_kit stop on a foreign translator, the kit before any download; check_built passes on work\xlate_6866a13e. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -188,32 +188,17 @@ def build_python(py):
|
||||
|
||||
# ---------------------------------------------------------------- app/<version>/
|
||||
|
||||
def xlate_source_identity():
|
||||
"""The identity tools/build_xlate.py writes for a translator built from this checkout: the vendor tree copied and
|
||||
patched in a folder of its own (build_xlate.prepare_sources) and hashed as the build hashes it (build_xlate.identity).
|
||||
Nothing is compiled; it takes a few seconds."""
|
||||
import tempfile
|
||||
import build_xlate
|
||||
old = build_xlate.BUILD
|
||||
with tempfile.TemporaryDirectory(prefix='xlate-id-') as d:
|
||||
build_xlate.BUILD = Path(d) / 'xlate'
|
||||
try:
|
||||
build_xlate.prepare_sources()
|
||||
return build_xlate.identity()
|
||||
finally:
|
||||
build_xlate.BUILD = old
|
||||
|
||||
|
||||
def check_xlate(xlate):
|
||||
"""A release carries the translator of its own sources. 0.10.0 and 0.10.1 shipped the 0.9.2 translator (identity
|
||||
4d051299) after tools/xlate/Program.cs had raised the texture pool to 40960 slots, so their translations still
|
||||
clamped every pool handle to slot 32767 and the ground went see-through after some area loads (issues #569 and
|
||||
#824). A translator whose nx2navi_xlate.id differs from this checkout's sources stops the build."""
|
||||
#824). A missing translator, or one whose nx2navi_xlate.id differs from this checkout's sources
|
||||
(build_xlate.check_built), stops the build; main runs this before anything is resolved, downloaded or deleted."""
|
||||
import build_xlate
|
||||
reason = build_xlate.check_built(xlate, 'nx2navi_xlate.exe')
|
||||
if reason:
|
||||
sys.exit(reason)
|
||||
have = (xlate / 'nx2navi_xlate.id').read_text(encoding='ascii').strip()
|
||||
want = xlate_source_identity()
|
||||
if have != want:
|
||||
sys.exit(f'{xlate}: its translator was built from other sources (identity {have[:16]}) than this checkout\'s '
|
||||
f'({want[:16]}): build it again with tools/build_xlate.py --out {xlate}')
|
||||
print(f'translator identity {have[:16]}: built from this checkout\'s sources')
|
||||
|
||||
|
||||
@@ -233,11 +218,7 @@ def build_app(app, ver, xlate, feed_repo, lock, ffx=None, dlss=None, art=None, d
|
||||
shutil.copy2(ROOT / t, app / t)
|
||||
(app / 'VERSION').write_text(ver + '\n', encoding='utf-8')
|
||||
(app / 'bin').mkdir()
|
||||
for n in ('nx2navi_xlate.exe', 'nx2navi_xlate.id'):
|
||||
if not (xlate / n).is_file():
|
||||
sys.exit(f'{xlate / n} is missing: build the shader translator first (tools/build_xlate.py)')
|
||||
check_xlate(xlate)
|
||||
for n in ('nx2navi_xlate.exe', 'nx2navi_xlate.id'):
|
||||
for n in ('nx2navi_xlate.exe', 'nx2navi_xlate.id'): # main checked them first (check_xlate)
|
||||
shutil.copy2(xlate / n, app / 'bin' / n)
|
||||
if ffx: # FSR 3.1 loads it from beside the game (runtime/vk_ffx.cpp); make_game.py copies it there
|
||||
shutil.copy2(ffx, app / 'bin' / 'amd_fidelityfx_vk.dll')
|
||||
@@ -415,6 +396,7 @@ def main():
|
||||
prompt_art.art_files(a.prompt_art) # the art is all there before anything is downloaded or built
|
||||
if a.pgo:
|
||||
pgo.fitting(a.pgo) # the profile fits this checkout's recomp/ before anything is downloaded or built
|
||||
check_xlate(a.xlate) # the translator is this checkout's before anything is downloaded, built or deleted
|
||||
out = a.out
|
||||
shutil.rmtree(out, ignore_errors=True)
|
||||
folder = out / 'NX2navi'
|
||||
|
||||
Reference in New Issue
Block a user