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

more bacloud work

Browse Source
This commit is contained in:
Eric 2024-06-26 17:29:54 -07:00
parent 79dbd89c6b
commit 29fbb5d7eb
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
4 changed files with 38 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.efrocachemap generated
View File

@ -4046,18 +4046,18 @@
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "e1ffd608a74e1135a74535ef0f24de84",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "0df1d668840d11debccf8cd018acf04f",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "a8c964a36ad22fab92cb003f66e0e463",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "24097673630e5b052b383277a260aea2",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "5f6a362cdc3dc07a9e320310db5c4e62",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "a85895d48516991dd9a3cd5f3dbd11b0",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "c2764b0cde11a194cad2604fa1d1471f",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "b85ae2de125f02145cade4205891a10d",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "ea55aef603d7998f134bc25567d2e175",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "af07fba782424d77cd143a5b92a9aa8e",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "7de5d121b6bd1306aeb98ffe27c6e6a3",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "06b5aaf53195021bd21d05ec372fe403",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "b26f17d43516f14085628892b73d4023",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "dad46bc32a9994277900ddde9ccfe253",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "94dfd167a76d72054ec3f41f2a0b82fa",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "a0d37cea9ada58a27a38b039165160ed",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "7bcc1336a2a123041a8c01924bf237dc",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "d401578a393dce23422773dc38db40c8",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "a5b49b99f94e7750214ebfa22789f083",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "94524925f988de8e0b2921822d596442",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "33f03404c19e971272e277e33e77c093",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "fd3efc611054414d92f4188042590482",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "b6858701550a3bb5ed520cd6d3a8a72a",
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "f231b10895bdcb542de87b887ca181fd",
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "ae936a119668ede7b36f38c8672f4bf8",
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "f231b10895bdcb542de87b887ca181fd",
@ -4074,14 +4074,14 @@
"build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "efffc4f330e77530accd9a9f82840a6c",
"build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "c20363fe2af3d54e666b1c8ee67f6b76",
"build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "efffc4f330e77530accd9a9f82840a6c",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "15872f211c5469c1c36effbccc175df6",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "be9f86b56e673690295bc3ae0e34e4cd",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "9a66106a77e0850ced1de339e8ea09b3",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "aaa392bfda1f92d3ce3478ac833278a3",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "b589b7a0bf5dea29a4e979db7b331fed",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "6ad1eac0bfd7fe89a7d1be258cc562d2",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "88916d575d6e93fd22f50639d25ceeea",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "ea9a9af9f29d096abfdc9d9c88f503d4",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "953c62fb42149cc8c51b5d8a4ad36a46",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "c7185413efb31b6093a2916df7928754",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "98ab1eb9fb1aba1606962b3c51efb49c",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "51bbf56a16bc9f301e4fb1744f237ec4",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "fa3b1874be36e55d4de7951f8aa8603e",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "50a0207af5b0c5c9775b0533a2a5e5f4",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "2f209ae0d1994a4d2ed8f403957acd1f",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "7adb6321e32d575c9666b5eda99d43a0",
"src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c",
"src/assets/ba_data/python/babase/_mgen/enums.py": "5548f407d97e380069f6c596c4e36cd7",
"src/ballistica/base/mgen/pyembed/binding_base.inc": "efa61468cf098f77cc6a234461d8b86d",

2
tools/bacommon/bacloud.py
View File

@ -14,7 +14,7 @@ if TYPE_CHECKING:
# Version is sent to the master-server with all commands. Can be incremented
# if we need to change behavior server-side to go along with client changes.
BACLOUD_VERSION = 11
BACLOUD_VERSION = 12
@ioprepped

4
tools/batools/bacloud.py
View File

@ -329,10 +329,10 @@ class App:
def run_interactive_command(self, cwd: str, args: list[str]) -> None:
"""Run a single user command to completion."""
# pylint: disable=too-many-branches
assert self._project_root is not None
nextcall: tuple[str, dict] | None = (
'_interactive',
{'c': cwd, 'a': args},
{'c': cwd, 'p': str(self._project_root), 'a': args},
)
# Now talk to the server in a loop until there's nothing left to do.

44
tools/efrotools/pybuild.py
View File

