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

server build cleanup

Browse Source
This commit is contained in:
Eric 2023-06-05 16:22:20 -07:00
parent 71ed8bb546
commit 83532c7a60
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
9 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.efrocachemap
View File

@ -4080,18 +4080,18 @@
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/b2/55/64d847b58c501c80b4ea53678e9a",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/9f/37/b4553f9f9fda9fb07d7f3f3ab2f6",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/cf/b4/d955fed8589fd59e0f15e69ab568",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/65/a3/34afc32ae7905a49621520d7291b",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/4a/05/10cc30b0ded557d9286e2e26d486",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/b1/2f/33ad58bdcbcb2ac5de570b7b86d4",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/b9/cf/969aad103e8da47cc2555b27bfba",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/18/22/57ccb81d1b96110eff004a1656d5",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/d4/50/fc305556a2926c5c69004b49a09a",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/45/ee/6dd5e336da0f28223a1b9338cb21",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/90/32/4e95ddbb7611ae96df47a3dd173a",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/bc/5d/513cbfa9287f138912cb73f61783",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/a5/95/d11e6b2f8bcc23c83060a2678ed3",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/b7/19/5973c9eb86ff711c7856651f5229",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/e3/71/cd19381bd0a9c81f112dd90868ae",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/54/3c/aa7e808f5e7a9fc4830290192f8b",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/0c/73/2bb8dd3c39fcda244ee231b105a2",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/c3/20/6823526bb3053a7d5708b50850b0",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/3f/f7/bde95fd3a0c0f0fe6b4bdfa4ff12",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/a5/9b/ecf8dae5f555fd38551c8884927c",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/9c/6d/fa923da9bb9609523f9ae37ebd56",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/9e/34/83a809f6d12b058ba5a45fd0eb00",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/ff/09/3fcb74ff33a3a711acd4e9b75e13",
"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/98/da/0cdcca0ad9a3fa063015e1fe8425",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/a0/ad/c9c494e942d2df60ef86f4967aef",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/46/50/88d144bb1d31fce5a1631df42f11",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/5e/17/53028e65a32149b0209510d78895",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/ff/d8/98f7b6b84decd5cc59cd05fe3dc7",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/62/9c/7e77ca7427670457e35736e094fe",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/e4/a4/9891c46bbdd361fb65d159869d1d",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/15/4d/56ff31a63d9bf82ba8d6d4a42ee6",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/d9/cf/2f90c4210742224541437ae51521",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/1d/10/0f1585c47316e8a2015c6e1efb71",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/f1/41/71edf4fef97a89aca00078ae668a",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/60/08/ef5554bc3e3af5e8e7daa7cbe4ff",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/7c/5f/843eac9fe5db8541b0a1875d89cd",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/e3/db/2eb585cae51558230c7511768b56",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/86/49/675ce12e49e33bdd2327850eac28",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/2d/17/833dcfd99307a446e607bf8d5c10",
"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/4e/07/87dd93e7ef29b8b78d0b4791d6f8",

2
config/projectconfig.json
View File

@ -49,7 +49,7 @@
],
"python_source_dirs": [
"src/assets/ba_data/python",
"src/assets/server",
"src/assets/server_package",
"src/assets/workspace",
"src/meta",
"tools",

4
src/assets/.asset_manifest_public.json
View File

@ -601,6 +601,6 @@
"ba_data/python/efro/rpc.py",
"ba_data/python/efro/terminal.py",
"ba_data/python/efro/util.py",
"server/__pycache__/ballisticakit_server.cpython-311.opt-1.pyc",
"server/ballisticakit_server.py"
"server_package/__pycache__/ballisticakit_server.cpython-311.opt-1.pyc",
"server_package/ballisticakit_server.py"
]

15
src/assets/Makefile
View File

