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

Minor project reorganization

Browse Source
This commit is contained in:
Eric Froemling 2020-04-30 23:22:59 -07:00
parent e0b24e170f
commit ac90429389
26 changed files with 992 additions and 973 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1626
.efrocachemap
View File

File diff suppressed because it is too large Load Diff

2
.idea/ballisticacore.iml generated
View File

@ -35,8 +35,6 @@
<excludeFolder url="file://$MODULE_DIR$/src/generated" />
<excludeFolder url="file://$MODULE_DIR$/src/tools" />
<excludeFolder url="file://$MODULE_DIR$/submodules" />
<excludeFolder url="file://$MODULE_DIR$/tools/bacommon" />
<excludeFolder url="file://$MODULE_DIR$/tools/efro" />
<excludePattern pattern=".assetcache" />
<excludePattern pattern=".cache*" />
<excludePattern pattern=".clang-format" />

1
.idea/dictionaries/ericf.xml generated
View File

@ -1368,6 +1368,7 @@
<w>preprocessing</w>
<w>prereqs</w>
<w>priceraw</w>
<w>printcolors</w>
<w>printnodes</w>
<w>printobjects</w>
<w>printpaths</w>

0
assets/.asset_manifest_2.json → assets/.asset_manifest_private.json
View File

0
assets/.asset_manifest_1.json → assets/.asset_manifest_public.json
View File

324
assets/Makefile
View File