@ -967,12 +967,6 @@ def gather(do_android: bool, do_apple: bool) -> None:
# pylint: disable=too-many-statements
# pylint: disable=too-many-branches
# Currently need to avoid using nested identical quotes in fstrings
# because black chokes on them, even though pylint wants us to.
#
# https://github.com/psf/black/issues/3746
# pylint: disable=inconsistent-quotes
class CompileArch(Enum):
"""The exhaustive set of single architectures we build for.
@ -1058,22 +1052,22 @@ def gather(do_android: bool, do_apple: bool) -> None:
# things.
bases2 = {
# 'mac': f'{bases["mac"]}/merge/macOS/macosx',
'mac': f'{bases["mac"]}/install/macOS/macosx',
'mac': f'{bases['mac']}/install/macOS/macosx',
# 'ios': f'{bases["ios"]}/merge/iOS/iphoneos',
'ios': f'{bases["ios"]}/install/iOS/iphoneos.arm64',
'ios': f'{bases['ios']}/install/iOS/iphoneos.arm64',
# 'ios_simulator': (
# f'{bases["ios_simulator"]}/merge/iOS/iphonesimulator'
# ),
'ios_simulator': (
f'{bases["ios_simulator"]}/install/iOS/iphonesimulator.arm64'
f'{bases['ios_simulator']}/install/iOS/iphonesimulator.arm64'
),
# 'tvos': f'{bases["tvos"]}/merge/tvOS/appletvos',
'tvos': f'{bases["tvos"]}/install/tvOS/appletvos.arm64',
'tvos': f'{bases['tvos']}/install/tvOS/appletvos.arm64',
# 'tvos_simulator': (
# f'{bases["tvos_simulator"]}/merge/tvOS/appletvsimulator'
# ),
'tvos_simulator': (
f'{bases["tvos_simulator"]}/install/tvOS/appletvsimulator.arm64'
f'{bases['tvos_simulator']}/install/tvOS/appletvsimulator.arm64'
),
'android_arm': f'build/python_android_arm{bsuffix}/{apost2}',
'android_arm64': f'build/python_android_arm64{bsuffix}/{apost2}',
@ -1090,42 +1084,42 @@ def gather(do_android: bool, do_apple: bool) -> None:
groups: dict[str, GroupDef] = {
'apple': GroupDef(
baseheaders=[
f'{bases["mac"]}/build/macOS/macosx/'
f'{bases['mac']}/build/macOS/macosx/'
f'python-{PY_VER_EXACT_APPLE}/Include',
f'{bases["ios"]}/build/iOS/iphoneos.arm64/'
f'{bases['ios']}/build/iOS/iphoneos.arm64/'
f'python-{PY_VER_EXACT_APPLE}/Include',
f'{bases["ios_simulator"]}'
f'{bases['ios_simulator']}'
f'/build/iOS/iphonesimulator.arm64/'
f'python-{PY_VER_EXACT_APPLE}/Include',
f'{bases["ios_simulator"]}'
f'{bases['ios_simulator']}'
f'/build/iOS/iphonesimulator.x86_64/'
f'python-{PY_VER_EXACT_APPLE}/Include',
f'{bases["tvos"]}/build/tvOS/appletvos.arm64/'
f'{bases['tvos']}/build/tvOS/appletvos.arm64/'
f'python-{PY_VER_EXACT_APPLE}/Include',
f'{bases["tvos_simulator"]}'
f'{bases['tvos_simulator']}'
f'/build/tvOS/appletvsimulator.arm64/'
f'python-{PY_VER_EXACT_APPLE}/Include',
f'{bases["tvos_simulator"]}'
f'{bases['tvos_simulator']}'
f'/build/tvOS/appletvsimulator.x86_64/'
f'python-{PY_VER_EXACT_APPLE}/Include',
],
basepylib=[
f'{bases["mac"]}/build/macOS/macosx/'
f'{bases['mac']}/build/macOS/macosx/'
f'python-{PY_VER_EXACT_APPLE}/Lib',
f'{bases["ios"]}/build/iOS/iphoneos.arm64/'
f'{bases['ios']}/build/iOS/iphoneos.arm64/'
f'python-{PY_VER_EXACT_APPLE}/Lib',
f'{bases["ios_simulator"]}'
f'{bases['ios_simulator']}'
f'/build/iOS/iphonesimulator.arm64/'
f'python-{PY_VER_EXACT_APPLE}/Lib',
f'{bases["ios_simulator"]}'
f'{bases['ios_simulator']}'
f'/build/iOS/iphonesimulator.x86_64/'
f'python-{PY_VER_EXACT_APPLE}/Lib',
f'{bases["tvos"]}/build/tvOS/appletvos.arm64/'
f'{bases['tvos']}/build/tvOS/appletvos.arm64/'
f'python-{PY_VER_EXACT_APPLE}/Lib',
f'{bases["tvos_simulator"]}'
f'{bases['tvos_simulator']}'
f'/build/tvOS/appletvsimulator.arm64/'
f'python-{PY_VER_EXACT_APPLE}/Lib',
f'{bases["tvos_simulator"]}'
f'{bases['tvos_simulator']}'
f'/build/tvOS/appletvsimulator.x86_64/'
f'python-{PY_VER_EXACT_APPLE}/Lib',
],