@ -37,7 +37,7 @@ cmake:
# Build everything needed for our server builds.
server:
@echo Note: skipping warm_start_asset_build for server target.
@echo Note - skipping warm_start_asset_build for server target.
@$(MAKE) assets-server
@$(TOOLS_DIR)/pcommand clean_orphaned_assets
@ -414,7 +414,7 @@ SCRIPT_TARGETS_PY_PUBLIC = \
$(BUILD_DIR)/ba_data/python/bauiv1/modutils.py \
$(BUILD_DIR)/ba_data/python/bauiv1/onscreenkeyboard.py \
$(BUILD_DIR)/ba_data/python/bauiv1/ui/__init__.py \
$(BUILD_DIR)/server/ballisticakit_server.py
$(BUILD_DIR)/server_package/ballisticakit_server.py
SCRIPT_TARGETS_PYC_PUBLIC = \
$(BUILD_DIR)/ba_data/python/babase/__pycache__/__init__.cpython-311.opt-1.pyc \
@ -686,7 +686,7 @@ SCRIPT_TARGETS_PYC_PUBLIC = \
$(BUILD_DIR)/ba_data/python/bauiv1/__pycache__/modutils.cpython-311.opt-1.pyc \
$(BUILD_DIR)/ba_data/python/bauiv1/__pycache__/onscreenkeyboard.cpython-311.opt-1.pyc \
$(BUILD_DIR)/ba_data/python/bauiv1/ui/__pycache__/__init__.cpython-311.opt-1.pyc \
$(BUILD_DIR)/server/__pycache__/ballisticakit_server.cpython-311.opt-1.pyc
$(BUILD_DIR)/server_package/__pycache__/ballisticakit_server.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)
@ -7524,8 +7524,7 @@ clean:
@rm -rf $(BUILD_DIR)
# These targets don't correspond to actual files; make sure make knows that.
.PHONY: cmake win mac ios android audio audio-clean fonts fonts-clean \
data data-clean meshes meshes-clean \
textures-clean scripts scripts-clean \
assets assets-cmake assets-win-Win32 assets-win-x64 assets-mac \
assets-ios assets-android asset_sources clean
.PHONY: cmake win mac ios android audio audio-clean fonts fonts-clean data \
data-clean meshes meshes-clean textures-clean scripts scripts-clean \
assets assets-cmake assets-server assets-win-Win32 assets-win-x64 \
assets-mac assets-ios assets-android asset_sources clean

0
src/assets/server/README.txt → src/assets/server_package/README.txt
View File

0
src/assets/server/ballisticakit_server.py → src/assets/server_package/ballisticakit_server.py
View File

0
src/assets/server/config_template.yaml → src/assets/server_package/config_template.yaml
View File

0
src/assets/server/launch_ballisticakit_server.bat → src/assets/server_package/launch_ballisticakit_server.bat
View File

10
tools/batools/assetstaging.py
View File

@ -408,7 +408,8 @@ def _sync_server_files(cfg: Config) -> None:
stage_server_file(
projroot=cfg.projroot,
mode=modeval,
infilename=f'{cfg.projroot}/src/assets/server/ballisticakit_server.py',
infilename=f'{cfg.projroot}/src/assets/server_package/'
'ballisticakit_server.py',
outfilename=os.path.join(
cfg.serverdst,
'ballisticakit_server.py'
@ -419,13 +420,14 @@ def _sync_server_files(cfg: Config) -> None:
stage_server_file(
projroot=cfg.projroot,
mode=modeval,
infilename=f'{cfg.projroot}/src/assets/server/README.txt',
infilename=f'{cfg.projroot}/src/assets/server_package/README.txt',
outfilename=os.path.join(cfg.serverdst, 'README.txt'),
)
stage_server_file(
projroot=cfg.projroot,
mode=modeval,
infilename=f'{cfg.projroot}/src/assets/server/config_template.yaml',
infilename=f'{cfg.projroot}/src/assets/server_package/'
'config_template.yaml',
outfilename=os.path.join(cfg.serverdst, 'config_template.yaml'),
)
if cfg.win_type is not None:
@ -433,7 +435,7 @@ def _sync_server_files(cfg: Config) -> None:
stage_server_file(
projroot=cfg.projroot,
mode=modeval,
infilename=f'{cfg.projroot}/src/assets/server/{fname}',
infilename=f'{cfg.projroot}/src/assets/server_package/{fname}',
outfilename=os.path.join(cfg.serverdst, fname),
)