diff --git a/.efrocachemap b/.efrocachemap index 32d0781e..ecce8b59 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4056,26 +4056,26 @@ "build/assets/windows/Win32/ucrtbased.dll": "2def5335207d41b21b9823f6805997f1", "build/assets/windows/Win32/vc_redist.x86.exe": "b08a55e2e77623fe657bea24f223a3ae", "build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599", - "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "51eb8ee7f97835a487494bbe3869d702", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "bb5eade6de1fb338cbcb2cb691d4eebd", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "eeb855680f33e8901fcb23c4cb539369", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "403d1b20dc11319c6667039f012035c7", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "0fbf1ff1896de970aefe40b034966789", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "c63dcfbd5d429fb54a30b36e373c7c34", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "9264a2f5261cd3b56fced39db78cbf16", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "b78682fac01bedf15ef4ee13f0aede78", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "6242c63e436030308c8c918ce9ea3214", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "2a59b67dfdae26c4e2226c432f316cfc", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "315dacb75a96693695fe6c2aaf51073a", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "8535ef87b65343afdf9c1127c878dced", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "ca3ce870b93304802c3ea255aa73c3dd", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "076feb0c841deef01e26d1035d7c0721", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "ccb41c4fe7badef30f9bff7dff5d11dc", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "573d8bfa6e42ad03b3a8805b3644eaf3", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "5c81e62b2efc773a78f1ce24a914cb8c", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "539bf968a5ae26ae8f530c4bc99d03f8", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "a2ce60fe2c2bca31bbc0f11de54ef7bd", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "1a43b70c78f9acb51ce21ea19e49a471", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "6e0c343aacae91cbe1547c687e94668e", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "098e142d582df6344e98394d6fb97db4", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "efd499526a39fd5179859a9e1625ec8d", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "6971d3fc8ae33a11482f1048d554b417", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "1220c1300c8cbe573fec751aa447de04", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "558d693e0437a5a27dae7d76fa1704f8", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "ee0a5079bca77d0d6acd8ebdf0fc3970", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "cf157e03d0507fdff6ff84437a177ac8", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "ba6b7c1f839d9c9e9fb873a089c0fa8a", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "bbb0ba330355a9338b3d67ffcc12d4c0", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "a89b14819ae8af278ec73c031a1af6f2", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "91e696d7b81d8066b29c567032427ac1", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "1f23c3a2788e9eb1b520d641fb88b324", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "914d24b36a02162edb938e4c9ec96fc4", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "51eb697d75b447f8b2b2fb540f38a14c", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "3bef3a27c3f4ac02ce38cadb9a57256b", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "140e5975208e167b54c894d12d2cd094", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "a0eef114cfc726deb89d700591258292", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "5f825428523357832b9d2504fdddea29", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "1dc44e1653e3f56311e3dccb5a043c60", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "d838781c9192c6d1db86bd540478aadf", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "b9f7438c554cdadedd0d71aabb3a1d86", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "d838781c9192c6d1db86bd540478aadf", diff --git a/CHANGELOG.md b/CHANGELOG.md index e2825063..1b4ff30d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.34 (build 21813, api 8, 2024-04-24) +### 1.7.34 (build 21815, api 8, 2024-04-24) - Bumped Python version from 3.11 to 3.12 for all builds and project tools. One of the things this means is that we can use `typing.override` instead of the `typing_extensions` version so the annoying requirement of installing diff --git a/Makefile b/Makefile index 8f005688..0da5f567 100644 --- a/Makefile +++ b/Makefile @@ -1274,18 +1274,23 @@ SKIP_ENV_CHECKS ?= 0 VENV_PYTHON ?= python3.12 # Rebuild our virtual environment whenever reqs or Python version changes. -# This is a prereq dependency so should not itself depend on env. Note -# that we rely on pcommand but can't use it in here until the end when the -# venv is up. +# This is a prereq dependency so should not itself depend on env. Note that we +# rely on pcommand but can't use it in here until the end when the venv is up. +# Also note that we try to update existing venvs when possible, but when +# Python version changes we blow it away and start over to be safe. .venv/efro_venv_complete: tools/pcommand config/requirements.txt \ tools/efrotools/pyver.py - @echo Creating Project\'s Python Virtual Environment... - @rm -rf .venv + @[ -f .venv/bin/$(VENV_PYTHON) ] \ + && echo Updating existing $(VENV_PYTHON) virtual environment in \'.venv\'... \ + || (echo Creating new $(VENV_PYTHON) virtual environment in \'.venv\'... \ + && rm -rf .venv) $(VENV_PYTHON) -m venv .venv .venv/bin/pip install --upgrade pip .venv/bin/pip install -r config/requirements.txt - touch .venv/efro_venv_complete # Done last to avoid partly-built venvs. - @$(PCOMMAND) echo GRN Python Virtual Environment Created. + touch .venv/efro_venv_complete # Done last to enforce fully-built venvs. + @$(PCOMMAND) echo \ + GRN Project virtual environment for BLD $(VENV_PYTHON) RST GRN \ + at BLD .venv RST GRN is ready to use. .cache/checkenv: $(ENV_SRC) @if [ $(SKIP_ENV_CHECKS) -ne 1 ]; then \ diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index bdd45d17..784c01b2 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -52,7 +52,7 @@ if TYPE_CHECKING: # Build number and version of the ballistica binary we expect to be # using. -TARGET_BALLISTICA_BUILD = 21813 +TARGET_BALLISTICA_BUILD = 21815 TARGET_BALLISTICA_VERSION = '1.7.34' diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index a3beedec..040537c9 100644 --- a/src/ballistica/shared/ballistica.cc +++ b/src/ballistica/shared/ballistica.cc @@ -39,7 +39,7 @@ auto main(int argc, char** argv) -> int { namespace ballistica { // These are set automatically via script; don't modify them here. -const int kEngineBuildNumber = 21813; +const int kEngineBuildNumber = 21815; const char* kEngineVersion = "1.7.34"; const int kEngineApiVersion = 8;