From 962e75fc1c4c6e1c0d91f528d993dcee07c71e05 Mon Sep 17 00:00:00 2001
From: Eric Froemling <ericfroemling@gmail.com>
Date: Mon, 20 Apr 2020 20:13:16 -0700
Subject: [PATCH] Initial work on headless prefab builds

---
 Makefile                                     | 20 ++++++++++++++++++++
 assets/.asset_manifest_1.json                |  2 --
 assets/Makefile                              |  7 -------
 assets/src/server/{config.py => config.yaml} |  0
 tools/stage_assets                           |  1 -
 5 files changed, 20 insertions(+), 10 deletions(-)
 rename assets/src/server/{config.py => config.yaml} (100%)

diff --git a/Makefile b/Makefile
index cf1356c9..0e386911 100644
--- a/Makefile
+++ b/Makefile
@@ -151,6 +151,26 @@ prefab-mac-release-build: prereqs assets-cmake \
 build/prefab/mac/release/ballisticacore: .efrocachemap
 	@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
 	@cd build/prefab/linux/debug && ./ballisticacore
 
diff --git a/assets/.asset_manifest_1.json b/assets/.asset_manifest_1.json
index f1195b8f..1e1f76a6 100644
--- a/assets/.asset_manifest_1.json
+++ b/assets/.asset_manifest_1.json
@@ -469,8 +469,6 @@
  "ba_data/python/efro/executils.py",
  "ba_data/python/efro/jsonutils.py",
  "ba_data/python/efro/util.py",
- "server/__pycache__/config.cpython-37.opt-1.pyc",
  "server/__pycache__/server.cpython-37.opt-1.pyc",
- "server/config.py",
  "server/server.py"
 ]
\ No newline at end of file
diff --git a/assets/Makefile b/assets/Makefile
index 71aceae7..0a6876c5 100644
--- a/assets/Makefile
+++ b/assets/Makefile
@@ -143,7 +143,6 @@ ASSET_TARGETS_WIN_X64 += $(EXTRAS_TARGETS_WIN_X64)
 
 SCRIPT_TARGETS_PY_1 = \
   build/server/server.py \
-  build/server/config.py \
   build/ba_data/python/efro/executils.py \
   build/ba_data/python/efro/util.py \
   build/ba_data/python/efro/__init__.py \
@@ -382,7 +381,6 @@ SCRIPT_TARGETS_PY_1 = \
 
 SCRIPT_TARGETS_PYC_1 = \
   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__/util.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: $^
 	@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/executils.py
 	@echo Compiling script: $^
diff --git a/assets/src/server/config.py b/assets/src/server/config.yaml
similarity index 100%
rename from assets/src/server/config.py
rename to assets/src/server/config.yaml
diff --git a/tools/stage_assets b/tools/stage_assets
index b37f0859..ad39ed74 100755
--- a/tools/stage_assets
+++ b/tools/stage_assets
@@ -151,7 +151,6 @@ class Config:
             self.include_textures = False
             self.include_audio = False
             self.include_models = False
-
         elif '-xcode-mac' in sys.argv:
             self.src = os.environ['SOURCE_ROOT'] + '/assets/build'
             self.dst = (os.environ['TARGET_BUILD_DIR'] + '/' +