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

Merge branch 'master' of github.com:efroemling/ballistica

Browse Source
This commit is contained in:
Eric Froemling 2023-06-06 12:22:35 -07:00
commit 8293b53d42
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
3 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.efrocachemap generated
View File

@ -4080,18 +4080,18 @@
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/f4/6f/aa2b417a9797fe0f11c4f542aeb3",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/b4/07/fb400d012c9cc329c3a217852e26",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/0f/3c/d1b770ff37a9b53c860362f05400",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/bd/16/c1709db56780f001b5b1bf47317f",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/f1/e1/94fd20bfea79c3cb3242ceddea03",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/a5/7e/9ceb3f55b731cffbc328ea743491",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/79/15/bcbd5d58fdc570b4b4eb5655ae7f",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/39/e8/cebc735a26df34d69627349c823e",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/c5/54/ec4fd0499ca54baa05cd9bef5c78",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/fe/20/59037de2db9181b1f96be6e7d80a",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/a8/17/ad97e7f9bee23ac71fd410a4e2b1",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/3e/a3/13891776879d294ab560c47e5053",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/73/00/58a11fad57922bfebd07b2dfc5fa",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/27/b5/e0612387e2ab52fc92780ede6147",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/b2/34/0e687a8fca611ec2caa43bab1170",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/a8/65/5fb5e25457fa8e278b97f01e82e2",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/e2/bf/9389ad3c3b8fee044ce2d5b07432",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/a4/14/3fd19331236afb93ebe295bb328f",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/f1/93/2291e8eb86dc7c0e07b0b60877c6",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/33/48/4daa0a62b8452df8f4b965ea43ab",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/d8/53/f71b51592fda6b77c00b0e890555",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/2e/04/cba21154a7db3af8e7d19f3ec50b",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/66/73/42068db7cd3aca15f5746eb6c21b",
"build/prefab/lib/linux_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/98/32/43c61f1e11520f764158cf0e76d2",
"build/prefab/lib/linux_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/ca/65/cba463f21a8f76c5bbfe27cae124",
"build/prefab/lib/linux_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/73/20/119211f1700bb5a410cedf4e76f2",
@ -4108,14 +4108,14 @@
"build/prefab/lib/mac_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/90/9b/94f733c3a48691e02240e04dc792",
"build/prefab/lib/mac_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/2e/c7/873af48627997b6fab4b2c4ba6bc",
"build/prefab/lib/mac_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/3a/94/4780fada10f0fc3f43a54f29c86f",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/4c/1e/9f1e7d2c79cfe7d012453e98209b",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/8b/13/e584a4cd61cdde4636fbd43586cc",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/e6/e2/09a91d25f903cadd653c9b530d2b",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/d9/93/e007b82c50e019690ee61e72d847",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/50/a5/14b0b319f0c9e18a72cae8f18432",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/1a/9a/6adcdb3c87c7db6d9a31d9527926",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/03/dc/954de197cd62e0e4bee19b040777",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/15/1d/aa3f018074c2e6b79a81915db7da",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/31/c2/41f93fcaeb1019b114892a214fc8",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/98/63/a37e4160b5339fb6ea003a0532af",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/3e/c1/0c244bed327a50e918106935dfd5",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/c3/78/dc1aa3faafebe98f69a92dcf8608",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/a2/dc/4f5fbedbf52e14f8df6c6c6e4faa",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/ae/db/d7c4471cabc81948b60a070c2a21",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/df/63/693593431de89ec86f54c01daff4",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/f6/99/c20882e36313168110a7fa8eb5df",
"src/assets/ba_data/python/babase/_mgen/__init__.py": "https://files.ballistica.net/cache/ba1/52/c6/c11130af7b10d6c0321add5518fa",
"src/assets/ba_data/python/babase/_mgen/enums.py": "https://files.ballistica.net/cache/ba1/38/c3/1dedd5e74f2508efc5974c8815a1",
"src/ballistica/base/mgen/pyembed/binding_base.inc": "https://files.ballistica.net/cache/ba1/75/9f/bcf597b362c9f2480cb348188bdd",

10
Makefile
View File

@ -595,12 +595,15 @@ build/prefab/lib/windows/Release_%/BallisticaKitHeadlessPlus.pdb: .efrocachemap
# #
################################################################################
spinoff-test-empty:
tools/pcommand spinoff_test empty $(SPINOFF_TEST_EXTRA_ARGS)
spinoff-test-core:
tools/pcommand spinoff_test core $(SPINOFF_TEST_EXTRA_ARGS)
spinoff-test-base:
tools/pcommand spinoff_test base $(SPINOFF_TEST_EXTRA_ARGS)
spinoff-test-plus:
tools/pcommand spinoff_test plus $(SPINOFF_TEST_EXTRA_ARGS)
spinoff-test-clean:
rm -rf build/spinofftest
@ -627,7 +630,8 @@ spinoff-upgrade:
@tools/pcommand echo GRN Spinoff upgrade successful!
# Tell make which of these targets don't represent files.
.PHONY: spinoff-test-empty spinoff-update spinoff-upgrade
.PHONY: spinoff-test-core spinoff-test-base spinoff-test-plus \
spinoff-test-clean spinoff-update spinoff-upgrade
################################################################################

8
tools/batools/spinoff/_test.py
View File

@ -16,6 +16,7 @@ def spinoff_test(args: list[str]) -> None:
import os
import subprocess
from batools.featureset import FeatureSet
from efrotools import extract_flag
from efro.terminal import Clr
from efro.error import CleanError
@ -29,8 +30,11 @@ def spinoff_test(args: list[str]) -> None:
)
if len(args) != 1:
raise CleanError('Expected 1 arg.')
featuresets = {fs.name: fs for fs in FeatureSet.get_all_for_project('.')}
testtype = args[0]
if testtype in {'empty', 'base'}:
if testtype in featuresets:
path = f'build/spinofftest/{testtype}'
print(
f'{Clr.BLD}Running spinoff test{Clr.RST}'
@ -64,7 +68,7 @@ def spinoff_test(args: list[str]) -> None:
'SpinoffTest',
path,
'--featuresets',
'none' if testtype == 'empty' else testtype,
testtype,
] + (['--submodule-parent'] if submodule_parent else [])
# Show the spinoff command we'd use here.