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

Initial work on headless prefab builds

Browse Source
This commit is contained in:
Eric Froemling 2020-04-20 20:13:16 -07:00
parent 5114280d0a
commit 962e75fc1c
5 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile
View File

@ -151,6 +151,26 @@ prefab-mac-release-build: prereqs assets-cmake \
build/prefab/mac/release/ballisticacore: .efrocachemap build/prefab/mac/release/ballisticacore: .efrocachemap
@tools/snippets efrocache_get $@ @tools/snippets efrocache_get $@
prefab-mac-server-debug: prefab-mac-server-debug-build
@cd build/prefab/mac-server/debug && ./ballisticacore_server
prefab-mac-server-debug-build: prereqs assets-cmake \
build/prefab/mac-server/debug/dist/ballisticacore_headless \
build/prefab/mac-server/debug/ballisticacore_server \
build/prefab/mac-server/debug/config_template.yaml
@${STAGE_ASSETS} -cmake-server build/prefab/mac-server/debug/dist
build/prefab/mac-server/debug/ballisticacore_server: \
assets/src/server/server.py
cp $< $@
build/prefab/mac-server/debug/config_template.yaml: \
assets/src/server/config.yaml
cp $< $@
build/prefab/mac-server/debug/dist/ballisticacore_headless: .efrocachemap
@tools/snippets efrocache_get $@
prefab-linux-debug: prefab-linux-debug-build prefab-linux-debug: prefab-linux-debug-build
@cd build/prefab/linux/debug && ./ballisticacore @cd build/prefab/linux/debug && ./ballisticacore

2
assets/.asset_manifest_1.json
View File

@ -469,8 +469,6 @@
"ba_data/python/efro/executils.py", "ba_data/python/efro/executils.py",
"ba_data/python/efro/jsonutils.py", "ba_data/python/efro/jsonutils.py",
"ba_data/python/efro/util.py", "ba_data/python/efro/util.py",
"server/__pycache__/config.cpython-37.opt-1.pyc",
"server/__pycache__/server.cpython-37.opt-1.pyc", "server/__pycache__/server.cpython-37.opt-1.pyc",
"server/config.py",
"server/server.py" "server/server.py"
] ]

7
assets/Makefile
View File

@ -143,7 +143,6 @@ ASSET_TARGETS_WIN_X64 += $(EXTRAS_TARGETS_WIN_X64)
SCRIPT_TARGETS_PY_1 = \ SCRIPT_TARGETS_PY_1 = \
build/server/server.py \ build/server/server.py \
build/server/config.py \
build/ba_data/python/efro/executils.py \ build/ba_data/python/efro/executils.py \
build/ba_data/python/efro/util.py \ build/ba_data/python/efro/util.py \
build/ba_data/python/efro/__init__.py \ build/ba_data/python/efro/__init__.py \
@ -382,7 +381,6 @@ SCRIPT_TARGETS_PY_1 = \
SCRIPT_TARGETS_PYC_1 = \ SCRIPT_TARGETS_PYC_1 = \
build/server/__pycache__/server.cpython-37.opt-1.pyc \ build/server/__pycache__/server.cpython-37.opt-1.pyc \
build/server/__pycache__/config.cpython-37.opt-1.pyc \
build/ba_data/python/efro/__pycache__/executils.cpython-37.opt-1.pyc \ build/ba_data/python/efro/__pycache__/executils.cpython-37.opt-1.pyc \
build/ba_data/python/efro/__pycache__/util.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__/__init__.cpython-37.opt-1.pyc \
@ -637,11 +635,6 @@ build/server/__pycache__/server.cpython-37.opt-1.pyc: \
@echo Compiling script: $^ @echo Compiling script: $^
@rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@ @rm -rf $@ && $(TOOLS_DIR)/snippets compile_python_files $^ && chmod 444 $@
build/server/__pycache__/config.cpython-37.opt-1.pyc: \
build/server/config.py
@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/__pycache__/executils.cpython-37.opt-1.pyc: \
build/ba_data/python/efro/executils.py build/ba_data/python/efro/executils.py
@echo Compiling script: $^ @echo Compiling script: $^

0
assets/src/server/config.py → assets/src/server/config.yaml
View File

1
tools/stage_assets
View File

@ -151,7 +151,6 @@ class Config:
self.include_textures = False self.include_textures = False
self.include_audio = False self.include_audio = False
self.include_models = False self.include_models = False
elif '-xcode-mac' in sys.argv: elif '-xcode-mac' in sys.argv:
self.src = os.environ['SOURCE_ROOT'] + '/assets/build' self.src = os.environ['SOURCE_ROOT'] + '/assets/build'
self.dst = (os.environ['TARGET_BUILD_DIR'] + '/' + self.dst = (os.environ['TARGET_BUILD_DIR'] + '/' +