RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-02-02 21:45:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Making asset Makefile generation deterministic

Browse Source
This commit is contained in:
Eric Froemling 2020-06-02 14:22:58 -07:00
parent 16e2bba5ee
commit 0cada3316d
2 changed files with 1491 additions and 1484 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2956
assets/Makefile
View File

File diff suppressed because it is too large Load Diff

19
tools/update_assets_makefile
View File

@ -63,7 +63,7 @@ def _get_targets(varname: str,
all_targets.add(os.path.join(dstfin, outname)) all_targets.add(os.path.join(dstfin, outname))
targets.append(os.path.join(dstrootvar, outname)) targets.append(os.path.join(dstrootvar, outname))
return '\n' + varname + ' = \\\n ' + ' \\\n '.join(targets) return '\n' + varname + ' = \\\n ' + ' \\\n '.join(sorted(targets))
def _get_py_targets(src: str, dst: str, py_targets: List[str], def _get_py_targets(src: str, dst: str, py_targets: List[str],
@ -149,6 +149,9 @@ def _get_py_targets_subset(all_targets: Set[str], subset: str,
all_targets, all_targets,
subset=subset) subset=subset)
py_targets.sort()
pyc_targets.sort()
out = (f'\nSCRIPT_TARGETS_PY{suffix} = \\\n ' + out = (f'\nSCRIPT_TARGETS_PY{suffix} = \\\n ' +
' \\\n '.join(py_targets) + '\n') ' \\\n '.join(py_targets) + '\n')
@ -220,6 +223,7 @@ def _get_extras_targets_win(all_targets: Set[str], platform: str) -> str:
# including it. # including it.
raise RuntimeError(f'Unexpected extras file: {fname}') raise RuntimeError(f'Unexpected extras file: {fname}')
targets.sort()
p_up = platform.upper() p_up = platform.upper()
out = (f'\nEXTRAS_TARGETS_WIN_{p_up} = \\\n ' + ' \\\n '.join(targets) + out = (f'\nEXTRAS_TARGETS_WIN_{p_up} = \\\n ' + ' \\\n '.join(targets) +
'\n') '\n')
@ -331,11 +335,14 @@ def main() -> None:
else: else:
if check: if check:
print(f"{Clr.SRED}ERROR: file is out of date: '{fname}'.{Clr.RST}") print(f"{Clr.SRED}ERROR: file is out of date: '{fname}'.{Clr.RST}")
print(f'EXPECTED ===========================================\n'
f'{out}\n' # Print exact contents if we need to debug:
f'FOUND ==============================================\n' if bool(False):
f'{original}\n' print(f'EXPECTED ===========================================\n'
f'END COMPARE ========================================') f'{out}\n'
f'FOUND ==============================================\n'
f'{original}\n'
f'END COMPARE ========================================')
sys.exit(255) sys.exit(255)
print(f'{Clr.SBLU}Updating: {fname}{Clr.RST}') print(f'{Clr.SBLU}Updating: {fname}{Clr.RST}')
with open(fname, 'w') as outfile: with open(fname, 'w') as outfile: