RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-02-08 16:53:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

wiring up efrocache to use pcommandbatch

Browse Source
This commit is contained in:
Eric Froemling 2023-08-17 13:03:17 -05:00
parent 6b568d49a1
commit 091b1584b6
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
5 changed files with 117 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
Makefile
View File

@ -266,10 +266,10 @@ prefab-mac-arm64-gui-debug-build: prereqs assets-cmake \
@$(STAGE_BUILD) -cmake -debug build/prefab/full/mac_arm64_gui/debug @$(STAGE_BUILD) -cmake -debug build/prefab/full/mac_arm64_gui/debug
build/prefab/full/mac_%_gui/debug/ballisticakit: .efrocachemap build/prefab/full/mac_%_gui/debug/ballisticakit: .efrocachemap
@tools/pcommand efrocache_get $@ @.cache/pcommandbatch/pcommandbatch efrocache_get $@
build/prefab/lib/mac_%_gui/debug/libballisticaplus.a: .efrocachemap build/prefab/lib/mac_%_gui/debug/libballisticaplus.a: .efrocachemap
@tools/pcommand efrocache_get $@ @.cache/pcommandbatch/pcommandbatch efrocache_get $@
# Mac gui release: # Mac gui release:
@ -296,10 +296,10 @@ prefab-mac-arm64-gui-release-build: prereqs assets-cmake \
@$(STAGE_BUILD) -cmake -release build/prefab/full/mac_arm64_gui/release @$(STAGE_BUILD) -cmake -release build/prefab/full/mac_arm64_gui/release
build/prefab/full/mac_%_gui/release/ballisticakit: .efrocachemap build/prefab/full/mac_%_gui/release/ballisticakit: .efrocachemap
@tools/pcommand efrocache_get $@ @.cache/pcommandbatch/pcommandbatch efrocache_get $@
build/prefab/lib/mac_%_gui/release/libballisticaplus.a: .efrocachemap build/prefab/lib/mac_%_gui/release/libballisticaplus.a: .efrocachemap
@tools/pcommand efrocache_get $@ @.cache/pcommandbatch/pcommandbatch efrocache_get $@
# Mac server debug: # Mac server debug:
@ -326,10 +326,10 @@ prefab-mac-arm64-server-debug-build: prereqs assets-server \
@$(STAGE_BUILD) -cmakeserver -debug build/prefab/full/mac_arm64_server/debug @$(STAGE_BUILD) -cmakeserver -debug build/prefab/full/mac_arm64_server/debug
build/prefab/full/mac_%_server/debug/dist/ballisticakit_headless: .efrocachemap build/prefab/full/mac_%_server/debug/dist/ballisticakit_headless: .efrocachemap
@tools/pcommand efrocache_get $@ @.cache/pcommandbatch/pcommandbatch efrocache_get $@
build/prefab/lib/mac_%_server/debug/libballisticaplus.a: .efrocachemap build/prefab/lib/mac_%_server/debug/libballisticaplus.a: .efrocachemap
@tools/pcommand efrocache_get $@ @.cache/pcommandbatch/pcommandbatch efrocache_get $@
# Mac server release: # Mac server release:
@ -358,10 +358,10 @@ prefab-mac-arm64-server-release-build: prereqs assets-server \
build/prefab/full/mac_arm64_server/release build/prefab/full/mac_arm64_server/release
build/prefab/full/mac_%_server/release/dist/ballisticakit_headless: .efrocachemap build/prefab/full/mac_%_server/release/dist/ballisticakit_headless: .efrocachemap
@tools/pcommand efrocache_get $@ @.cache/pcommandbatch/pcommandbatch efrocache_get $@
build/prefab/lib/mac_%_server/release/libballisticaplus.a: .efrocachemap build/prefab/lib/mac_%_server/release/libballisticaplus.a: .efrocachemap
@tools/pcommand efrocache_get $@ @.cache/pcommandbatch/pcommandbatch efrocache_get $@
# Linux gui debug: # Linux gui debug:
@ -388,10 +388,10 @@ prefab-linux-arm64-gui-debug-build: prereqs assets-cmake \
@$(STAGE_BUILD) -cmake -debug build/prefab/full/linux_arm64_gui/debug @$(STAGE_BUILD) -cmake -debug build/prefab/full/linux_arm64_gui/debug
build/prefab/full/linux_%_gui/debug/ballisticakit: .efrocachemap build/prefab/full/linux_%_gui/debug/ballisticakit: .efrocachemap
@tools/pcommand efrocache_get $@ @.cache/pcommandbatch/pcommandbatch efrocache_get $@
build/prefab/lib/linux_%_gui/debug/libballisticaplus.a: .efrocachemap build/prefab/lib/linux_%_gui/debug/libballisticaplus.a: .efrocachemap
@tools/pcommand efrocache_get $@ @.cache/pcommandbatch/pcommandbatch efrocache_get $@
# Linux gui release: # Linux gui release:
@ -418,10 +418,10 @@ prefab-linux-arm64-gui-release-build: prereqs assets-cmake \
@$(STAGE_BUILD) -cmake -release build/prefab/full/linux_arm64_gui/release @$(STAGE_BUILD) -cmake -release build/prefab/full/linux_arm64_gui/release
build/prefab/full/linux_%_gui/release/ballisticakit: .efrocachemap build/prefab/full/linux_%_gui/release/ballisticakit: .efrocachemap
@tools/pcommand efrocache_get $@ @.cache/pcommandbatch/pcommandbatch efrocache_get $@
build/prefab/lib/linux_%_gui/release/libballisticaplus.a: .efrocachemap build/prefab/lib/linux_%_gui/release/libballisticaplus.a: .efrocachemap
@tools/pcommand efrocache_get $@ @.cache/pcommandbatch/pcommandbatch efrocache_get $@
# Linux server debug: # Linux server debug:
@ -450,10 +450,10 @@ prefab-linux-arm64-server-debug-build: prereqs assets-server \
build/prefab/full/linux_arm64_server/debug build/prefab/full/linux_arm64_server/debug
build/prefab/full/linux_%_server/debug/dist/ballisticakit_headless: .efrocachemap build/prefab/full/linux_%_server/debug/dist/ballisticakit_headless: .efrocachemap
@tools/pcommand efrocache_get $@ @.cache/pcommandbatch/pcommandbatch efrocache_get $@
build/prefab/lib/linux_%_server/debug/libballisticaplus.a: .efrocachemap build/prefab/lib/linux_%_server/debug/libballisticaplus.a: .efrocachemap
@tools/pcommand efrocache_get $@ @.cache/pcommandbatch/pcommandbatch efrocache_get $@
# Linux server release: # Linux server release:
@ -482,10 +482,10 @@ prefab-linux-arm64-server-release-build: prereqs assets-server \
build/prefab/full/linux_arm64_server/release build/prefab/full/linux_arm64_server/release
build/prefab/full/linux_%_server/release/dist/ballisticakit_headless: .efrocachemap build/prefab/full/linux_%_server/release/dist/ballisticakit_headless: .efrocachemap
@tools/pcommand efrocache_get $@ @.cache/pcommandbatch/pcommandbatch efrocache_get $@
build/prefab/lib/linux_%_server/release/libballisticaplus.a: .efrocachemap build/prefab/lib/linux_%_server/release/libballisticaplus.a: .efrocachemap
@tools/pcommand efrocache_get $@ @.cache/pcommandbatch/pcommandbatch efrocache_get $@
# Windows gui debug: # Windows gui debug:
@ -502,13 +502,13 @@ prefab-windows-x86-gui-debug-build: prereqs assets-windows-$(WINPLAT_X86) \
build/prefab/full/windows_x86_gui/debug build/prefab/full/windows_x86_gui/debug
build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe: .efrocachemap build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe: .efrocachemap
@tools/pcommand efrocache_get $@ @.cache/pcommandbatch/pcommandbatch efrocache_get $@
build/prefab/lib/windows/Debug_%/BallisticaKitGenericPlus.lib: .efrocachemap build/prefab/lib/windows/Debug_%/BallisticaKitGenericPlus.lib: .efrocachemap
@tools/pcommand efrocache_get $@ @.cache/pcommandbatch/pcommandbatch efrocache_get $@
build/prefab/lib/windows/Debug_%/BallisticaKitGenericPlus.pdb: .efrocachemap build/prefab/lib/windows/Debug_%/BallisticaKitGenericPlus.pdb: .efrocachemap
@tools/pcommand efrocache_get $@ @.cache/pcommandbatch/pcommandbatch efrocache_get $@
# Windows gui release: # Windows gui release:
@ -526,13 +526,13 @@ prefab-windows-x86-gui-release-build: prereqs \
build/prefab/full/windows_x86_gui/release build/prefab/full/windows_x86_gui/release
build/prefab/full/windows_x86_gui/release/BallisticaKit.exe: .efrocachemap build/prefab/full/windows_x86_gui/release/BallisticaKit.exe: .efrocachemap
@tools/pcommand efrocache_get $@ @.cache/pcommandbatch/pcommandbatch efrocache_get $@
build/prefab/lib/windows/Release_%/BallisticaKitGenericPlus.lib: .efrocachemap build/prefab/lib/windows/Release_%/BallisticaKitGenericPlus.lib: .efrocachemap
@tools/pcommand efrocache_get $@ @.cache/pcommandbatch/pcommandbatch efrocache_get $@
build/prefab/lib/windows/Release_%/BallisticaKitGenericPlus.pdb: .efrocachemap build/prefab/lib/windows/Release_%/BallisticaKitGenericPlus.pdb: .efrocachemap
@tools/pcommand efrocache_get $@ @.cache/pcommandbatch/pcommandbatch efrocache_get $@
# Windows server debug: # Windows server debug:
@ -551,13 +551,13 @@ prefab-windows-x86-server-debug-build: prereqs \
build/prefab/full/windows_x86_server/debug build/prefab/full/windows_x86_server/debug
build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe: .efrocachemap build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe: .efrocachemap
@tools/pcommand efrocache_get $@ @.cache/pcommandbatch/pcommandbatch efrocache_get $@
build/prefab/lib/windows/Debug_%/BallisticaKitHeadlessPlus.lib: .efrocachemap build/prefab/lib/windows/Debug_%/BallisticaKitHeadlessPlus.lib: .efrocachemap
@tools/pcommand efrocache_get $@ @.cache/pcommandbatch/pcommandbatch efrocache_get $@
build/prefab/lib/windows/Debug_%/BallisticaKitHeadlessPlus.pdb: .efrocachemap build/prefab/lib/windows/Debug_%/BallisticaKitHeadlessPlus.pdb: .efrocachemap
@tools/pcommand efrocache_get $@ @.cache/pcommandbatch/pcommandbatch efrocache_get $@
# Windows server release: # Windows server release:
@ -576,13 +576,13 @@ prefab-windows-x86-server-release-build: prereqs \
build/prefab/full/windows_x86_server/release build/prefab/full/windows_x86_server/release
build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe: .efrocachemap build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe: .efrocachemap
@tools/pcommand efrocache_get $@ @.cache/pcommandbatch/pcommandbatch efrocache_get $@
build/prefab/lib/windows/Release_%/BallisticaKitHeadlessPlus.lib: .efrocachemap build/prefab/lib/windows/Release_%/BallisticaKitHeadlessPlus.lib: .efrocachemap
@tools/pcommand efrocache_get $@ @.cache/pcommandbatch/pcommandbatch efrocache_get $@
build/prefab/lib/windows/Release_%/BallisticaKitHeadlessPlus.pdb: .efrocachemap build/prefab/lib/windows/Release_%/BallisticaKitHeadlessPlus.pdb: .efrocachemap
@tools/pcommand efrocache_get $@ @.cache/pcommandbatch/pcommandbatch efrocache_get $@
# Tell make which of these targets don't represent files. # Tell make which of these targets don't represent files.
.PHONY: prefab-gui-debug prefab-gui-release prefab-gui-debug-build \ .PHONY: prefab-gui-debug prefab-gui-release prefab-gui-debug-build \
@ -1222,10 +1222,6 @@ SKIP_ENV_CHECKS ?= 0
tools/pcommand checkenv && mkdir -p .cache && touch .cache/checkenv; \ tools/pcommand checkenv && mkdir -p .cache && touch .cache/checkenv; \
fi fi
foof: CHANGELOG.md CONTRIBUTORS.md Makefile
echo OUT IS $@
echo IN IS $^
$(PCOMMANDBATCHBIN): src/tools/pcommandbatch/pcommandbatch.c \ $(PCOMMANDBATCHBIN): src/tools/pcommandbatch/pcommandbatch.c \
src/tools/pcommandbatch/cJSON.c src/tools/pcommandbatch/cJSON.c
@tools/pcommand build_pcommandbatch $^ $@ @tools/pcommand build_pcommandbatch $^ $@

