From 54be0699f0d30871101b86f977859737c1b276bb Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Fri, 25 Mar 2022 14:13:34 +0100
Subject: [PATCH] Added 32bit linux and windows editor builds to the build all
 script, along with headless and server builds.

---
 misc/build-containers/podman_build_all.sh | 36 +++++++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/misc/build-containers/podman_build_all.sh b/misc/build-containers/podman_build_all.sh
index 66c3f5df3..9c366c685 100755
--- a/misc/build-containers/podman_build_all.sh
+++ b/misc/build-containers/podman_build_all.sh
@@ -15,11 +15,13 @@ img_version=pe
 
 mkdir -p logs
 
-# Windows editor (release debug)
 rm -f modules/modules_enabled.gen.h
-$podman run -v ${project_root}:/root/project -w /root/project pandemonium-windows:${img_version} scons tools=yes target=release_debug debug_symbols=no platform=windows -j4 . 2>&1 | tee logs/bew.log
+
+# Windows editor (release debug) 64 bit
+$podman run -v ${project_root}:/root/project -w /root/project pandemonium-windows:${img_version} scons tools=yes target=release_debug debug_symbols=no platform=windows bits=64 -j4 . 2>&1 | tee logs/bew.log
 rm -f modules/modules_enabled.gen.h
-#$podman run -v ${project_root}:/root/project -w /root/project pandemonium-windows:${img_version} scons tools=yes target=debug custom_modules_shared=no debug_symbols=no platform=windows -j4 . 2>&1 | tee logs/bewd.log
+# Windows editor (release debug) 32 bit
+$podman run -v ${project_root}:/root/project -w /root/project pandemonium-windows:${img_version} scons tools=yes target=release_debug debug_symbols=no platform=windows bits=32 -j4 . 2>&1 | tee logs/bew.log
 rm -f modules/modules_enabled.gen.h
 
 # Windows templates 64 bit
@@ -34,10 +36,11 @@ rm -f modules/modules_enabled.gen.h
 $podman run -v ${project_root}:/root/project -w /root/project pandemonium-windows:${img_version} scons tools=no target=release custom_modules_shared=no debug_symbols=no platform=windows bits=32 -j4 . 2>&1 | tee logs/bwr.log
 rm -f modules/modules_enabled.gen.h
 
-# Linux editor
-$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 -j4 . 2>&1 | tee logs/bel.log
+# Linux editor 64 bit
+$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=64 -j4 . 2>&1 | tee logs/bel.log
 rm -f modules/modules_enabled.gen.h
-#$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=yes target=debug custom_modules_shared=no debug_symbols=no platform=x11 -j4 . 2>&1 | tee logs/beld.log
+# Linux editor 32 bit
+$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=32 -j4 . 2>&1 | tee logs/bel.log
 rm -f modules/modules_enabled.gen.h
 
 # Linux templates 64 bit
@@ -52,6 +55,16 @@ rm -f modules/modules_enabled.gen.h
 $podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=no target=release custom_modules_shared=no debug_symbols=no platform=x11 bits=32 -j4 . 2>&1 | tee logs/blr.log
 rm -f modules/modules_enabled.gen.h
 
+# Linux headless (editor) 64bit
+$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=64 -j4 . 2>&1 | tee logs/bl.log
+rm -f modules/modules_enabled.gen.h
+
+# Linux server (templates) 64bit
+$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=64 -j4 . 2>&1 | tee logs/bl.log
+rm -f modules/modules_enabled.gen.h
+$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=no target=release custom_modules_shared=no debug_symbols=no platform=x11 bits=64 -j4 . 2>&1 | tee logs/blr.log
+rm -f modules/modules_enabled.gen.h
+
 # Javascript editor
 $podman run -v ${project_root}:/root/project -w /root/project pandemonium-javascript:${img_version} bash -c 'source /root/emsdk_2.0.25/emsdk_env.sh;scons tools=yes target=release_debug custom_modules_shared=no debug_symbols=no threads_enabled=yes platform=javascript -j4' . 2>&1 | tee logs/bej.log
 rm -f modules/modules_enabled.gen.h
@@ -145,6 +158,7 @@ files=(
   "pandemonium.windows.opt.debug.32.exe"
 
   "pandemonium.windows.opt.tools.64.exe"
+  "pandemonium.windows.opt.tools.32.exe"
 
   # Linux
   "pandemonium.x11.opt.64"
@@ -154,6 +168,15 @@ files=(
   "pandemonium.x11.opt.debug.32"
 
   "pandemonium.x11.opt.tools.64"
+  "pandemonium.x11.opt.tools.32"
+
+  # Server (Linux) - template
+  "pandemonium.server.opt.64"
+  "pandemonium.server.opt.debug.64"
+
+  # Headless (Linux) - editor
+
+  "pandemonium.server.opt.tools.64"
 
   # JS
   "pandemonium.javascript.opt.zip"
@@ -169,6 +192,7 @@ files=(
   "android_debug.apk"
   "android_release.apk"
   "android_editor.apk"
+  "pandemonium-lib.release.aar"
 
   # OSX
   "pandemonium.osx.opt.arm64"