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

asset build fixes

Browse Source
This commit is contained in:
Eric 2023-06-25 16:01:44 -07:00
parent 42f68eb44a
commit 1e6b59d586
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
5 changed files with 34 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
.efrocachemap generated
View File

@ -2584,7 +2584,6 @@
"build/assets/ba_data/textures/zoeIconColorMask.pvr": "https://files.ballistica.net/cache/ba1/6f/7d/c66539ed15a07ae628afec5f6f47",
"build/assets/ba_data/textures/zoeIconColorMask_preview.png": "https://files.ballistica.net/cache/ba1/bf/72/70f1783287ce74e47b67b56e216a",
"build/assets/ba_data/textures/zoeIcon_preview.png": "https://files.ballistica.net/cache/ba1/f6/41/a31316b126aea94f9adb62f23524",
"build/assets/mac_disk_image/dmgbuild_settings.py": "https://files.ballistica.net/cache/ba1/a0/0f/9b4f4952bf3dedd8e25395c3cb61",
"build/assets/pylib-android/__future__.py": "https://files.ballistica.net/cache/ba1/ac/c2/4f51e6ae9197e256968b30ebe487",
"build/assets/pylib-android/__hello__.py": "https://files.ballistica.net/cache/ba1/db/85/012d4e4d5bee6d13b4561846166f",
"build/assets/pylib-android/_aix_support.py": "https://files.ballistica.net/cache/ba1/f0/0b/4f005e2b9de6c018215d40a58647",
@ -4069,9 +4068,6 @@
"build/assets/windows/Win32/ucrtbased.dll": "https://files.ballistica.net/cache/ba1/2d/ef/5335207d41b21b9823f6805997f1",
"build/assets/windows/Win32/vc_redist.x86.exe": "https://files.ballistica.net/cache/ba1/b0/8a/55e2e77623fe657bea24f223a3ae",
"build/assets/windows/Win32/vcruntime140d.dll": "https://files.ballistica.net/cache/ba1/86/5b/2af4d1e26a1a8073c89acb06e599",
"build/assets/workspace/ninjafightplug.py": "https://files.ballistica.net/cache/ba1/7f/b0/d7426f678c1fee642855e391f1b9",
"build/assets/workspace/onslaughtplug.py": "https://files.ballistica.net/cache/ba1/21/26/7a4f7252ef70fdb86c734acacc42",
"build/assets/workspace/runaroundplug.py": "https://files.ballistica.net/cache/ba1/53/0b/df2f7aaaf3cf4d9578c2bc5d4ad9",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/05/39/9f392f63f9383e8ef3457d08f362",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/ea/05/7ea22ed9c5f1f514b9e39d90cde6",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/46/1c/bd65d52f0848387e56a536a346a5",
@ -4080,18 +4076,18 @@
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/a1/85/9ca2209cd2baf659b4e2b40b79fd",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/3b/e4/d49571e34cf479114d9cf4742737",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/e7/b8/53a5666e993663054202393e589b",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/87/f3/7151c4d1c6429c2189484e92cc37",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/75/ce/4ad89a9551ca3e3e935c4545f174",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/1d/38/6982622cd9cf6e57d295b070eded",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/71/3b/7a231834ef5f0e258e9612affda9",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/8b/f1/7ef9574bfae29d4f74c585aa4130",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/8f/6a/9b8d0b4b6dd97f4d5d4b48f5b84d",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/48/1d/c9762e55356a288aebfefecbd43e",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/14/9f/91b6ce7c3282ae203703618627a9",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/78/71/d5ab66d0f577a746e05f44d753bd",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/33/67/e32865d5160bb26183b8b4257a88",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/85/ba/98322913ba70e71e3858ee7916e5",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/b1/e7/82454a746760150ceca6265daa2c",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/12/37/ca8d54ec589bc95dd9030a635035",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/9f/b7/fdec2c3c131abe175e716698605e",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/e0/98/0bbf19d4dfd300f51be3b1d37e11",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/34/42/4dab8c07ceb80c20da66528279af",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/4f/86/82f31c58833531102604b0fca0b8",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/8c/d5/b193480372f02a47e99c2774bd6b",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/08/59/d701c12712effe14b89ea37c013f",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/99/01/8c49ac6d34dc7219ccf047794437",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/51/ae/49b7723adac6c2e763d03bf27b16",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/32/18/35d3b785547afc61cfb6b3ba3504",
"build/prefab/lib/linux_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/be/19/b5458933dfc7371d91ecfcd2e06f",
"build/prefab/lib/linux_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/4e/48/123b806cbe6ddb3d9a8368bbb4f8",
"build/prefab/lib/linux_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/be/19/b5458933dfc7371d91ecfcd2e06f",
@ -4108,14 +4104,14 @@
"build/prefab/lib/mac_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/7e/fa/291fd7e935502ced7e99b8c8f7f0",
"build/prefab/lib/mac_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/e1/cb/7e8440699e59e8646da25aa5782b",
"build/prefab/lib/mac_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/7e/fa/291fd7e935502ced7e99b8c8f7f0",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/1d/8d/d01ccda454ea16adbb262f23e90e",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/2d/73/46264206f210eeda9e94249316c4",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/d6/67/412ded16ff0ef1b2fc0ee7b4f211",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/bd/4f/b80edc03236420b4f8b32ed50d40",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/f9/e7/3ffb70fa73036ed695b71e2e1d2e",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/d7/e2/2d88e9d5d5d6f487ce1e0a69e64d",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/2d/5b/c0af89d8398542765a084c5bb258",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/99/a7/09d5b2990db22d1c8874c7bb1883",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/5c/4e/26f72e68d55dcf12d62b1274b7ad",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/c3/61/d40dfab20f59da7155b942632066",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/a9/f7/ddae4d7e7e59f0b9db4eee09d226",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/4a/a4/c9c09853640eb5a5f5a0ce4cf71c",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/9d/42/a7bc0e69180e2e45e5b5b93cc49c",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/9a/a7/5e31d7b317e4544feff2eabad4a5",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/3b/74/84e7f0fb207da9a99a0c71b12a2e",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/2e/dc/4406fedd025a80037e395097ee19",
"src/assets/ba_data/python/babase/_mgen/__init__.py": "https://files.ballistica.net/cache/ba1/f8/85/fed7f2ed98ff2ba271f9dbe3391c",
"src/assets/ba_data/python/babase/_mgen/enums.py": "https://files.ballistica.net/cache/ba1/48/4b/e6974f0a4d14be8213dc00d971c3",
"src/ballistica/base/mgen/pyembed/binding_base.inc": "https://files.ballistica.net/cache/ba1/3e/7a/203e2a5d2b5bb42cfe3fd2fe16c2",

