From c58f93e9c4c256c09e3c74d4423b6001a7da36df Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 19 Jun 2023 12:08:09 -0700 Subject: [PATCH] removing some old cache code --- .efrocachemap | 56 ++++++++++++++--------------- CHANGELOG.md | 2 +- src/assets/ba_data/python/baenv.py | 2 +- src/ballistica/shared/ballistica.cc | 2 +- tools/efrotools/efrocache.py | 51 -------------------------- 5 files changed, 31 insertions(+), 82 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index f675a537..77ada522 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4072,26 +4072,26 @@ "build/assets/workspace/ninjafightplug.py": "https://files.ballistica.net/cache/ba1/7f/b0/d7426f678c1fee642855e391f1b9", "build/assets/workspace/onslaughtplug.py": "https://files.ballistica.net/cache/ba1/21/26/7a4f7252ef70fdb86c734acacc42", "build/assets/workspace/runaroundplug.py": "https://files.ballistica.net/cache/ba1/53/0b/df2f7aaaf3cf4d9578c2bc5d4ad9", - "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/e1/a1/d42abacd67fd548e3b1f8b00f9a5", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/4f/c9/f1a5c91d4c0990f598e20a258a49", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/eb/c1/6531d164691a93333daa9ddb36a6", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/32/70/3dd061ca3a3d6cd63cdb7da0aac2", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/1d/47/451cd70a1d6646ae6f83d3567d48", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/26/fd/59b9afd53ea515391679f52ceef2", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/ac/df/6b01d65881d294bd8c6a98959f16", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/70/54/7f06ca7b2df9c726f9c2e1f04dde", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/58/ab/785f7f653651693412920ad13917", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/6c/c2/4fb8516a5d6a2bf0de7f2fb81e53", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/77/98/3c44eb98b11f13fd6b52c892ef13", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/42/07/3bd8d1d7f66af19ac319cbad65e8", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/55/ab/734424c359aed021aa63c1946968", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/f4/55/5d365e04925bdf8ec252bc83be64", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/28/f4/4656cd794aa594a5c48343f5a7f9", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/62/7c/9a68c5870bcba7a44e2fcacf7315", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/e9/99/9c08b84d1d834eb2a791f384bc9f", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/27/da/6f90dc8db2ab1710abbf409bc07a", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/39/05/c7a223069592a0435c8556f9f9e9", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/f7/1d/44bb58085c25565b6e1684600b73", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/a0/93/97d65f33fbdb4290fcd2504ea7dc", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/fb/63/db9b48b5866ed27bda8d04cae2ad", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/d9/2c/d9ae9941824a784320da1d0e5924", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/cb/95/f5baa206619fbb82091727394cd4", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/cb/59/2182ab4f9e586198f19b6ef40721", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/d8/8f/45fc7a9b303abf7236d92e75426f", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/d1/b1/1aa0bc8bc5e967423dcbb7c2a09b", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/11/e1/ab5afe174e47070e8c80d3ff4a1d", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/a1/fe/00ed542d105de6d3bf3e13661f84", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/f6/6f/b3856ec3abd226e151739d2b4934", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/7b/6c/37126b3889cce46b84ecd0e6f51b", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/1e/21/60608e5de9cd5cc78f49745eff30", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/0d/0d/614782a81abb93f61dbc0f2baa72", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/f1/10/968f7b0aa4ca47a540c6b9433559", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/dd/e3/0d5f59619889591ed394a63dd5b8", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/64/0d/1d74089ac614697b7bd845b90491", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/0d/15/0bad144e460a0f2e70776ed6efdf", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/75/e0/f9fb47e7a46ac227dc7d24f17a9b", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/8d/85/61148b796a8b7cd6782b9923889a", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/9e/7d/f4ae27371d6f34b23de7ffdd4bc5", "build/prefab/lib/linux_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/8a/39/82acd22444cdde966df4838b3235", "build/prefab/lib/linux_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/82/23/3da9e812f6d9d83e9c4678645792", "build/prefab/lib/linux_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/8a/39/82acd22444cdde966df4838b3235", @@ -4108,14 +4108,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/2b/1d/067ca5d1bc54339f2b8682ef1aed", "build/prefab/lib/mac_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/65/49/cdbaca8ea343d79992618514438c", "build/prefab/lib/mac_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/2b/1d/067ca5d1bc54339f2b8682ef1aed", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/79/c7/83db855938ea3d1343bf75067dff", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/6e/c9/5c77b0e28645c07e85bc7b95792e", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/7a/58/46402790b89843834edbb6fea0f9", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/1d/7f/792413ec5fab4ac2f558a0a77439", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/39/34/83936b5765902edf6b6c22c73e36", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/67/85/3973e71bf296ca8c36361083145a", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/51/5f/ba670684aeaf9ea29cb3542a3e2c", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/ff/aa/cebeccfde0758048d068a14ec477", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/8e/37/b82ca02d65ee86100b7a23ad3129", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/f5/c8/b094cb9809c616a8394b8a4072ec", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/18/b5/3b8d3c278e56cb4522de22424387", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/ba/bb/6f496b8e0021722857db52c75de0", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/e8/7b/8b1e320760841fa3d173b1cead88", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/33/6a/b5c4ae400d21448e783f202c31d3", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/7c/5a/8389337316014fb973526a3f04a8", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/e8/cc/7279ec93c3d7da736c8439c2dc70", "src/assets/ba_data/python/babase/_mgen/__init__.py": "https://files.ballistica.net/cache/ba1/f8/85/fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "https://files.ballistica.net/cache/ba1/48/4b/e6974f0a4d14be8213dc00d971c3", "src/ballistica/base/mgen/pyembed/binding_base.inc": "https://files.ballistica.net/cache/ba1/3e/7a/203e2a5d2b5bb42cfe3fd2fe16c2", diff --git a/CHANGELOG.md b/CHANGELOG.md index f38aa8ea..280d606c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.20 (build 21127, api 8, 2023-06-19) +### 1.7.20 (build 21128, api 8, 2023-06-19) - This seems like a good time for a `refactoring` release in anticipation of changes coming in 1.8. Basically this means that a lot of things will be diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index 8d4ef612..c96de69f 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -28,7 +28,7 @@ if TYPE_CHECKING: # Build number and version of the ballistica binary we expect to be # using. -TARGET_BALLISTICA_BUILD = 21127 +TARGET_BALLISTICA_BUILD = 21128 TARGET_BALLISTICA_VERSION = '1.7.20' _g_env_config: EnvConfig | None = None diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index ce40ed9c..4a925f2f 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 = 21127; +const int kEngineBuildNumber = 21128; const char* kEngineVersion = "1.7.20"; auto MonolithicMain(const core::CoreConfig& core_config) -> int { diff --git a/tools/efrotools/efrocache.py b/tools/efrotools/efrocache.py index 81282b1c..2b815dc7 100644 --- a/tools/efrotools/efrocache.py +++ b/tools/efrotools/efrocache.py @@ -153,15 +153,6 @@ def get_target(path: str) -> None: # Ok we should have a valid file in our cache dir at this point. # Just expand it to the target path. - # UPDATE: Should not be a problem anymore; waiting to see... - # Strangely, decompressing lots of these simultaneously leads to - # occasional "File does not exist" errors when running on Windows - # Subsystem for Linux. There should be no overlap in files getting - # written, but perhaps something about how tar rebuilds the - # directory structure causes clashes. It seems that just explicitly - # creating necessary directories first prevents the problem. - # os.makedirs(os.path.dirname(path), exist_ok=True) - print(f'Extracting: {path}') try: @@ -189,13 +180,6 @@ def get_target(path: str) -> None: os.remove(path) raise - # The file will wind up with the timestamp it was compressed with, - # so let's update its timestamp or else it will still be considered - # dirty. - # UPDATE - shouldn't be a problem anymore since we're writing things - # ourselves. - # subprocess.run(f'touch {path}', shell=True, check=True) - if not os.path.exists(path): raise RuntimeError(f'File {path} did not wind up as expected.') @@ -504,45 +488,10 @@ def _write_cache_file(staging_dir: str, fname: str) -> tuple[str, str]: return (fname, hashpath) -def _write_cache_file_old(staging_dir: str, fname: str) -> tuple[str, str]: - import hashlib - - print(f'Caching {fname}') - if ' ' in fname: - raise RuntimeError('Spaces in paths not supported.') - - # Just going with ol' md5 here; we're the only ones creating these - # so security isn't a concern. - md5 = hashlib.md5() - with open(fname, 'rb') as infile: - md5.update(infile.read()) - md5.update(fname.encode()) - finalhash = md5.hexdigest() - hashpath = os.path.join(finalhash[:2], finalhash[2:4], finalhash[4:]) - path = os.path.join(staging_dir, hashpath) - os.makedirs(os.path.dirname(path), exist_ok=True) - - # Fancy pipe stuff which will give us deterministic tar.gz files - # with no embedded timestamps. Note: The 'COPYFILE_DISABLE' prevents - # mac tar from adding file attributes/resource-forks to the archive - # as as ._filename. - subprocess.run( - f'COPYFILE_DISABLE=1 tar cf - {fname} | gzip -n > {path}', - shell=True, - check=True, - ) - return fname, hashpath - - def _check_warm_start_entry(entry: tuple[str, str]) -> None: # import hashlib fname, filehash = entry - # md5 = hashlib.md5() - # with open(fname, 'rb') as infile: - # md5.update(infile.read()) - # md5.update(fname.encode()) - # finalhash = md5.hexdigest() # If the file still matches the hash value we have for it, # go ahead and update its timestamp.