52
src/assets/Makefile
View File

@ -1757,7 +1757,7 @@ SCRIPT_TARGETS_PYC_PRIVATE_APPLE = \
# Rule to copy src asset scripts to dst. # Rule to copy src asset scripts to dst.
# (and make non-writable so I'm less likely to accidentally edit them there) # (and make non-writable so I'm less likely to accidentally edit them there)
$(SCRIPT_TARGETS_PY_PRIVATE_APPLE) : ../../.efrocachemap $(SCRIPT_TARGETS_PY_PRIVATE_APPLE) : ../../.efrocachemap
@cd ../.. && tools/pcommand efrocache_get src/assets/$@ @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@
# These are too complex to define in a pattern rule; # These are too complex to define in a pattern rule;
# Instead we generate individual targets in a loop. # Instead we generate individual targets in a loop.
@ -2701,7 +2701,7 @@ SCRIPT_TARGETS_PYC_PRIVATE_ANDROID = \
# Rule to copy src asset scripts to dst. # Rule to copy src asset scripts to dst.
# (and make non-writable so I'm less likely to accidentally edit them there) # (and make non-writable so I'm less likely to accidentally edit them there)
$(SCRIPT_TARGETS_PY_PRIVATE_ANDROID) : ../../.efrocachemap $(SCRIPT_TARGETS_PY_PRIVATE_ANDROID) : ../../.efrocachemap
@cd ../.. && tools/pcommand efrocache_get src/assets/$@ @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@
# These are too complex to define in a pattern rule; # These are too complex to define in a pattern rule;
# Instead we generate individual targets in a loop. # Instead we generate individual targets in a loop.
@ -2759,7 +2759,7 @@ SCRIPT_TARGETS_PYC_PRIVATE_COMMON = \
# Rule to copy src asset scripts to dst. # Rule to copy src asset scripts to dst.
# (and make non-writable so I'm less likely to accidentally edit them there) # (and make non-writable so I'm less likely to accidentally edit them there)
$(SCRIPT_TARGETS_PY_PRIVATE_COMMON) : ../../.efrocachemap $(SCRIPT_TARGETS_PY_PRIVATE_COMMON) : ../../.efrocachemap
@cd ../.. && tools/pcommand efrocache_get src/assets/$@ @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@
# These are too complex to define in a pattern rule; # These are too complex to define in a pattern rule;
# Instead we generate individual targets in a loop. # Instead we generate individual targets in a loop.
@ -3687,7 +3687,7 @@ SCRIPT_TARGETS_PYC_PRIVATE_WIN_WIN32 = \
# Rule to copy src asset scripts to dst. # Rule to copy src asset scripts to dst.
# (and make non-writable so I'm less likely to accidentally edit them there) # (and make non-writable so I'm less likely to accidentally edit them there)
$(SCRIPT_TARGETS_PY_PRIVATE_WIN_WIN32) : ../../.efrocachemap $(SCRIPT_TARGETS_PY_PRIVATE_WIN_WIN32) : ../../.efrocachemap
@cd ../.. && tools/pcommand efrocache_get src/assets/$@ @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@
# These are too complex to define in a pattern rule; # These are too complex to define in a pattern rule;
# Instead we generate individual targets in a loop. # Instead we generate individual targets in a loop.
@ -4615,7 +4615,7 @@ SCRIPT_TARGETS_PYC_PRIVATE_WIN_X64 = \
# Rule to copy src asset scripts to dst. # Rule to copy src asset scripts to dst.
# (and make non-writable so I'm less likely to accidentally edit them there) # (and make non-writable so I'm less likely to accidentally edit them there)
$(SCRIPT_TARGETS_PY_PRIVATE_WIN_X64) : ../../.efrocachemap $(SCRIPT_TARGETS_PY_PRIVATE_WIN_X64) : ../../.efrocachemap
@cd ../.. && tools/pcommand efrocache_get src/assets/$@ @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@
# These are too complex to define in a pattern rule; # These are too complex to define in a pattern rule;
# Instead we generate individual targets in a loop. # Instead we generate individual targets in a loop.
@ -7290,7 +7290,7 @@ EXTRAS_TARGETS_WIN_WIN32 = \
# Rule to copy src extras to build. # Rule to copy src extras to build.
$(EXTRAS_TARGETS_WIN_WIN32) : ../../.efrocachemap $(EXTRAS_TARGETS_WIN_WIN32) : ../../.efrocachemap
@cd ../.. && tools/pcommand efrocache_get src/assets/$@ @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@
EXTRAS_TARGETS_WIN_X64 = \ EXTRAS_TARGETS_WIN_X64 = \
@ -7380,7 +7380,7 @@ EXTRAS_TARGETS_WIN_X64 = \
# Rule to copy src extras to build. # Rule to copy src extras to build.
$(EXTRAS_TARGETS_WIN_X64) : ../../.efrocachemap $(EXTRAS_TARGETS_WIN_X64) : ../../.efrocachemap
@cd ../.. && tools/pcommand efrocache_get src/assets/$@ @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@
# __AUTOGENERATED_PRIVATE_END__ # __AUTOGENERATED_PRIVATE_END__
@ -7388,64 +7388,64 @@ ASSET_TARGETS_COMMON_GUI += $(MESH_TARGETS) $(COLLISION_MESH_TARGETS)
ASSET_TARGETS_COMMON_SERVER += $(COLLISION_MESH_TARGETS) ASSET_TARGETS_COMMON_SERVER += $(COLLISION_MESH_TARGETS)
$(BUILD_DIR)/%.bob : ../../.efrocachemap $(BUILD_DIR)/%.bob : ../../.efrocachemap
@cd ../.. && tools/pcommand efrocache_get src/assets/$@ @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@
$(BUILD_DIR)/%.cob : ../../.efrocachemap $(BUILD_DIR)/%.cob : ../../.efrocachemap
@cd ../.. && tools/pcommand efrocache_get src/assets/$@ @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@
$(BUILD_DIR)/%.ogg : ../../.efrocachemap $(BUILD_DIR)/%.ogg : ../../.efrocachemap
@cd ../.. && tools/pcommand efrocache_get src/assets/$@ @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@
$(BUILD_DIR)/%.fdata : ../../.efrocachemap $(BUILD_DIR)/%.fdata : ../../.efrocachemap
@cd ../.. && tools/pcommand efrocache_get src/assets/$@ @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@
$(BUILD_DIR)/%.pem : ../../.efrocachemap $(BUILD_DIR)/%.pem : ../../.efrocachemap
@cd ../.. && tools/pcommand efrocache_get src/assets/$@ @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@
# Langdata one-off json file. # Langdata one-off json file.
$(BUILD_DIR)/ba_data/data/langdata.json : ../../.efrocachemap $(BUILD_DIR)/ba_data/data/langdata.json : ../../.efrocachemap
@cd ../.. && tools/pcommand efrocache_get src/assets/$@ @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@
# Languages json files. # Languages json files.
$(BUILD_DIR)/ba_data/data/languages/%.json : ../../.efrocachemap $(BUILD_DIR)/ba_data/data/languages/%.json : ../../.efrocachemap
@cd ../.. && tools/pcommand efrocache_get src/assets/$@ @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@
# Map json files. # Map json files.
$(BUILD_DIR)/ba_data/data/maps/%.json : ../../.efrocachemap $(BUILD_DIR)/ba_data/data/maps/%.json : ../../.efrocachemap
@cd ../.. && tools/pcommand efrocache_get src/assets/$@ @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@
ba_data/%.tex2d.png : ../../.efrocachemap ba_data/%.tex2d.png : ../../.efrocachemap
@cd ../.. && tools/pcommand efrocache_get src/assets/$@ @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@
ba_data/%_+x.tex2d.png : ../../.efrocachemap ba_data/%_+x.tex2d.png : ../../.efrocachemap
@cd ../.. && tools/pcommand efrocache_get src/assets/$@ @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@
ba_data/%_-x.tex2d.png: ../../.efrocachemap ba_data/%_-x.tex2d.png: ../../.efrocachemap
@cd ../.. && tools/pcommand efrocache_get src/assets/$@ @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@
ba_data/%_+y.tex2d.png: ../../.efrocachemap ba_data/%_+y.tex2d.png: ../../.efrocachemap
@cd ../.. && tools/pcommand efrocache_get src/assets/$@ @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@
ba_data/%_-y.tex2d.png: ../../.efrocachemap ba_data/%_-y.tex2d.png: ../../.efrocachemap
@cd ../.. && tools/pcommand efrocache_get src/assets/$@ @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@
ba_data/%_+z.tex2d.png: ../../.efrocachemap ba_data/%_+z.tex2d.png: ../../.efrocachemap
@cd ../.. && tools/pcommand efrocache_get src/assets/$@ @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@
ba_data/%_-z.tex2d.png: ../../.efrocachemap ba_data/%_-z.tex2d.png: ../../.efrocachemap
@cd ../.. && tools/pcommand efrocache_get src/assets/$@ @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@
$(BUILD_DIR)/ba_data/%_preview.png : ../../.efrocachemap $(BUILD_DIR)/ba_data/%_preview.png : ../../.efrocachemap
@cd ../.. && tools/pcommand efrocache_get src/assets/$@ @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@
$(BUILD_DIR)/%.dds : ../../.efrocachemap $(BUILD_DIR)/%.dds : ../../.efrocachemap
@cd ../.. && tools/pcommand efrocache_get src/assets/$@ @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@
$(BUILD_DIR)/%.pvr : ../../.efrocachemap $(BUILD_DIR)/%.pvr : ../../.efrocachemap
@cd ../.. && tools/pcommand efrocache_get src/assets/$@ @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@
$(BUILD_DIR)/%.ktx : ../../.efrocachemap $(BUILD_DIR)/%.ktx : ../../.efrocachemap
@cd ../.. && tools/pcommand efrocache_get src/assets/$@ @cd ../.. && .cache/pcommandbatch/pcommandbatch efrocache_get src/assets/$@
audio: $(AUDIO_TARGETS) audio: $(AUDIO_TARGETS)
audio-clean: audio-clean:

10
tools/batools/pcommands.py
View File

@ -475,11 +475,13 @@ def efrocache_get() -> None:
"""Get a file from efrocache.""" """Get a file from efrocache."""
from efrotools.efrocache import get_target from efrotools.efrocache import get_target
pcommand.disallow_in_batch() args = pcommand.get_args()
if len(args) != 1:
if len(sys.argv) != 3:
raise RuntimeError('Expected exactly 1 arg') raise RuntimeError('Expected exactly 1 arg')
get_target(sys.argv[2])
output = get_target(args[0], batch=pcommand.is_batch(), clr=pcommand.clr())
if pcommand.is_batch():
pcommand.set_output(output)
def get_modern_make() -> None: def get_modern_make() -> None:

3
tools/batools/pcommands2.py
View File

@ -197,6 +197,7 @@ def clean_orphaned_assets() -> None:
def win_ci_install_prereqs() -> None: def win_ci_install_prereqs() -> None:
"""Install bits needed for basic win ci.""" """Install bits needed for basic win ci."""
import json import json
from efrotools.efrocache import get_target from efrotools.efrocache import get_target
pcommand.disallow_in_batch() pcommand.disallow_in_batch()
@ -230,7 +231,7 @@ def win_ci_install_prereqs() -> None:
needed_targets.add(target) needed_targets.add(target)
for target in needed_targets: for target in needed_targets:
get_target(target) get_target(target, batch=pcommand.is_batch(), clr=pcommand.clr())
def win_ci_binary_build() -> None: def win_ci_binary_build() -> None:

87
tools/efrotools/efrocache.py
View File

@ -29,7 +29,8 @@ from efro.dataclassio import (
from efro.terminal import Clr from efro.terminal import Clr
if TYPE_CHECKING: if TYPE_CHECKING:
pass import efro.terminal
TARGET_TAG = '# __EFROCACHE_TARGET__' TARGET_TAG = '# __EFROCACHE_TARGET__'
@ -112,14 +113,17 @@ def _project_centric_path(path: str) -> str:
return abspath[len(projpath) :] return abspath[len(projpath) :]
def get_target(path: str) -> None: def get_target(path: str, batch: bool, clr: type[efro.terminal.ClrBase]) -> str:
"""Fetch a target path from the cache, downloading if need be.""" """Fetch a target path from the cache, downloading if need be."""
# pylint: disable=too-many-locals # pylint: disable=too-many-locals
# pylint: disable=too-many-statements # pylint: disable=too-many-statements
# pylint: disable=too-many-branches
import tempfile import tempfile
from efro.error import CleanError from efro.error import CleanError
output_lines: list[str] = []
local_cache_dir = get_local_cache_dir() local_cache_dir = get_local_cache_dir()
path = _project_centric_path(path) path = _project_centric_path(path)
@ -150,8 +154,12 @@ def get_target(path: str) -> None:
existing_hash = get_existing_file_hash(path) existing_hash = get_existing_file_hash(path)
if existing_hash == hashval: if existing_hash == hashval:
os.utime(path, None) os.utime(path, None)
print(f'Refreshing from cache: {path}') msg = f'Refreshing from cache: {path}'
return if batch:
output_lines.append(msg)
else:
print(msg)
return '\n'.join(output_lines)
# Ok we need to download the cache file. # Ok we need to download the cache file.
# Ok there's not a valid file in place already. Clear out whatever # Ok there's not a valid file in place already. Clear out whatever
@ -163,7 +171,11 @@ def get_target(path: str) -> None:
if not os.path.exists(local_cache_path): if not os.path.exists(local_cache_path):
with tempfile.TemporaryDirectory() as tmpdir: with tempfile.TemporaryDirectory() as tmpdir:
local_cache_dl_path = os.path.join(tmpdir, 'dl') local_cache_dl_path = os.path.join(tmpdir, 'dl')
print(f'Downloading: {Clr.BLU}{path}{Clr.RST}') msg = f'Downloading: {clr.BLU}{path}{clr.RST}'
if batch:
output_lines.append(msg)
else:
print(msg)
result = subprocess.run( result = subprocess.run(
[ [
'curl', 'curl',
@ -203,7 +215,11 @@ def get_target(path: str) -> None:
# Ok we should have a valid file in our cache dir at this point. # Ok we should have a valid file in our cache dir at this point.
# Just expand it to the target path. # Just expand it to the target path.
print(f'Extracting: {path}') msg = f'Extracting: {path}'
if batch:
output_lines.append(msg)
else:
print(msg)
# Extract and stage the file in a temp dir before doing # Extract and stage the file in a temp dir before doing
# a final move to the target location to be as atomic as possible. # a final move to the target location to be as atomic as possible.
@ -233,6 +249,8 @@ def get_target(path: str) -> None:
if not os.path.exists(path): if not os.path.exists(path):
raise RuntimeError(f'File {path} did not wind up as expected.') raise RuntimeError(f'File {path} did not wind up as expected.')
return '\n'.join(output_lines)
def filter_makefile(makefile_dir: str, contents: str) -> str: def filter_makefile(makefile_dir: str, contents: str) -> str:
"""Filter makefile contents to use efrocache lookups.""" """Filter makefile contents to use efrocache lookups."""
@ -632,33 +650,38 @@ def warm_start_cache() -> None:
# server system of some sort so we don't have to spin up a full # server system of some sort so we don't have to spin up a full
# Python process for each and every file we need to touch. In that # Python process for each and every file we need to touch. In that
# case, this optimization would probably be unnecessary. # case, this optimization would probably be unnecessary.
cachemap: dict[str, str] #
with open(CACHE_MAP_NAME, encoding='utf-8') as infile: # UPDATE - we now have that lightweight build system (pcommandbatch)
cachemap = json.loads(infile.read()) # which means individual refreshes are now much less expensive than
assert isinstance(cachemap, dict) # before, so disabling this for now.
cachemap_mtime = os.path.getmtime(CACHE_MAP_NAME) if bool(False):
entries: list[tuple[str, str]] = [] cachemap: dict[str, str]
for fname, filehash in cachemap.items(): with open(CACHE_MAP_NAME, encoding='utf-8') as infile:
# File hasn't been pulled from cache yet = ignore. cachemap = json.loads(infile.read())
if not os.path.exists(fname): assert isinstance(cachemap, dict)
continue cachemap_mtime = os.path.getmtime(CACHE_MAP_NAME)
entries: list[tuple[str, str]] = []
for fname, filehash in cachemap.items():
# File hasn't been pulled from cache yet = ignore.
if not os.path.exists(fname):
continue
# File is newer than the cache map = ignore. # File is newer than the cache map = ignore.
if cachemap_mtime < os.path.getmtime(fname): if cachemap_mtime < os.path.getmtime(fname):
continue continue
# Don't have the cache source file for this guy = ignore. This # Don't have the cache source file for this guy = ignore. This
# can happen if cache files have been blown away since the last # can happen if cache files have been blown away since the last
# time this was built. # time this was built.
cachefile = os.path.join(local_cache_dir, _path_from_hash(filehash)) cachefile = os.path.join(local_cache_dir, _path_from_hash(filehash))
if not os.path.exists(cachefile): if not os.path.exists(cachefile):
continue continue
# Ok, add it to the list of files we can potentially update # Ok, add it to the list of files we can potentially update
# timestamps on once we check its hash. # timestamps on once we check its hash.
entries.append((fname, filehash)) entries.append((fname, filehash))
if entries: if entries:
# Now fire off a multithreaded executor to check hashes and # Now fire off a multithreaded executor to check hashes and
# update timestamps. # update timestamps.
_check_warm_start_entries(entries) _check_warm_start_entries(entries)