2
CHANGELOG.md
View File

@ -1,5 +1,7 @@
### 1.7.21 (build 21143, api 8, 2023-06-25)
- Fixed an issue where server builds would not always include collision meshes.
### 1.7.20 (build 21140, api 8, 2023-06-22)
- This seems like a good time for a `refactoring` release in anticipation of

10
src/assets/.asset_manifest_private.json
View File

@ -2605,8 +2605,6 @@
"ba_data/textures/zoeIconColorMask.pvr",
"ba_data/textures/zoeIconColorMask_preview.png",
"ba_data/textures/zoeIcon_preview.png",
"mac_disk_image/__pycache__/dmgbuild_settings.cpython-311.opt-1.pyc",
"mac_disk_image/dmgbuild_settings.py",
"pylib-android/__future__.py",
"pylib-android/__hello__.py",
"pylib-android/__pycache__/__future__.cpython-311.opt-1.pyc",
@ -6489,11 +6487,5 @@
"windows/x64/ucrtbased.dll",
"windows/x64/vc_redist.x64.exe",
"windows/x64/vcruntime140_1d.dll",
"windows/x64/vcruntime140d.dll",
"workspace/__pycache__/ninjafightplug.cpython-311.opt-1.pyc",
"workspace/__pycache__/onslaughtplug.cpython-311.opt-1.pyc",
"workspace/__pycache__/runaroundplug.cpython-311.opt-1.pyc",
"workspace/ninjafightplug.py",
"workspace/onslaughtplug.py",
"workspace/runaroundplug.py"
"windows/x64/vcruntime140d.dll"
]

20
src/assets/Makefile
View File