@ -139,27 +139,10 @@ endif
ASSET_TARGETS_WIN_WIN32 += $(EXTRAS_TARGETS_WIN_WIN32)
ASSET_TARGETS_WIN_X64 += $(EXTRAS_TARGETS_WIN_X64)
#AUTOGENERATED_BEGIN_1 (this section is managed by the "update_project" tool)
#AUTOGENERATED_BEGIN_PUBLIC (this section is managed by "update_project")
SCRIPT_TARGETS_PY_1 = \
SCRIPT_TARGETS_PY_PUBLIC = \
build/server/ballisticacore_server.py \
build/ba_data/python/efro/executils.py \
build/ba_data/python/efro/dataclassutils.py \
build/ba_data/python/efro/terminal.py \
build/ba_data/python/efro/util.py \
build/ba_data/python/efro/__init__.py \
build/ba_data/python/efro/jsonutils.py \
build/ba_data/python/efro/entity/_base.py \
build/ba_data/python/efro/entity/_support.py \
build/ba_data/python/efro/entity/util.py \
build/ba_data/python/efro/entity/_entity.py \
build/ba_data/python/efro/entity/_field.py \
build/ba_data/python/efro/entity/__init__.py \
build/ba_data/python/efro/entity/_value.py \
build/ba_data/python/bacommon/servermanager.py \
build/ba_data/python/bacommon/__init__.py \
build/ba_data/python/bacommon/assets.py \
build/ba_data/python/bacommon/err.py \
build/ba_data/python/ba/_dualteamsession.py \
build/ba_data/python/ba/_gameactivity.py \
build/ba_data/python/ba/_apputils.py \
@ -383,25 +366,8 @@ SCRIPT_TARGETS_PY_1 = \
build/ba_data/python/bastd/actor/image.py \
build/ba_data/python/bastd/session/__init__.py
SCRIPT_TARGETS_PYC_1 = \
SCRIPT_TARGETS_PYC_PUBLIC = \
build/server/__pycache__/ballisticacore_server.cpython-37.opt-1.pyc \
build/ba_data/python/efro/__pycache__/executils.cpython-37.opt-1.pyc \
build/ba_data/python/efro/__pycache__/dataclassutils.cpython-37.opt-1.pyc \
build/ba_data/python/efro/__pycache__/terminal.cpython-37.opt-1.pyc \
build/ba_data/python/efro/__pycache__/util.cpython-37.opt-1.pyc \
build/ba_data/python/efro/__pycache__/__init__.cpython-37.opt-1.pyc \
build/ba_data/python/efro/__pycache__/jsonutils.cpython-37.opt-1.pyc \
build/ba_data/python/efro/entity/__pycache__/_base.cpython-37.opt-1.pyc \
build/ba_data/python/efro/entity/__pycache__/_support.cpython-37.opt-1.pyc \
build/ba_data/python/efro/entity/__pycache__/util.cpython-37.opt-1.pyc \
build/ba_data/python/efro/entity/__pycache__/_entity.cpython-37.opt-1.pyc \
build/ba_data/python/efro/entity/__pycache__/_field.cpython-37.opt-1.pyc \
build/ba_data/python/efro/entity/__pycache__/__init__.cpython-37.opt-1.pyc \
build/ba_data/python/efro/entity/__pycache__/_value.cpython-37.opt-1.pyc \
build/ba_data/python/bacommon/__pycache__/servermanager.cpython-37.opt-1.pyc \
build/ba_data/python/bacommon/__pycache__/__init__.cpython-37.opt-1.pyc \
build/ba_data/python/bacommon/__pycache__/assets.cpython-37.opt-1.pyc \
build/ba_data/python/bacommon/__pycache__/err.cpython-37.opt-1.pyc \
build/ba_data/python/ba/__pycache__/_dualteamsession.cpython-37.opt-1.pyc \
build/ba_data/python/ba/__pycache__/_gameactivity.cpython-37.opt-1.pyc \
build/ba_data/python/ba/__pycache__/_apputils.cpython-37.opt-1.pyc \
@ -627,7 +593,7 @@ SCRIPT_TARGETS_PYC_1 = \
# Rule to copy src asset scripts to dst.
# (and make non-writable so I'm less likely to accidentally edit them there)
$(SCRIPT_TARGETS_PY_1) : build/%.py : src/%.py
$(SCRIPT_TARGETS_PY_PUBLIC) : build/%.py : src/%.py
@echo Copying script: $@
@mkdir -p $(dir $@)
@rm -f $@
@ -643,91 +609,6 @@ build/server/__pycache__/ballisticacore_server.cpython-37.opt-1.pyc: \
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/efro/__pycache__/executils.cpython-37.opt-1.pyc: \
build/ba_data/python/efro/executils.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/efro/__pycache__/dataclassutils.cpython-37.opt-1.pyc: \
build/ba_data/python/efro/dataclassutils.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/efro/__pycache__/terminal.cpython-37.opt-1.pyc: \
build/ba_data/python/efro/terminal.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/efro/__pycache__/util.cpython-37.opt-1.pyc: \
build/ba_data/python/efro/util.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/efro/__pycache__/__init__.cpython-37.opt-1.pyc: \
build/ba_data/python/efro/__init__.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/efro/__pycache__/jsonutils.cpython-37.opt-1.pyc: \
build/ba_data/python/efro/jsonutils.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/efro/entity/__pycache__/_base.cpython-37.opt-1.pyc: \
build/ba_data/python/efro/entity/_base.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/efro/entity/__pycache__/_support.cpython-37.opt-1.pyc: \
build/ba_data/python/efro/entity/_support.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/efro/entity/__pycache__/util.cpython-37.opt-1.pyc: \
build/ba_data/python/efro/entity/util.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/efro/entity/__pycache__/_entity.cpython-37.opt-1.pyc: \
build/ba_data/python/efro/entity/_entity.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/efro/entity/__pycache__/_field.cpython-37.opt-1.pyc: \
build/ba_data/python/efro/entity/_field.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/efro/entity/__pycache__/__init__.cpython-37.opt-1.pyc: \
build/ba_data/python/efro/entity/__init__.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/efro/entity/__pycache__/_value.cpython-37.opt-1.pyc: \
build/ba_data/python/efro/entity/_value.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/bacommon/__pycache__/servermanager.cpython-37.opt-1.pyc: \
build/ba_data/python/bacommon/servermanager.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/bacommon/__pycache__/__init__.cpython-37.opt-1.pyc: \
build/ba_data/python/bacommon/__init__.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/bacommon/__pycache__/assets.cpython-37.opt-1.pyc: \
build/ba_data/python/bacommon/assets.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/bacommon/__pycache__/err.cpython-37.opt-1.pyc: \
build/ba_data/python/bacommon/err.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/ba/__pycache__/_dualteamsession.cpython-37.opt-1.pyc: \
build/ba_data/python/ba/_dualteamsession.py
@echo Compiling script: $^
@ -1838,11 +1719,148 @@ build/ba_data/python/bastd/session/__pycache__/__init__.cpython-37.opt-1.pyc: \
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
#AUTOGENERATED_END_1
#AUTOGENERATED_BEGIN_2 (this section is managed by the "update_project" tool)
SCRIPT_TARGETS_PY_PUBLIC_TOOLS = \
build/ba_data/python/efro/executils.py \
build/ba_data/python/efro/dataclassutils.py \
build/ba_data/python/efro/terminal.py \
build/ba_data/python/efro/util.py \
build/ba_data/python/efro/__init__.py \
build/ba_data/python/efro/jsonutils.py \
build/ba_data/python/efro/entity/_base.py \
build/ba_data/python/efro/entity/_support.py \
build/ba_data/python/efro/entity/util.py \
build/ba_data/python/efro/entity/_entity.py \
build/ba_data/python/efro/entity/_field.py \
build/ba_data/python/efro/entity/__init__.py \
build/ba_data/python/efro/entity/_value.py \
build/ba_data/python/bacommon/servermanager.py \
build/ba_data/python/bacommon/__init__.py \
build/ba_data/python/bacommon/assets.py \
build/ba_data/python/bacommon/err.py
SCRIPT_TARGETS_PY_2_APPLE = \
SCRIPT_TARGETS_PYC_PUBLIC_TOOLS = \
build/ba_data/python/efro/__pycache__/executils.cpython-37.opt-1.pyc \
build/ba_data/python/efro/__pycache__/dataclassutils.cpython-37.opt-1.pyc \
build/ba_data/python/efro/__pycache__/terminal.cpython-37.opt-1.pyc \
build/ba_data/python/efro/__pycache__/util.cpython-37.opt-1.pyc \
build/ba_data/python/efro/__pycache__/__init__.cpython-37.opt-1.pyc \
build/ba_data/python/efro/__pycache__/jsonutils.cpython-37.opt-1.pyc \
build/ba_data/python/efro/entity/__pycache__/_base.cpython-37.opt-1.pyc \
build/ba_data/python/efro/entity/__pycache__/_support.cpython-37.opt-1.pyc \
build/ba_data/python/efro/entity/__pycache__/util.cpython-37.opt-1.pyc \
build/ba_data/python/efro/entity/__pycache__/_entity.cpython-37.opt-1.pyc \
build/ba_data/python/efro/entity/__pycache__/_field.cpython-37.opt-1.pyc \
build/ba_data/python/efro/entity/__pycache__/__init__.cpython-37.opt-1.pyc \
build/ba_data/python/efro/entity/__pycache__/_value.cpython-37.opt-1.pyc \
build/ba_data/python/bacommon/__pycache__/servermanager.cpython-37.opt-1.pyc \
build/ba_data/python/bacommon/__pycache__/__init__.cpython-37.opt-1.pyc \
build/ba_data/python/bacommon/__pycache__/assets.cpython-37.opt-1.pyc \
build/ba_data/python/bacommon/__pycache__/err.cpython-37.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)
$(SCRIPT_TARGETS_PY_PUBLIC_TOOLS) : build/ba_data/python/%.py : ../tools/%.py
@echo Copying script: $@
@mkdir -p $(dir $@)
@rm -f $@
@cp $^ $@
@chmod 444 $@
# Looks like path mangling from py to pyc is too complex for pattern rules so
# just generating explicit targets for each. Could perhaps look into using a
# fancy for-loop instead, but perhaps listing these explicitly isn't so bad.
build/ba_data/python/efro/__pycache__/executils.cpython-37.opt-1.pyc: \
build/ba_data/python/efro/executils.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/efro/__pycache__/dataclassutils.cpython-37.opt-1.pyc: \
build/ba_data/python/efro/dataclassutils.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/efro/__pycache__/terminal.cpython-37.opt-1.pyc: \
build/ba_data/python/efro/terminal.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/efro/__pycache__/util.cpython-37.opt-1.pyc: \
build/ba_data/python/efro/util.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/efro/__pycache__/__init__.cpython-37.opt-1.pyc: \
build/ba_data/python/efro/__init__.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/efro/__pycache__/jsonutils.cpython-37.opt-1.pyc: \
build/ba_data/python/efro/jsonutils.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/efro/entity/__pycache__/_base.cpython-37.opt-1.pyc: \
build/ba_data/python/efro/entity/_base.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/efro/entity/__pycache__/_support.cpython-37.opt-1.pyc: \
build/ba_data/python/efro/entity/_support.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/efro/entity/__pycache__/util.cpython-37.opt-1.pyc: \
build/ba_data/python/efro/entity/util.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/efro/entity/__pycache__/_entity.cpython-37.opt-1.pyc: \
build/ba_data/python/efro/entity/_entity.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/efro/entity/__pycache__/_field.cpython-37.opt-1.pyc: \
build/ba_data/python/efro/entity/_field.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/efro/entity/__pycache__/__init__.cpython-37.opt-1.pyc: \
build/ba_data/python/efro/entity/__init__.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/efro/entity/__pycache__/_value.cpython-37.opt-1.pyc: \
build/ba_data/python/efro/entity/_value.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/bacommon/__pycache__/servermanager.cpython-37.opt-1.pyc: \
build/ba_data/python/bacommon/servermanager.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/bacommon/__pycache__/__init__.cpython-37.opt-1.pyc: \
build/ba_data/python/bacommon/__init__.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/bacommon/__pycache__/assets.cpython-37.opt-1.pyc: \
build/ba_data/python/bacommon/assets.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/ba_data/python/bacommon/__pycache__/err.cpython-37.opt-1.pyc: \
build/ba_data/python/bacommon/err.py
@echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
#AUTOGENERATED_END_PUBLIC
#AUTOGENERATED_BEGIN_PRIVATE (this section is managed by "update_project")
SCRIPT_TARGETS_PY_PRIVATE_APPLE = \
build/pylib-apple/zipfile.py \
build/pylib-apple/shutil.py \
build/pylib-apple/tempfile.py \
@ -2270,7 +2288,7 @@ SCRIPT_TARGETS_PY_2_APPLE = \
build/pylib-apple/email/mime/image.py \
build/pylib-apple/email/mime/base.py
SCRIPT_TARGETS_PYC_2_APPLE = \
SCRIPT_TARGETS_PYC_PRIVATE_APPLE = \
build/pylib-apple/__pycache__/zipfile.cpython-37.opt-1.pyc \
build/pylib-apple/__pycache__/shutil.cpython-37.opt-1.pyc \
build/pylib-apple/__pycache__/tempfile.cpython-37.opt-1.pyc \
@ -2700,7 +2718,7 @@ SCRIPT_TARGETS_PYC_2_APPLE = \
# Rule to copy src asset scripts to dst.
# (and make non-writable so I'm less likely to accidentally edit them there)
$(SCRIPT_TARGETS_PY_2_APPLE) : ../.efrocachemap
$(SCRIPT_TARGETS_PY_PRIVATE_APPLE) : ../.efrocachemap
@cd .. && tools/snippets efrocache_get assets/$@
# Looks like path mangling from py to pyc is too complex for pattern rules so
@ -4838,7 +4856,7 @@ build/pylib-apple/email/mime/__pycache__/base.cpython-37.opt-1.pyc: \
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
SCRIPT_TARGETS_PY_2_ANDROID = \
SCRIPT_TARGETS_PY_PRIVATE_ANDROID = \
build/pylib-android/zipfile.py \
build/pylib-android/shutil.py \
build/pylib-android/tempfile.py \
@ -5266,7 +5284,7 @@ SCRIPT_TARGETS_PY_2_ANDROID = \
build/pylib-android/email/mime/image.py \
build/pylib-android/email/mime/base.py
SCRIPT_TARGETS_PYC_2_ANDROID = \
SCRIPT_TARGETS_PYC_PRIVATE_ANDROID = \
build/pylib-android/__pycache__/zipfile.cpython-37.opt-1.pyc \
build/pylib-android/__pycache__/shutil.cpython-37.opt-1.pyc \
build/pylib-android/__pycache__/tempfile.cpython-37.opt-1.pyc \
@ -5696,7 +5714,7 @@ SCRIPT_TARGETS_PYC_2_ANDROID = \
# Rule to copy src asset scripts to dst.
# (and make non-writable so I'm less likely to accidentally edit them there)
$(SCRIPT_TARGETS_PY_2_ANDROID) : ../.efrocachemap
$(SCRIPT_TARGETS_PY_PRIVATE_ANDROID) : ../.efrocachemap
@cd .. && tools/snippets efrocache_get assets/$@
# Looks like path mangling from py to pyc is too complex for pattern rules so
@ -7834,7 +7852,7 @@ build/pylib-android/email/mime/__pycache__/base.cpython-37.opt-1.pyc: \
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
SCRIPT_TARGETS_PY_2_COMMON = \
SCRIPT_TARGETS_PY_PRIVATE_COMMON = \
build/ba_data/python-site-packages/typing_extensions.py \
build/ba_data/python-site-packages/yaml/scanner.py \
build/ba_data/python-site-packages/yaml/error.py \
@ -7854,7 +7872,7 @@ SCRIPT_TARGETS_PY_2_COMMON = \
build/ba_data/python-site-packages/yaml/nodes.py \
build/ba_data/python-site-packages/yaml/emitter.py
SCRIPT_TARGETS_PYC_2_COMMON = \
SCRIPT_TARGETS_PYC_PRIVATE_COMMON = \
build/ba_data/python-site-packages/__pycache__/typing_extensions.cpython-37.opt-1.pyc \
build/ba_data/python-site-packages/yaml/__pycache__/scanner.cpython-37.opt-1.pyc \
build/ba_data/python-site-packages/yaml/__pycache__/error.cpython-37.opt-1.pyc \
@ -7876,7 +7894,7 @@ SCRIPT_TARGETS_PYC_2_COMMON = \
# Rule to copy src asset scripts to dst.
# (and make non-writable so I'm less likely to accidentally edit them there)
$(SCRIPT_TARGETS_PY_2_COMMON) : ../.efrocachemap
$(SCRIPT_TARGETS_PY_PRIVATE_COMMON) : ../.efrocachemap
@cd .. && tools/snippets efrocache_get assets/$@
# Looks like path mangling from py to pyc is too complex for pattern rules so
@ -7974,7 +7992,7 @@ build/ba_data/python-site-packages/yaml/__pycache__/emitter.cpython-37.opt-1.pyc
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
SCRIPT_TARGETS_PY_2_WIN_WIN32 = \
SCRIPT_TARGETS_PY_PRIVATE_WIN_WIN32 = \
build/windows/Win32/Lib/zipfile.py \
build/windows/Win32/Lib/shutil.py \
build/windows/Win32/Lib/tempfile.py \
@ -8644,7 +8662,7 @@ SCRIPT_TARGETS_PY_2_WIN_WIN32 = \
build/windows/Win32/Lib/email/mime/image.py \
build/windows/Win32/Lib/email/mime/base.py
SCRIPT_TARGETS_PYC_2_WIN_WIN32 = \
SCRIPT_TARGETS_PYC_PRIVATE_WIN_WIN32 = \
build/windows/Win32/Lib/__pycache__/zipfile.cpython-37.opt-1.pyc \
build/windows/Win32/Lib/__pycache__/shutil.cpython-37.opt-1.pyc \
build/windows/Win32/Lib/__pycache__/tempfile.cpython-37.opt-1.pyc \
@ -9316,7 +9334,7 @@ SCRIPT_TARGETS_PYC_2_WIN_WIN32 = \
# Rule to copy src asset scripts to dst.
# (and make non-writable so I'm less likely to accidentally edit them there)
$(SCRIPT_TARGETS_PY_2_WIN_WIN32) : ../.efrocachemap
$(SCRIPT_TARGETS_PY_PRIVATE_WIN_WIN32) : ../.efrocachemap
@cd .. && tools/snippets efrocache_get assets/$@
# Looks like path mangling from py to pyc is too complex for pattern rules so
@ -12664,7 +12682,7 @@ build/windows/Win32/Lib/email/mime/__pycache__/base.cpython-37.opt-1.pyc: \
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
SCRIPT_TARGETS_PY_2_WIN_X64 = \
SCRIPT_TARGETS_PY_PRIVATE_WIN_X64 = \
build/windows/x64/Lib/zipfile.py \
build/windows/x64/Lib/shutil.py \
build/windows/x64/Lib/tempfile.py \
@ -13334,7 +13352,7 @@ SCRIPT_TARGETS_PY_2_WIN_X64 = \
build/windows/x64/Lib/email/mime/image.py \
build/windows/x64/Lib/email/mime/base.py
SCRIPT_TARGETS_PYC_2_WIN_X64 = \
SCRIPT_TARGETS_PYC_PRIVATE_WIN_X64 = \
build/windows/x64/Lib/__pycache__/zipfile.cpython-37.opt-1.pyc \
build/windows/x64/Lib/__pycache__/shutil.cpython-37.opt-1.pyc \
build/windows/x64/Lib/__pycache__/tempfile.cpython-37.opt-1.pyc \
@ -14006,7 +14024,7 @@ SCRIPT_TARGETS_PYC_2_WIN_X64 = \
# Rule to copy src asset scripts to dst.
# (and make non-writable so I'm less likely to accidentally edit them there)
$(SCRIPT_TARGETS_PY_2_WIN_X64) : ../.efrocachemap
$(SCRIPT_TARGETS_PY_PRIVATE_WIN_X64) : ../.efrocachemap
@cd .. && tools/snippets efrocache_get assets/$@
# Looks like path mangling from py to pyc is too complex for pattern rules so
@ -20035,7 +20053,7 @@ EXTRAS_TARGETS_WIN_X64 = \
$(EXTRAS_TARGETS_WIN_X64) : ../.efrocachemap
@cd .. && tools/snippets efrocache_get assets/$@
#AUTOGENERATED_END_2
#AUTOGENERATED_END_PRIVATE
ASSET_TARGETS_COMMON += $(MODEL_TARGETS)
@ -20116,18 +20134,22 @@ clean-textures:
# Script targets needed per-platform (may overlap)
SCRIPT_TARGETS_CMAKE =
SCRIPT_TARGETS_WIN_WIN32 = $(SCRIPT_TARGETS_PY_2_WIN_WIN32) \
$(SCRIPT_TARGETS_PYC_2_WIN_WIN32)
SCRIPT_TARGETS_WIN_X64 = $(SCRIPT_TARGETS_PY_2_WIN_X64) \
$(SCRIPT_TARGETS_PYC_2_WIN_X64)
SCRIPT_TARGETS_MAC = $(SCRIPT_TARGETS_PY_2_APPLE) $(SCRIPT_TARGETS_PYC_2_APPLE)
SCRIPT_TARGETS_IOS = $(SCRIPT_TARGETS_PY_2_APPLE) $(SCRIPT_TARGETS_PYC_2_APPLE)
SCRIPT_TARGETS_ANDROID = $(SCRIPT_TARGETS_PY_2_ANDROID) \
$(SCRIPT_TARGETS_PYC_2_ANDROID)
SCRIPT_TARGETS_WIN_WIN32 = $(SCRIPT_TARGETS_PY_PRIVATE_WIN_WIN32) \
$(SCRIPT_TARGETS_PYC_PRIVATE_WIN_WIN32)
SCRIPT_TARGETS_WIN_X64 = $(SCRIPT_TARGETS_PY_PRIVATE_WIN_X64) \
$(SCRIPT_TARGETS_PYC_PRIVATE_WIN_X64)
SCRIPT_TARGETS_MAC = $(SCRIPT_TARGETS_PY_PRIVATE_APPLE) \
$(SCRIPT_TARGETS_PYC_PRIVATE_APPLE)
SCRIPT_TARGETS_IOS = $(SCRIPT_TARGETS_PY_PRIVATE_APPLE) \
$(SCRIPT_TARGETS_PYC_PRIVATE_APPLE)
SCRIPT_TARGETS_ANDROID = $(SCRIPT_TARGETS_PY_PRIVATE_ANDROID) \
$(SCRIPT_TARGETS_PYC_PRIVATE_ANDROID)
# Script targets needed by all platforms.
SCRIPT_TARGETS_COMMON = $(SCRIPT_TARGETS_PY_1) $(SCRIPT_TARGETS_PYC_1) \
$(SCRIPT_TARGETS_PY_2_COMMON) $(SCRIPT_TARGETS_PYC_2_COMMON)
SCRIPT_TARGETS_COMMON = $(SCRIPT_TARGETS_PY_PUBLIC) \
$(SCRIPT_TARGETS_PYC_PUBLIC) $(SCRIPT_TARGETS_PY_PUBLIC_TOOLS) \
$(SCRIPT_TARGETS_PYC_PUBLIC_TOOLS) $(SCRIPT_TARGETS_PY_PRIVATE_COMMON) \
$(SCRIPT_TARGETS_PYC_PRIVATE_COMMON)
# Build scripts for a specific platform.
scripts-cmake: $(SCRIPT_TARGETS_CMAKE) $(SCRIPT_TARGETS_COMMON)

