diff --git a/.efrocachemap b/.efrocachemap index 3862e01d..cf77fffa 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4080,18 +4080,18 @@ "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/00/49/e47efddc17c6668697ad9779615c", "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/e4/e7/3ec91b98817f29d17c95ee7bdee3", "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/4a/45/0299b8fe6a228b7ae3bd91edc606", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/f5/92/cfaa28fa91a7b2545ec2289a8071", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/bf/0d/c791e1e1b040ac424373e558ad11", "build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/fa/47/e5979c9a446e163af5758605d3ef", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/6e/2c/40cf3b68f674f3ad0fbd0fba7f48", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/fc/68/7cb8727eb338e5bcf53e59af30ff", "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/09/52/fce56e0d6da0d2017b577a625eb5", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/b1/47/94eab9bb4540a842f79dd78aa4ee", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/7e/be/b9660d8af3c5d6d3520f652e7de2", "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/83/ee/5e815a581095bc5cc4e9f4b0c520", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/12/35/6a63c934181c82f4523aba82d378", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/af/5f/4047f38de57013bf6695491b6b88", "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/36/17/ea670f5195251b7b926b7b271488", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/2b/60/a402337ddb61671923d653948905", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/0d/b9/447c11e4818329320a27b45c7262", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/1e/42/bf22e64d0fe31d441be2164935f2", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/87/37/1af7951e8f59e82b0b4f8e118e08", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/f1/e1/a72494c94f4e3b234f2197d5645f", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/63/bb/a4971d7a46d59911088a479357a1", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/27/82/92f54202a92c514520486b7aa249", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/87/f8/f8f95330358bf2c19e90507edcda", "build/prefab/lib/linux_arm64_gui/debug/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/df/11/f2087bd3edce7376be6e6113bfe0", "build/prefab/lib/linux_arm64_gui/release/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/aa/29/08d7c589821a466b966f79249394", "build/prefab/lib/linux_arm64_server/debug/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/97/f2/7c6e1c10b9677759ee72d73added", @@ -4108,14 +4108,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/d7/c4/ff0ab9a031720bd1889970f95f94", "build/prefab/lib/mac_x86_64_server/debug/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/00/23/6094e9f386f10c2608835d0d46bc", "build/prefab/lib/mac_x86_64_server/release/libballisticakit_internal.a": "https://files.ballistica.net/cache/ba1/61/2a/d5ed8af50aaa5093fa93f45db8fc", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericInternal.lib": "https://files.ballistica.net/cache/ba1/2e/7b/1866f0f354dfc59011a61c372df6", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/5a/57/d3fc2237590e79123da24845e40a", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/4c/ec/b2e5de1ed699942628efd7b08117", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/f2/c6/4060aeddb55881108f52a0209048", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericInternal.lib": "https://files.ballistica.net/cache/ba1/b4/db/720adb41a66e5cfa532ffe3e4e6f", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/50/18/89cb0b5d276b54a80db08ab45521", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/f0/6b/00565f29c79e4be066b495111972", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/62/62/7a52b00e8089be9fa24e28957b50", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericInternal.lib": "https://files.ballistica.net/cache/ba1/5d/bd/df6feb9c55f9e382f9875c0ccb20", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/2d/9f/6412e804d070330eb39ad5be50dc", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/02/5c/3844bef3e290d5c29e650ede14d3", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/03/56/fde889348f3647e36e8195f153b2", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericInternal.lib": "https://files.ballistica.net/cache/ba1/8e/1d/dba93a5710ef04dbc7e57bbba9f4", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/93/a2/7ca969845875806468bf19f65641", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/96/36/2937339f97d893b31601048380fc", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/da/4c/277c469ab9944ef068f0d7850981", "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/b4/3d/e352190a0e5673d101c0f3ee3ad2", diff --git a/tools/batools/dummymodule.py b/tools/batools/dummymodule.py index 2b69fbeb..00bcccda 100755 --- a/tools/batools/dummymodule.py +++ b/tools/batools/dummymodule.py @@ -931,7 +931,6 @@ def generate(projroot: str) -> None: f' generate dummy-modules...{Clr.RST}', flush=True, ) - binary_build_command = ['tools/pcommand', 'make_prefab', 'gui-release'] binary_path = ( subprocess.run( ['tools/pcommand', 'prefab_binary_path', 'gui-release'], @@ -941,6 +940,7 @@ def generate(projroot: str) -> None: .stdout.decode() .strip() ) + binary_build_command = ['make', binary_path] subprocess.run(binary_build_command, check=True) if not os.path.exists(binary_path): diff --git a/tools/batools/pcommand.py b/tools/batools/pcommand.py index 71f78da5..1e221cd9 100644 --- a/tools/batools/pcommand.py +++ b/tools/batools/pcommand.py @@ -702,8 +702,14 @@ def prefab_binary_path() -> None: raise RuntimeError('Expected 1 arg.') buildtype, buildmode = sys.argv[2].split('-') platform = batools.build.get_current_prefab_platform() + if buildtype == 'gui': + binpath = 'ballisticakit' + elif buildtype == 'server': + binpath = 'dist/ballisticakit_headless' + else: + raise ValueError(f"Invalid buildtype '{buildtype}'.") print( - f'build/prefab/full/{platform}_{buildtype}/{buildmode}/ballisticakit', + f'build/prefab/full/{platform}_{buildtype}/{buildmode}/{binpath}', end='', )