@ -2727,11 +2727,7 @@ SCRIPT_TARGETS_PY_PRIVATE_COMMON = \
$(BUILD_DIR)/ba_data/python-site-packages/yaml/resolver.py \
$(BUILD_DIR)/ba_data/python-site-packages/yaml/scanner.py \
$(BUILD_DIR)/ba_data/python-site-packages/yaml/serializer.py \
$(BUILD_DIR)/ba_data/python-site-packages/yaml/tokens.py \
$(BUILD_DIR)/mac_disk_image/dmgbuild_settings.py \
$(BUILD_DIR)/workspace/ninjafightplug.py \
$(BUILD_DIR)/workspace/onslaughtplug.py \
$(BUILD_DIR)/workspace/runaroundplug.py
$(BUILD_DIR)/ba_data/python-site-packages/yaml/tokens.py
SCRIPT_TARGETS_PYC_PRIVATE_COMMON = \
$(BUILD_DIR)/ba_data/python-site-packages/_yaml/__pycache__/__init__.cpython-311.opt-1.pyc \
@ -2755,11 +2751,7 @@ SCRIPT_TARGETS_PYC_PRIVATE_COMMON = \
$(BUILD_DIR)/ba_data/python-site-packages/yaml/__pycache__/resolver.cpython-311.opt-1.pyc \
$(BUILD_DIR)/ba_data/python-site-packages/yaml/__pycache__/scanner.cpython-311.opt-1.pyc \
$(BUILD_DIR)/ba_data/python-site-packages/yaml/__pycache__/serializer.cpython-311.opt-1.pyc \
$(BUILD_DIR)/ba_data/python-site-packages/yaml/__pycache__/tokens.cpython-311.opt-1.pyc \
$(BUILD_DIR)/mac_disk_image/__pycache__/dmgbuild_settings.cpython-311.opt-1.pyc \
$(BUILD_DIR)/workspace/__pycache__/ninjafightplug.cpython-311.opt-1.pyc \
$(BUILD_DIR)/workspace/__pycache__/onslaughtplug.cpython-311.opt-1.pyc \
$(BUILD_DIR)/workspace/__pycache__/runaroundplug.cpython-311.opt-1.pyc
$(BUILD_DIR)/ba_data/python-site-packages/yaml/__pycache__/tokens.cpython-311.opt-1.pyc
# Rule to copy src asset scripts to dst.
# (and make non-writable so I'm less likely to accidentally edit them there)
@ -7389,7 +7381,8 @@ $(EXTRAS_TARGETS_WIN_X64) : ../../.efrocachemap
# __AUTOGENERATED_PRIVATE_END__
ASSET_TARGETS_COMMON_GUI += $(MESH_TARGETS)
ASSET_TARGETS_COMMON_GUI += $(MESH_TARGETS) $(COLLISION_MESH_TARGETS)
ASSET_TARGETS_COMMON_SERVER += $(COLLISION_MESH_TARGETS)
$(BUILD_DIR)/%.bob : ../../.efrocachemap
@cd ../.. && tools/pcommand efrocache_get src/assets/$@
@ -7450,9 +7443,10 @@ fonts-clean:
rm -rf $(BUILD_DIR)/ba_data/fonts
# Mesh targets needed for all platforms.
MESH_TARGETS = $(BOB_TARGETS) $(COB_TARGETS)
MESH_TARGETS = $(BOB_TARGETS)
COLLISION_MESH_TARGETS = $(COB_TARGETS)
meshes: $(MESH_TARGETS)
meshes: $(MESH_TARGETS) $(COLLISION_MESH_TARGETS)
meshes-clean:
rm -rf $(BUILD_DIR)/ba_data/meshes

8
tools/batools/assetsmakefile.py
View File

@ -74,8 +74,12 @@ def _get_py_targets(
def _do_get_targets(
proot: str, fnames: list[str], is_explicit: bool = False
) -> None:
# Special case: ignore temp py files in data src.
if proot == f'{ASSETS_SRC}/ba_data/data/maps':
# Special case: don't make targets for stuff in specific dirs.
if proot in {
f'{ASSETS_SRC}/ba_data/data/maps',
f'{ASSETS_SRC}/mac_disk_image',
f'{ASSETS_SRC}/workspace',
}:
return
assert proot.startswith(src), f'{proot} does not start with {src}'
assert dst.startswith(BUILD_DIR)