1
tools/bacommon
View File

@ -1 +0,0 @@
../assets/src/ba_data/python/bacommon

0
assets/src/ba_data/python/bacommon/__init__.py → tools/bacommon/__init__.py
View File

0
assets/src/ba_data/python/bacommon/assets.py → tools/bacommon/assets.py
View File

0
assets/src/ba_data/python/bacommon/err.py → tools/bacommon/err.py
View File

0
assets/src/ba_data/python/bacommon/servermanager.py → tools/bacommon/servermanager.py
View File

1
tools/efro
View File

@ -1 +0,0 @@
../assets/src/ba_data/python/efro

0
assets/src/ba_data/python/efro/__init__.py → tools/efro/__init__.py
View File

0
assets/src/ba_data/python/efro/dataclassutils.py → tools/efro/dataclassutils.py
View File

0
assets/src/ba_data/python/efro/entity/__init__.py → tools/efro/entity/__init__.py
View File

0
assets/src/ba_data/python/efro/entity/_base.py → tools/efro/entity/_base.py
View File

0
assets/src/ba_data/python/efro/entity/_entity.py → tools/efro/entity/_entity.py
View File

0
assets/src/ba_data/python/efro/entity/_field.py → tools/efro/entity/_field.py
View File

0
assets/src/ba_data/python/efro/entity/_support.py → tools/efro/entity/_support.py
View File

