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

tidying

Browse Source
This commit is contained in:
Eric Froemling 2021-06-15 14:26:56 -05:00
parent 66e79b6017
commit 0f05f5d1ee
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
3 changed files with 25 additions and 28 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/fd/d2/6afb31906b505245196190546e51",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/91/0f/ab8b884c63ced885a6cf7630e8d9",
"build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/5e/cf/8edaa19ea0a5eb13769626d1a540",
"build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/b1/c9/2edbce55fa83d915f50af4523b4c",
"build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/cc/9b/9356a25f110fa3d4e8605b9e2904",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/15/81/8ab98b768524d02766ff8a354682",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/c6/d9/ee13d5b6d8c3b2b096ce13366d2c",
"build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/1e/fa/ad873063e48b4d24edf4e4aeb7cc",
"build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/92/7b/66ee04a3dcf88cd518889d2e9e99",
"build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/38/23/99b9fea9267c57a814ed067c0599",
"build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/37/a8/798f929264b3d557b2ba88f2894d",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/e1/75/6093230a354406f2f7c3a3c46f71",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/47/6e/cfc416c65015d620acb094b46f30",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/cf/be/f4df8928742323c928e2c8415d75",
"build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/73/4a/9d6e87d4a44eef10b6b9825306fc",
"build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/0a/a2/0c173213a9a79c93ff2bc4696d85",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/bb/7a/9028eb0a7de38218ef06a767f875",
"build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/f8/4d/b409a6528e441f92b8894c705fcf",
"build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/a5/d9/a00b0aed327dba3cff775f6d15ec",
"build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/b0/e6/9dc9200fddfe9dc756021a5a9540",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/50/44/b8a7a25e95b9d2fa948c07a3abf8",
"build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/84/6f/9d762749a51107e5f157fb78408b",
"build/prefab/lib/linux_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/7d/b6/475f313a5e1163d8b18f81fda053",
"build/prefab/lib/linux_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/6c/78/4d4cd81c4b925a202fe4d961ab69",
"build/prefab/lib/linux_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/ce/42/dabc253464415881a92d09a5cbcb",
@ -3970,12 +3970,12 @@
"build/prefab/lib/mac_x86_64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/52/b2/d066bd3e31452e6662d055f7f7a4",
"build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/b0/2e/bd0ad8735d54d5fb7cf480f9dc88",
"build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/80/9f/eac377e047bcd3354d20cca82a98",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/74/cf/8cfc5b53618c0b0e3aa8cf05d1e1",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/df/71/f35faeb4f1d5b33a1ad5b7a6c26c",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/09/d0/8fd552e80cf89d6a51430755cb67",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/3b/87/3725a3ad1fd3f20e1ead77b5b7d9",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/aa/1a/71b97598c702ec447f335d76fca8",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/e8/41/db0ba40f1b974228c3a1cb0acc81",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/63/0f/5802a63c95ad9a6b018fff581bd8",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/5a/13/4e296d84e598a9d2dd78acc66122"
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/42/77/1921f1016cb750497752ec391b1c",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/0e/41/d04161c863b9fa6d5100a2a0f5d3",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/04/8e/81d41aca26fa174f151c1dbb64c1",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/4e/36/eb1968777618567a57c06037fc16",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/36/05/bdbffaab5039230c2fbcb7d8c878",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/e7/c4/324bb33d12a37d46c6a38da7a63d",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/2a/d8/77387d2781de3bb624538c80a2cc",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/b1/51/67daef6f5638ddf3ebeb61186539"
}

8
assets/Makefile
View File

@ -128,7 +128,7 @@ $1: $$(subst /__pycache__,,$$(subst .cpython-38.opt-1.pyc,.py,$1))
$$(TOOLS_DIR)/pcommand compile_python_files $$^ && chmod 444 $$@
endef
#AUTOGENERATED_BEGIN_PUBLIC (this section is managed by "update_project")
#__AUTOGENERATED_BEGIN_PUBLIC__
SCRIPT_TARGETS_PY_PUBLIC = \
build/ba_data/python/ba/__init__.py \
@ -689,9 +689,9 @@ $(SCRIPT_TARGETS_PY_PUBLIC_TOOLS) : build/ba_data/python/%.py : ../tools/%.py
# Instead we generate individual targets in a loop.
$(foreach element,$(SCRIPT_TARGETS_PYC_PUBLIC_TOOLS),\
$(eval $(call make-opt-pyc-target,$(element))))
#AUTOGENERATED_END_PUBLIC
#__AUTOGENERATED_END_PUBLIC__
#AUTOGENERATED_BEGIN_PRIVATE (this section is managed by "update_project")
#__AUTOGENERATED_BEGIN_PRIVATE__
SCRIPT_TARGETS_PY_PRIVATE_APPLE = \
build/pylib-apple/__future__.py \
@ -6984,7 +6984,7 @@ EXTRAS_TARGETS_WIN_X64 = \
$(EXTRAS_TARGETS_WIN_X64) : ../.efrocachemap
@cd .. && tools/pcommand efrocache_get assets/$@
#AUTOGENERATED_END_PRIVATE
#__AUTOGENERATED_END_PRIVATE__
ASSET_TARGETS_COMMON += $(MODEL_TARGETS)

13
tools/batools/assetsmakefile.py
View File

@ -258,18 +258,15 @@ def update_assets_makefile(projroot: str, check: bool) -> None:
original = infile.read()
lines = original.splitlines()
auto_start_public = lines.index('#AUTOGENERATED_BEGIN_PUBLIC (this section'
' is managed by "update_project")')
auto_end_public = lines.index('#AUTOGENERATED_END_PUBLIC')
auto_start_private = lines.index(
'#AUTOGENERATED_BEGIN_PRIVATE (this section'
' is managed by "update_project")')
auto_end_private = lines.index('#AUTOGENERATED_END_PRIVATE')
auto_start_public = lines.index('#__AUTOGENERATED_BEGIN_PUBLIC__')
auto_end_public = lines.index('#__AUTOGENERATED_END_PUBLIC__')
auto_start_private = lines.index('#__AUTOGENERATED_BEGIN_PRIVATE__')
auto_end_private = lines.index('#__AUTOGENERATED_END_PRIVATE__')
all_targets_public: Set[str] = set()
all_targets_private: Set[str] = set()
# We always auto-generate the '1' section.
# We always auto-generate the public section.
our_lines_public = [
_get_py_targets_subset(all_targets_public,
subset='public',