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

misc cleanup for pubsync and efrocache

Browse Source
This commit is contained in:
Eric Froemling 2019-10-18 12:12:15 -07:00
parent 5989280233
commit b2a7713389
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/ballisticacore.iml generated
View File

@ -56,6 +56,7 @@
<excludePattern pattern="vssver2.scc" /> <excludePattern pattern="vssver2.scc" />
<excludePattern pattern="manifest.json" /> <excludePattern pattern="manifest.json" />
<excludePattern pattern=".spinoffdata" /> <excludePattern pattern=".spinoffdata" />
<excludePattern pattern=".asset_manifest_*.json" />
</content> </content>
<orderEntry type="jdk" jdkName="Python 3.7" jdkType="Python SDK" /> <orderEntry type="jdk" jdkName="Python 3.7" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />

15
Makefile
View File

@ -138,7 +138,7 @@ prefab-release-build:
# Specific platform prefab targets: # Specific platform prefab targets:
prefab-mac-debug: prefab-mac-build prefab-mac-debug: prefab-mac-debug-build
@cd build/prefab/mac/debug && ./ballisticacore @cd build/prefab/mac/debug && ./ballisticacore
prefab-mac-debug-build: assets-cmake build/prefab/mac/debug/ballisticacore prefab-mac-debug-build: assets-cmake build/prefab/mac/debug/ballisticacore
@ -178,7 +178,7 @@ build/prefab/linux/release/ballisticacore: .efrocachemap
PREFAB_WINDOWS_PLATFORM = x64 PREFAB_WINDOWS_PLATFORM = x64
prefab-windows-debug: prefab-windows-debug-build prefab-windows-debug: prefab-windows-debug-build
@echo Build succesful - now run:\ @echo Build successful - now run:\
build/prefab/windows/debug/BallisticaCore.exe build/prefab/windows/debug/BallisticaCore.exe
prefab-windows-debug-build: assets-windows \ prefab-windows-debug-build: assets-windows \
@ -189,7 +189,7 @@ build/prefab/windows/debug/BallisticaCore.exe: .efrocachemap
@tools/snippets efrocache_get $@ @tools/snippets efrocache_get $@
prefab-windows-release: prefab-windows-release-build prefab-windows-release: prefab-windows-release-build
@echo Build succesful - now run:\ @echo Build successful - now run:\
build/prefab/windows/release/BallisticaCore.exe build/prefab/windows/release/BallisticaCore.exe
prefab-windows-release-build: assets-windows \ prefab-windows-release-build: assets-windows \
@ -200,10 +200,11 @@ build/prefab/windows/release/BallisticaCore.exe: .efrocachemap
@tools/snippets efrocache_get $@ @tools/snippets efrocache_get $@
# Tell make which of these targets don't represent files. # Tell make which of these targets don't represent files.
.PHONY: prefab-mac prefab-mac-build prefab-mac-release \ .PHONY: prefab-debug prefab-debug-build prefab-release prefab-release-build \
prefab-mac-release-build prefab-linux prefab-linux-build prefab-linux-release \ prefab-mac-debug prefab-mac-debug-build prefab-mac-release \
prefab-linux-release-build prefab-windows-debug prefab-windows-debug-build \ prefab-mac-release-build prefab-linux-debug prefab-linux-debug-build \
prefab-windows-release prefab-windows-release-build prefab-linux-release prefab-linux-release-build prefab-windows-debug \
prefab-windows-debug-build prefab-windows-release prefab-windows-release-build
################################################################################ ################################################################################

8
tools/efrotools/efrocache.py
View File

@ -229,7 +229,9 @@ def _write_cache_file(staging_dir: str, fname: str) -> Tuple[str, str]:
# Fancy pipe stuff which will give us deterministic # Fancy pipe stuff which will give us deterministic
# tar.gz files (no embedded timestamps) # tar.gz files (no embedded timestamps)
run(f'tar cf - {fname} | gzip -n > {path}') # Note: The 'COPYFILE_DISABLE' prevents mac tar from adding
# file attributes/resource-forks to the archive as as ._filename.
run(f'COPYFILE_DISABLE=1 tar cf - {fname} | gzip -n > {path}')
return fname, hashpath return fname, hashpath
@ -255,8 +257,10 @@ def _write_cache_files(fnames1: List[str], fnames2: List[str],
# Clients initing their cache dirs can grab this as a starting point # Clients initing their cache dirs can grab this as a starting point
# which should greatly reduce the individual file downloads they have # which should greatly reduce the individual file downloads they have
# to do (at least when first building). # to do (at least when first building).
# Note: The 'COPYFILE_DISABLE' prevents mac tar from adding
# file attributes/resource-forks to the archive as as ._filename.
print('Writing starter-cache...') print('Writing starter-cache...')
run('cd build && tar -Jcf startercache.tar.xz efrocache' run('cd build && COPYFILE_DISABLE=1 tar -Jcf startercache.tar.xz efrocache'
' && mv startercache.tar.xz efrocache') ' && mv startercache.tar.xz efrocache')
# Now finish up with the second set. # Now finish up with the second set.