0
assets/src/ba_data/python/efro/entity/_value.py → tools/efro/entity/_value.py
View File

0
assets/src/ba_data/python/efro/entity/util.py → tools/efro/entity/util.py
View File

0
assets/src/ba_data/python/efro/executils.py → tools/efro/executils.py
View File

0
assets/src/ba_data/python/efro/jsonutils.py → tools/efro/jsonutils.py
View File

0
assets/src/ba_data/python/efro/terminal.py → tools/efro/terminal.py
View File

0
assets/src/ba_data/python/efro/util.py → tools/efro/util.py
View File

10
tools/snippets
View File

@ -306,9 +306,9 @@ def clean_orphaned_assets() -> None:
os.chdir(PROJROOT)
# Our manifest is split into 2 files (public and non-public)
with open('assets/.asset_manifest_1.json') as infile:
with open('assets/.asset_manifest_public.json') as infile:
manifest = set(json.loads(infile.read()))
with open('assets/.asset_manifest_2.json') as infile:
with open('assets/.asset_manifest_private.json') as infile:
manifest.update(set(json.loads(infile.read())))
for root, _dirs, fnames in os.walk('assets/build'):
for fname in fnames:
@ -476,11 +476,11 @@ def update_docs_md() -> None:
exts = ['.cc', '.c', '.h', '.py']
for basedir in [
'src/ballistica/python',
'assets/src/ba_data/python/efro',
'assets/src/ba_data/python/bacommon',
'tools/efro',
'tools/bacommon',
'assets/src/ba_data/python/ba',
]:
assert os.path.isdir(basedir)
assert os.path.isdir(basedir), f'{basedir} is not a dir.'
for root, _dirs, files in os.walk(basedir):
for fname in files:
if any(fname.endswith(ext) for ext in exts):