From 8d6933a0ec4cb82e2448c03da5d840c9b22f58da Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 27 Mar 2024 13:28:10 -0700 Subject: [PATCH] pubsync --- .efrocachemap | 34 ++++++++++---------- config/projectconfig.json | 3 +- src/assets/.asset_manifest_private.json | 4 +-- src/assets/Makefile | 4 +-- src/assets/ba_data/python/babase/modutils.py | 3 +- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index bfc0f61a..9cefe2be 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -3525,7 +3525,7 @@ "build/assets/pylib-apple/zoneinfo/_common.py": "5b52bdac4156dcbac96743fa99468bf2", "build/assets/pylib-apple/zoneinfo/_tzpath.py": "f021e91036bd38590f2ce643b59dc881", "build/assets/pylib-apple/zoneinfo/_zoneinfo.py": "d000d61aa8998d0076c37f96cf40ca69", - "build/assets/sphinx/template/conf.py": "1d00917de95f8f62f372caa1146ff602", + "build/assets/sphinx/static/conf.py": "8a748a8cbe437287cbaa4e1c714a2c5b", "build/assets/windows/Win32/DLLs/_asyncio.pyd": "36024ca5f0f257dd4edfe1a3e92c1a07", "build/assets/windows/Win32/DLLs/_asyncio_d.pyd": "a809fe3d7f3b6931e5f127821d0d30b6", "build/assets/windows/Win32/DLLs/_bz2.pyd": "cf535d3d0a020f0ae5ff20336a56ba3b", @@ -4073,18 +4073,18 @@ "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "cb0885abc1eec8519b61fb8c385c2cda", "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "e23061489f67b8f07dce2c4b5f114d8e", "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "6c9570104d3313f91a36931acafd1090", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "4a222cf12c0aedc1849a4cda65888bd6", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "b0aec1f04e3106632d93d31e7f901654", "build/prefab/full/mac_arm64_gui/release/ballisticakit": "4d2b3597d0ea7378e4152c90526cc001", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "600f4dbd16e018c595787cc67dc492c8", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "3976dd7194c4155f4ae5dcddea3a3096", "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "456eb5053a70ce81098f3a9e8c7b8d78", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "25a4969b483dae90698bfafdb9044567", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "e5e8c88b162d4a7432abea2f734a4db2", "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "80c62e2c9d1af776395558d667884959", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "265be70294eb9450795233e5ef3ce047", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "4cd252b34ddd225153fdd92c8c1afcbd", "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "7c9d660f3c7e98f37dc5be7a33e96f13", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "cb468d2c627656ec3c2e171037f5b441", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "07576bd78acb5677f165f3a670d1310e", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "d3e9aefb90569f613e20882ef83bc1f2", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "2323982b6c4db2350db00c90f06ed4cb", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "b32a464d949667c2b5c3c3cfd4aa6b82", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "51ddc9323f7d423c3b20764bb015daf7", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "27289a996f9bc52cc60151a8930d5af9", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "7ee6fbb73e709e2c2fb53838ccbaa126", "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", @@ -4101,14 +4101,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": "5d8cce09bb4d34d5ad9cca10d5e86a7d", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "17c879a37a4938b41b17abf83400c4ee", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "61f19ec01a97eddcae5f7f9f5d91fbcb", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "ad33e025f2152edac9525ed509083752", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "5bf65de8110b375aac82366eed736514", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "ac0a5895a757b956199914e00307c93b", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "34253c7a153f2f6d405761ce4e15b388", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "bc347fde61c8a74299ac7a3b493178bc", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "c40991ad42f5b397d73c11d299e49b05", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "a19ac1662d3d580a13a4755093ceaac3", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "b499ef0c3ecc489daf8a5ca6f21b5b73", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "b85ad1567908f4370a81db569f3f03a7", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "b4dd64d522edcbbfc0cd8a3aa0abb488", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "ea8495147dd7d93a342ae854b2728993", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "6ba719bfb854afe16726ec786929ff06", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "4e4eba94d16ba844d41646a851971e68", "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", diff --git a/config/projectconfig.json b/config/projectconfig.json index 92d5d235..f8f1237e 100644 --- a/config/projectconfig.json +++ b/config/projectconfig.json @@ -46,7 +46,8 @@ "pbxproj.pbxextensions", "openstep_parser", "daemon", - "jinja2" + "jinja2", + "jinja2.Environment" ], "python_paths": [ "src/assets/ba_data/python", diff --git a/src/assets/.asset_manifest_private.json b/src/assets/.asset_manifest_private.json index e467eb04..92a5edc2 100644 --- a/src/assets/.asset_manifest_private.json +++ b/src/assets/.asset_manifest_private.json @@ -4491,8 +4491,8 @@ "pylib-apple/zoneinfo/_common.py", "pylib-apple/zoneinfo/_tzpath.py", "pylib-apple/zoneinfo/_zoneinfo.py", - "sphinx/template/__pycache__/conf.cpython-311.opt-1.pyc", - "sphinx/template/conf.py", + "sphinx/static/__pycache__/conf.cpython-311.opt-1.pyc", + "sphinx/static/conf.py", "windows/Win32/DLLs/_asyncio.pyd", "windows/Win32/DLLs/_asyncio_d.pyd", "windows/Win32/DLLs/_bz2.pyd", diff --git a/src/assets/Makefile b/src/assets/Makefile index 54e13697..16eef89b 100644 --- a/src/assets/Makefile +++ b/src/assets/Makefile @@ -2745,7 +2745,7 @@ SCRIPT_TARGETS_PY_PRIVATE_COMMON = \ $(BUILD_DIR)/ba_data/python-site-packages/yaml/scanner.py \ $(BUILD_DIR)/ba_data/python-site-packages/yaml/serializer.py \ $(BUILD_DIR)/ba_data/python-site-packages/yaml/tokens.py \ - $(BUILD_DIR)/sphinx/template/conf.py + $(BUILD_DIR)/sphinx/static/conf.py SCRIPT_TARGETS_PYC_PRIVATE_COMMON = \ $(BUILD_DIR)/ba_data/python-site-packages/_yaml/__pycache__/__init__.cpython-311.opt-1.pyc \ @@ -2770,7 +2770,7 @@ SCRIPT_TARGETS_PYC_PRIVATE_COMMON = \ $(BUILD_DIR)/ba_data/python-site-packages/yaml/__pycache__/scanner.cpython-311.opt-1.pyc \ $(BUILD_DIR)/ba_data/python-site-packages/yaml/__pycache__/serializer.cpython-311.opt-1.pyc \ $(BUILD_DIR)/ba_data/python-site-packages/yaml/__pycache__/tokens.cpython-311.opt-1.pyc \ - $(BUILD_DIR)/sphinx/template/__pycache__/conf.cpython-311.opt-1.pyc + $(BUILD_DIR)/sphinx/static/__pycache__/conf.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) diff --git a/src/assets/ba_data/python/babase/modutils.py b/src/assets/ba_data/python/babase/modutils.py index cae7d8bd..6cfd9ae3 100644 --- a/src/assets/ba_data/python/babase/modutils.py +++ b/src/assets/ba_data/python/babase/modutils.py @@ -187,8 +187,7 @@ def delete_user_system_scripts() -> None: print('User system scripts deleted.') _babase.screenmessage('Deleted User System Scripts', color=(0, 1, 0)) _babase.screenmessage( - f'Closing {_babase.appname()} to make changes.', - color=(0, 1, 0) + f'Closing {_babase.appname()} to make changes.', color=(0, 1, 0) ) _babase.apptimer(2.0, _babase.quit) else: