RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-01-24 07:53:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed non-deterministic meta makefile output

Browse Source
This commit is contained in:
Eric Froemling 2021-06-17 12:50:26 -05:00
parent e0caa9f8c4
commit 30f6a4595b
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
3 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.efrocachemap
View File

@ -3942,18 +3942,18 @@
"build/prefab/full/linux_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/9c/7b/ac1a200be0f37078af0991faca3b",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/a4/91/8d8a90a2ccd3aa7e51a62dcd7d7a",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/fb/4f/deef20e32ad1a92c79758cd4252d",
"build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/68/66/747283dbcdf848e0d62a73a82200",
"build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/c6/92/c616a31b4be861abf2a9b0d70de7",
"build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/89/73/9bcb6c8f0a60f6a9c2278c039f58",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/57/0d/9c965a910cfb6514771a0f585de4",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/f4/19/64399caa4bc76d945c82969d4ebb",
"build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/1d/61/2700666994aa453c37376288675e",
"build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/57/51/afe92d8021fc350f92da28391e46",
"build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/42/eb/84dfabd457c5092c5b40bb11a28a",
"build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/9c/27/5c3e3eef62e64063b9f217212f33",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/6d/e2/bdfb61495e49f5a949863f8cff3e",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/e2/e1/39a42a80ba4c9a37f9e667b3b5f9",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/ab/23/4f9cfb8e92e80c18116c4e2dd934",
"build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/73/80/7661e8fc0a40f4d968e8aeabfeb3",
"build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/2d/e7/d028cd75c7d4b9e22919f24c8709",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/19/87/964975a139cee7e17a18d585d54c",
"build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/05/4a/99772931fdc72c7d3deba9e5502a",
"build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/f2/29/444730cfdc2405f77504dd4b4e43",
"build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/b4/5c/10c3008a0a6a5e7e9d7e657798d2",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/c4/b8/92c752ae082420a17bc6215bb03b",
"build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/c9/67/47a504bca4906315ff040684e123",
"build/prefab/lib/linux_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/9a/32/bda06e355384dac2fc81c8357812",
"build/prefab/lib/linux_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/34/f6/b4db57144d47cfdb153dd4de6742",
"build/prefab/lib/linux_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/53/44/cf4405c2ebe2695d55858129d3fe",
@ -3970,12 +3970,12 @@
"build/prefab/lib/mac_x86_64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/b5/5b/0390ee8916f97d302cde3ea356bc",
"build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/7a/ee/8249ede29becc0cd41178924b6dc",
"build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/c0/5f/e89024a87dd092f6e0cc43afb707",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/c6/dd/e25f66a0c19c56cb179fddbbc263",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/e9/ca/f4c64ac2c2db2e2a2aa0348ca8ff",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/3a/02/c883737c57cb91244b6866edf587",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/8a/57/2dd931360573cc374d4d86e982b4",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/5e/0b/fcf14570433439d3580dccd96fe8",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/5f/f0/2829f0f7cf045e40ee996d45f5dc",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/cb/b3/ffd40d3ed27d544a6c3bf312a604",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/94/1c/e27d2ac86f2774380221b3ba6961"
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/92/a0/d808e79d9db491df207c99e91d97",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/37/ea/79a527eb1baff08e700257fcb656",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/53/4c/7ee11892665db5473e339a51a630",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/9b/c8/4b08f3a2191a01d31c113e88e14d",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/29/ac/b962e9954738d7498746ec0c3390",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/df/0f/b50adb3f60401ff5548fd93b131c",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/b3/7b/ce0105af2871a2919cf25683d0a3",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/b5/00/cb9e4eafaceb764f45a8a1e27008"
}

6
src/meta/Makefile
View File

@ -15,12 +15,12 @@ sources: \
../ballistica/generated/python_embedded/binding.inc \
../ballistica/generated/python_embedded/bootstrap.inc
../ballistica/generated/python_embedded/bootstrap.inc : bameta/python_embedded/bootstrap.py ../../tools/batools/meta.py
@$(PCOMMAND) gen_flat_data_code $< $@ bootstrap_code
../ballistica/generated/python_embedded/binding.inc : bameta/python_embedded/binding.py ../../tools/batools/meta.py
@$(PCOMMAND) gen_binding_code $< $@
../ballistica/generated/python_embedded/bootstrap.inc : bameta/python_embedded/bootstrap.py ../../tools/batools/meta.py
@$(PCOMMAND) gen_flat_data_code $< $@ bootstrap_code
#__AUTOGENERATED_PUBLIC_END__
# This section is autogenerated; do not edit by hand.

8
tools/batools/metamakefile.py
View File

@ -82,7 +82,8 @@ def _emit_group_efrocache_lines(targets: List[Target],
def _add_python_embedded_targets(targets: List[Target]) -> None:
pkg = 'bameta'
for fname in os.listdir(f'src/meta/{pkg}/python_embedded'):
# Note: sort to keep things deterministic.
for fname in sorted(os.listdir(f'src/meta/{pkg}/python_embedded')):
if (not fname.endswith('.py') or fname == '__init__.py'
or 'flycheck' in fname):
continue
@ -107,7 +108,8 @@ def _add_python_embedded_targets(targets: List[Target]) -> None:
def _add_python_embedded_targets_internal(targets: List[Target]) -> None:
pkg = 'bametainternal'
for fname in os.listdir(f'src/meta/{pkg}/python_embedded'):
# Note: sort to keep things deterministic.
for fname in sorted(os.listdir(f'src/meta/{pkg}/python_embedded')):
if (not fname.endswith('.py') or fname == '__init__.py'
or 'flycheck' in fname):
continue
@ -192,7 +194,7 @@ def update(projroot: str, check: bool) -> None:
print(f'{fname} is up to date.')
else:
if check:
if bool(True):
if bool(False):
print(f'FOUND------\n{original}\nEND FOUND--------\n'
f'EXPECTED------\n{out}\nEND EXPECTED-------\n')
raise CleanError(f"ERROR: file is out of date: '{fname}'.")