mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-19 15:09:58 -04:00
Stop a launcher release and a build kit on an nx2navi_dlssg.dll that lacks an export runtime/dlssg/nx2_sl.h declares, before they download anything.
The review found that nothing on the release path ran the new export check: tools/make_launcher.py build_app and tools/make_kit.py copied whatever --dlssg DLL they were given, and the release script still named the DLL of 0.8.0, which lacks nx2sl_reflex2. Shipped that way, Reflex would never hold the frame limit while players still got this branch's other changes. make_launcher.py check_dlssg and make_kit.py main now run build_dlssg.check on the --dlssg DLL beside the translator's check, before anything is resolved, downloaded or deleted; build_dlssg.check also stops on a missing file and on a file that is no DLL, with a message instead of a traceback. tests/dlssg_exports_check.py adds a DLL with every declared export (it passes), the two-export DLL, a missing file and two files that are no DLL (they stop, naming why), make_launcher.check_dlssg on both DLLs, and that both scripts' main makes the check before streamline_pin.resolve and shutil.rmtree; it fails when the call is taken out of make_launcher.py main. The DLL built from this branch passes make_launcher.check_dlssg; the DLL of 0.8.0 is refused, naming nx2sl_reflex2. docs/launcher.md and docs/building.md "Checks" say so. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -3,10 +3,17 @@ has, and names those the DLL lacks. A DLL built from older sources would otherwi
|
||||
optional export (nx2sl_reflex2, nx2sl_frames_max) for an older DLL and leaves its feature out without an error.
|
||||
|
||||
Builds a small DLL with two of three declared exports with MSYS2 UCRT64's clang (no MSVC, no Streamline SDK, no game
|
||||
files) and checks that the third is the one reported; then that nx2_sl.h's own declarations are read in full.
|
||||
files) and checks that the third is the one reported; then that nx2_sl.h's own declarations are read in full. The
|
||||
release gate: build_dlssg.check stops on that DLL (nx2_sl.h lists nx2sl_reflex2), on a missing file and on files that
|
||||
are no DLL, and passes a DLL built with every export nx2_sl.h declares; tools/make_launcher.py and tools/make_kit.py
|
||||
run it on their --dlssg DLL before they resolve, download or delete anything (a release that shipped the DLL of 0.8.0
|
||||
would never let Reflex hold the frame limit).
|
||||
|
||||
Usage: dlssg_exports_check.py
|
||||
"""
|
||||
import contextlib
|
||||
import inspect
|
||||
import io
|
||||
import os
|
||||
import shutil
|
||||
import subprocess
|
||||
@@ -37,6 +44,16 @@ def compiler():
|
||||
return shutil.which('clang') or 'clang'
|
||||
|
||||
|
||||
def refused(fn, *args):
|
||||
"""The message fn(*args) exits with, None when it returns."""
|
||||
try:
|
||||
with contextlib.redirect_stdout(io.StringIO()):
|
||||
fn(*args)
|
||||
except SystemExit as e:
|
||||
return str(e.code)
|
||||
return None
|
||||
|
||||
|
||||
def main():
|
||||
if os.name != 'nt':
|
||||
print('dlssg_exports_check: Windows only (it builds a DLL)')
|
||||
@@ -67,6 +84,35 @@ def main():
|
||||
expect(f'{name} declared in nx2_sl.h', name in declared, True)
|
||||
# the header names its version and log types too, which are no exports of their own
|
||||
expect('types that are no functions', {'nx2sl_' + t for t in ('Image', 'Camera', 'Log')} & declared, set())
|
||||
|
||||
# The release gate. A DLL with every export nx2_sl.h declares passes; the two-export one, a missing file and files
|
||||
# that are no DLL stop it, naming why.
|
||||
(work / 'all.c').write_text(''.join(f'__declspec(dllexport) void {n}(void) {{}}\n' for n in sorted(declared)),
|
||||
encoding='utf-8')
|
||||
full = work / 'all.dll'
|
||||
subprocess.check_call([compiler(), '-shared', '-O1', str(work / 'all.c'), '-o', str(full)], env=env)
|
||||
expect('missing from a DLL with every declared export', build_dlssg.missing_exports(full), [])
|
||||
expect('check of a DLL with every declared export', refused(build_dlssg.check, full), None)
|
||||
why = refused(build_dlssg.check, dll) or ''
|
||||
expect('check of the two-export DLL names nx2sl_reflex2', 'nx2sl_reflex2' in why and 'build it again' in why, True)
|
||||
expect('check of a missing DLL', 'is missing' in (refused(build_dlssg.check, work / 'none.dll') or ''), True)
|
||||
(work / 'tiny.dll').write_bytes(b'MZ')
|
||||
for name in ('two.c', 'tiny.dll'):
|
||||
expect(f'check of {name}, no DLL', 'no DLL' in (refused(build_dlssg.check, work / name) or ''), True)
|
||||
|
||||
# make_launcher.py's check_dlssg is that check, and both packaging scripts make it before they resolve the
|
||||
# Streamline files (a download) or delete their output folder.
|
||||
import make_kit
|
||||
import make_launcher
|
||||
expect('make_launcher.check_dlssg passes the full DLL', refused(make_launcher.check_dlssg, full), None)
|
||||
expect('make_launcher.check_dlssg names nx2sl_reflex2',
|
||||
'nx2sl_reflex2' in (refused(make_launcher.check_dlssg, dll) or ''), True)
|
||||
for mod, call, later in ((make_launcher, 'check_dlssg(a.dlssg)', ('streamline_pin.resolve(', 'shutil.rmtree(')),
|
||||
(make_kit, 'build_dlssg.check(a.dlssg)', ('streamline_pin.resolve(', 'shutil.rmtree('))):
|
||||
src = inspect.getsource(mod.main)
|
||||
at = src.find(call)
|
||||
for what in later:
|
||||
expect(f'{mod.__name__}.main checks the DLL before {what}', 0 <= at < src.find(what), True)
|
||||
print(f'dlssg_exports_check: {"ok" if not fails else f"{fails} failed"} ({len(declared)} exports in nx2_sl.h)')
|
||||
return 1 if fails else 0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user