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

wsl build polishing

Browse Source
This commit is contained in:
Eric 2024-03-14 13:54:08 -07:00
parent 13f9766b5a
commit 358a9a78e5
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
3 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.efrocachemap generated
View File

@ -4069,18 +4069,18 @@
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "e5db667cca97477bdc53745597ce96c0",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "a691fe1725d4e3e8659d4a8910767a6b",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "757d3686278016f0a8c14ca32351869f",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "c83bdc7dedf14fb6b75e791426bc1c42",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "2690110d6a4dcd67c9185106f5348804",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "e0aad2e5e0429f267c68e1adc01f4de2",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "e2b04830b186f5c34712772dbb8c3c0c",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "fa31138ed07fd6e51405dae341bca138",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "7f3147c3eb2d6b47d060cec361333609",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "6c0b13deccc79d9b1ce05bdfe8cd77cc",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "df56e81732b09e2d7870e53a69c487d8",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "60e4941df0d4d6f05f4f5d4497f5b31f",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "83029d84710058c0400a2030c95805f4",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "eedc5c8f235853c327ea04ed9ba04f0f",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "c4908dc4c7bff0f87e2469b145e9fe64",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "362b4a7954ad3a47ac22549dc16c6787",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "10ccfc4b9c884ca0ca60fd15609fa6cb",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "e18663da062012118b436aabcd75cf7c",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "1c75a8e2450cd3bf96efc32677784edc",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "deada7140743b15eea52f1b66c486542",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "3381e9d471deacfd0e97a86d9f0f6848",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "0649827117009561b8c9fa32129c86ce",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "40399aa75b1ba5f311a60fe603625403",
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "d9865523059d8cf11b2bef4b9da9a8c9",
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "56d6440f62c271c4ce9ef520400395a3",
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "d9865523059d8cf11b2bef4b9da9a8c9",
@ -4097,14 +4097,14 @@
"build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "c2cf0dc227e41a826c913d12e117c316",
"build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "fbdc80e41c5883b4a893d2f0786e377f",
"build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "c2cf0dc227e41a826c913d12e117c316",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "e1af076467c1cc96971e775233439907",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "a4665e417f029f4c5324a7ce5f16ead3",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "d60e21fa70b7fe8f3859e7b67f2cec67",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "0b86527ec5d6e35b2533a3a2d49303e3",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "95a5100c5aaf7b29f96f8fb2b14b15c9",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "5a7404105c65723799acf224c117691b",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "35c723d0a7d7967d8bba43600dcf6daf",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "3674b562a6fec4a925c3f38ee1753599",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "0b6c8327a15412e4ab3a253fa9fadff3",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "973ffdae08f948453ab4806fb72b360e",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "9ec66f16714b9db09a1645b312aa0122",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "664874b21961688a84b97bbc0fc8f397",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "e07ac9a02f9e401f86254c98dcbaa41d",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "398d6a9469e27bd248197e9074fd1cee",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "f1b48c627999966bfdd738955f1a1060",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "cdc7d4cb6dede80631aa985053c07423",
"src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c",
"src/assets/ba_data/python/babase/_mgen/enums.py": "b611c090513a21e2fe90e56582724e9d",
"src/ballistica/base/mgen/pyembed/binding_base.inc": "72bfed2cce8ff19741989dec28302f3f",

12
Makefile
View File

@ -982,7 +982,7 @@ windows-release: windows-release-build
build/windows/Release_Win32/BallisticaKitGeneric.exe
# Build a debug windows build (from WSL).
windows-debug-build: \
windows-debug-build: prereqs \
build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib \
build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb
@$(WSLW) $(PCOMMAND) ensure_prefab_platform windows_x86
@ -992,7 +992,7 @@ windows-debug-build: \
$(MAKE) _windows-wsl-build
# Rebuild a debug windows build (from WSL).
windows-debug-rebuild: \
windows-debug-rebuild: prereqs \
build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib \
build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb
@$(WSLW) $(PCOMMAND) ensure_prefab_platform windows_x86
@ -1002,7 +1002,7 @@ windows-debug-rebuild: \
$(MAKE) _windows-wsl-rebuild
# Build a release windows build (from WSL).
windows-release-build: \
windows-release-build: prereqs \
build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib \
build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb
@$(WSLW) $(PCOMMAND) ensure_prefab_platform windows_x86
@ -1012,7 +1012,7 @@ windows-release-build: \
$(MAKE) _windows-wsl-build
# Rebuild a release windows build (from WSL).
windows-release-rebuild: \
windows-release-rebuild: prereqs \
build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib \
build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb
@$(WSLW) $(PCOMMAND) ensure_prefab_platform windows_x86
@ -1022,13 +1022,13 @@ windows-release-rebuild: \
$(MAKE) _windows-wsl-rebuild
# Remove all non-git-managed files in windows subdir.
windows-clean:
windows-clean: prereqs
@$(CHECK_CLEAN_SAFETY)
git clean -dfx ballisticakit-windows
rm -rf build/windows $(LAZYBUILDDIR)
# Show what would be cleaned.
windows-clean-list:
windows-clean-list: prereqs
@$(CHECK_CLEAN_SAFETY)
git clean -dnx ballisticakit-windows
echo would also remove build/windows $(LAZYBUILDDIR)

9
tools/batools/pcommands2.py
View File

@ -452,9 +452,12 @@ def wsl_build_check_win_drive() -> None:
.strip()
)
# If we're sitting under the linux filesystem, our path
# will start with \\wsl$; fail in that case and explain why.
if not path.startswith('\\\\wsl$'):
# If we're sitting under the linux filesystem, our path will start
# with '\\wsl$' or '\\wsl.localhost' or '\\wsl\'; fail in that case
# and explain why.
if not any(
path.startswith(x) for x in ['\\\\wsl$', '\\\\wsl.', '\\\\wsl\\']
):
return
def _wrap(txt: str) -> str: